wow almost done with the fixes

NonQueueingMatt · Aug 22, 2024 · 4047eeb · 4047eeb
1 parent 153d339
commit 4047eeb
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/code/datums/scenarios/noncanon/zenghu_clone_facility.dm b/code/datums/scenarios/noncanon/zenghu_clone_facility.dm
@@ -10,7 +10,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 = 1 //should be 4 todomatt
+	min_actor_amount = 0 //should be 4 todomatt
 
 	roles = list(
 		/singleton/role/cryo_outpost,

diff --git a/code/game/antagonist/antagonist_add.dm b/code/game/antagonist/antagonist_add.dm
@@ -10,7 +10,8 @@
 		player.role_alt_title = role_text
 	player.special_role = role_text
 
-	if(istype(player.current, /mob/abstract))
+	if(istype(player.current, /mob/abstract) && !isstoryteller(player.current))
+		// some snowflake code to allow storytellers to read and use AOOC
 		create_default(player.current)
 	else
 		create_antagonist(player, move_to_spawn, do_not_announce, preserve_appearance)

diff --git a/code/game/antagonist/outsider/actor.dm b/code/game/antagonist/outsider/actor.dm
@@ -16,7 +16,7 @@ GLOBAL_DATUM(actors, /datum/antagonist/actor)
 	bantype = "actor"
 
 	faction_verbs = list(
-		/mob/living/carbon/human/verb/odyssey_panel
+		/mob/living/carbon/human/proc/odyssey_panel
 	)
 
 /datum/antagonist/actor/New()
@@ -48,9 +48,9 @@ GLOBAL_DATUM(actors, /datum/antagonist/actor)
 /obj/effect/landmark/actor_spawn
 	name = "ActorSpawnLandmark"
 
-/mob/living/carbon/human/verb/odyssey_panel()
+/mob/living/carbon/human/proc/odyssey_panel()
 	set name = "Odyssey Panel"
-	set category = "Actor"
+	set category = "OOC"
 
 	if(!ishuman(usr))
 		return

diff --git a/code/game/gamemodes/odyssey/odyssey.dm b/code/game/gamemodes/odyssey/odyssey.dm
@@ -15,6 +15,11 @@
 	to_world(FONT_LARGE(EXAMINE_BLOCK_ODYSSEY("The scenario picked for this round is: <b>[SPAN_NOTICE(SSodyssey.scenario.name)]</b>.\n\
 			[SSodyssey.scenario.desc]\n\
 			It is a <b>[SSodyssey.scenario.scenario_type == SCENARIO_TYPE_NONCANON ? "non-canon" : "canon"]</b> scenario.\n\
-			Please keep in mind that the Storyteller may alter the story as they see fit, and remember to go along with what they have planned!")))
+			Please keep in mind that the Storyteller or the Actors may alter the story as they see fit, and remember to go along with what they have planned!")))
 	SSodyssey.scenario.setup_scenario()
+
+	// Need to repopulate antag spawns to get the actor landmarks to work, since this is only done in the map finalization SS.
+	populate_antag_spawns()
+
+	// When everything's finished, restart the countdown.
 	GLOB.round_progressing = TRUE
diff --git a/code/modules/mob/abstract/storyteller/storyteller.dm b/code/modules/mob/abstract/storyteller/storyteller.dm
@@ -147,6 +147,13 @@
 	update_sight()
 	to_chat(usr, SPAN_NOTICE("You [(ghostvision ? "now" : "no longer")] have ghost vision."))
 
+/mob/abstract/storyteller/verb/odyssey_panel()
+	set name = "Odyssey Panel"
+	set category = "OOC"
+
+	SSodyssey.ui_interact(src)
+
+
 /**
  * Currently whitelisted in the config behind the head of staff whitelist.
  * Let's see if they can play nice.

diff --git a/tgui/packages/tgui/interfaces/OdysseyPanel.tsx b/tgui/packages/tgui/interfaces/OdysseyPanel.tsx
@@ -54,7 +54,7 @@ export const RoleDisplay = (props, context) => {
           key={role.name}
           buttons={
             <Button
-              name="Equip"
+              content="Equip"
               color="green"
               icon="star"
               onClick={() => act('equip_outfit', { outfit_type: role.outfit })}