lastprep

Aurorastation · Oct 19, 2024 · b0b9c69 · b0b9c69
1 parent bb17209
commit b0b9c69
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 17 deletions.
diff --git a/aurorastation.dme b/aurorastation.dme
@@ -648,6 +648,7 @@
 #include "code\game\antagonist\outsider\raider.dm"
 #include "code\game\antagonist\outsider\raider_techno.dm"
 #include "code\game\antagonist\outsider\revenant.dm"
+#include "code\game\antagonist\outsider\storyteller.dm"
 #include "code\game\antagonist\outsider\technomancer.dm"
 #include "code\game\antagonist\station\cultist.dm"
 #include "code\game\antagonist\station\highlander.dm"

diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
@@ -37,6 +37,8 @@
 
 #define isspaceturf(A) istype(A, /turf/space)
 
+#define isghost(A) istype(A, /mob/abstract/ghost)
+
 #define isobserver(A) istype(A, /mob/abstract/ghost/observer)
 
 #define isstoryteller(A) istype(A, /mob/abstract/ghost/storyteller)

diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
@@ -25,13 +25,6 @@
 		stop_following()
 		forceMove(get_turf(A))
 
-/mob/abstract/ghost/observer/ClickOn(var/atom/A, var/params)
-	if(!canClick()) return
-	setClickCooldown(4)
-	// You are responsible for checking config.ghost_interaction when you override this function
-	// Not all of them require checking, see below
-	A.attack_ghost(src)
-
 // Oh by the way this didn't work with old click code which is why clicking shit didn't spam you
 /atom/proc/attack_ghost(mob/abstract/ghost/observer/user as mob)
 	if(user.client && user.client.inquisitive_ghost)

diff --git a/code/game/antagonist/outsider/storyteller.dm b/code/game/antagonist/outsider/storyteller.dm
@@ -0,0 +1,16 @@
+GLOBAL_DATUM(storytellers, /datum/antagonist/storyteller)
+
+/datum/antagonist/storyteller
+	id = MODE_STORYTELLER
+	role_text = "Storyteller"
+	role_text_plural = "Storytellers"
+	welcome_text = "You are a Storyteller. Basically a discount admin."
+	faction = "storyteller"
+	flags = ANTAG_NO_ROUNDSTART_SPAWN | ANTAG_OVERRIDE_JOB
+	mob_path = null
+
+	bantype = "storyteller"
+
+/datum/antagonist/storyteller/New()
+	..(1)
+	GLOB.storytellers = src
diff --git a/code/modules/admin/verbs/bluespacetech.dm b/code/modules/admin/verbs/bluespacetech.dm
@@ -24,7 +24,8 @@
 		to_chat(src, "You've used this verb too recently, please wait a moment before trying again.")
 		return
 
-	if(!check_rights(R_DEV|R_ADMIN))	return
+	if(!check_rights(R_DEV|R_ADMIN))
+		return
 
 	if(!holder)
 		return //how did they get here?

diff --git a/code/modules/mob/abstract/ghost/ghost.dm b/code/modules/mob/abstract/ghost/ghost.dm
@@ -20,6 +20,14 @@
 	add_verb(src, /mob/abstract/ghost/proc/dead_tele)
 	ghost_multitool = new(src)
 
+/mob/abstract/ghost/ClickOn(var/atom/A, var/params)
+	if(!canClick())
+		return
+	setClickCooldown(4)
+	// You are responsible for checking config.ghost_interaction when you override this function
+	// Not all of them require checking, see below
+	A.attack_ghost(src)
+
 /mob/abstract/ghost/verb/toggle_darkness()
 	set name = "Toggle Darkness"
 	set category = "Ghost"

diff --git a/code/modules/mob/abstract/ghost/storyteller/storyteller_verbs.dm b/code/modules/mob/abstract/ghost/storyteller/storyteller_verbs.dm
@@ -285,8 +285,8 @@
 
 	M.mind.edit_memory()
 
-/mob/abstract/ghost/storyteller/verb/drop_bomb()
-	set name = "Drop Bomb"
+/mob/abstract/ghost/storyteller/verb/create_explosion()
+	set name = "Create Explosion"
 	set category = "Storyteller"
 
 	var/turf/epicenter = loc

diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm
@@ -184,7 +184,7 @@
 /obj/item/modular_computer/attack_ghost(var/mob/abstract/ghost/observer/user)
 	if(enabled)
 		ui_interact(user)
-	else if(check_rights(R_ADMIN, 0, user))
+	else if(check_rights(R_ADMIN, 0, user) || isstoryteller(user))
 		var/response = alert(user, "This computer is turned off. Would you like to turn it on?", "Admin Override", "Yes", "No")
 		if(response == "Yes")
 			turn_on(user)

diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
@@ -22,7 +22,11 @@
 	if(!state)
 		return
 
-	if(isobserver(user))
+	if(isghost(user))
+		// Storytellers can always interact with things.
+		if(isstoryteller(user))
+			. = max(., UI_INTERACTIVE)
+
 		// If they turn on ghost AI control, admins can always interact.
 		if(user.can_admin_interact())
 			. = max(., UI_INTERACTIVE)

diff --git a/maps/away/scenarios/cryo_outpost/cryo_outpost_scenario.dm b/maps/away/scenarios/cryo_outpost/cryo_outpost_scenario.dm
@@ -1,4 +1,4 @@
-/*
+
 /singleton/scenario/cryo_outpost
 	name = "Cryo Outpost #187-D"
 	desc = "An illegal cloning outpost on a desert oasis planet, that has just been noticed by megacorporations to be stealing proprietary tech. \
@@ -11,7 +11,7 @@
 	recover any stolen tech, if any is found. Approach with caution, but heavy resistance is not expected, as monitored ship traffic is light around here."
 
 	min_player_amount = 0
-	min_actor_amount = 0 //should be 4 todomatt
+	min_actor_amount = 0
 
 	roles = list(
 		/singleton/role/cryo_outpost,
@@ -27,7 +27,7 @@
 	base_area = /area/cryo_outpost
 
 	radio_frequency_name = "#187-D Outpost"
-*/
+
 
 /singleton/role/cryo_outpost
 	name = "Mercenary Team Lead"

diff --git a/maps/away/scenarios/ruined_propellant_depot/ruined_propellant_depot_scenario.dm b/maps/away/scenarios/ruined_propellant_depot/ruined_propellant_depot_scenario.dm
@@ -1,5 +1,5 @@
 
-/singleton/scenario/ruined_propellant_depot
+/*/singleton/scenario/ruined_propellant_depot
 	name = "Propellant Depot"
 	desc = "\
 		An independent propellant depot near some asteroid field, that has launched a distress beacon, requesting help. \
@@ -15,7 +15,7 @@
 		"
 
 	min_player_amount = 0
-	min_actor_amount = 0 //should be 4 todomatt
+	min_actor_amount = 0
 
 	roles = list(
 		/singleton/role/ruined_propellant_depot,
@@ -27,3 +27,4 @@
 	base_area = /area/ruined_propellant_depot
 
 	radio_frequency_name = "Propellant Depot AG5"
+*/