diff --git a/.github/workflows/byond.yml b/.github/workflows/byond.yml
index f7ee315325c..c9d8d9e64f8 100644
--- a/.github/workflows/byond.yml
+++ b/.github/workflows/byond.yml
@@ -15,7 +15,7 @@ on:
env:
MACRO_COUNT: 0
GENDER_COUNT: 6
- TO_WORLD_COUNT: 178
+ TO_WORLD_COUNT: 183
#These variables are filled from dependencies.sh inside the steps, DO NOT SET THEM HERE
BYOND_MAJOR: ""
diff --git a/aurorastation.dme b/aurorastation.dme
index 471539e148e..212639656ab 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -125,6 +125,7 @@
#include "code\__DEFINES\rust_bapi.dm"
#include "code\__DEFINES\rust_g.dm"
#include "code\__DEFINES\rust_g_overrides.dm"
+#include "code\__DEFINES\scenarios.dm"
#include "code\__DEFINES\ship_weapons.dm"
#include "code\__DEFINES\shuttle.dm"
#include "code\__DEFINES\si.dm"
@@ -253,6 +254,7 @@
#include "code\__HELPERS\logging\subsystems\http.dm"
#include "code\__HELPERS\logging\subsystems\law.dm"
#include "code\__HELPERS\logging\subsystems\mapfinalization.dm"
+#include "code\__HELPERS\logging\subsystems\odyssey.dm"
#include "code\__HELPERS\logging\subsystems\ZAS.dm"
#include "code\__HELPERS\paths\jps.dm"
#include "code\__HELPERS\paths\path.dm"
@@ -410,6 +412,7 @@
#include "code\controllers\subsystems\processing\nanoui.dm"
#include "code\controllers\subsystems\processing\ntsl2.dm"
#include "code\controllers\subsystems\processing\obj_tab_items.dm"
+#include "code\controllers\subsystems\processing\odyssey.dm"
#include "code\controllers\subsystems\processing\overmap.dm"
#include "code\controllers\subsystems\processing\processing.dm"
#include "code\controllers\subsystems\processing\projectiles.dm"
@@ -537,6 +540,8 @@
#include "code\datums\repositories\singletons.dm"
#include "code\datums\repositories\sound_channels.dm"
#include "code\datums\repositories\unique.dm"
+#include "code\datums\scenarios\roles.dm"
+#include "code\datums\scenarios\scenario.dm"
#include "code\datums\state_machine\state.dm"
#include "code\datums\state_machine\transition.dm"
#include "code\datums\tips\tips.dm"
@@ -632,6 +637,7 @@
#include "code\game\antagonist\antagonist_print.dm"
#include "code\game\antagonist\antagonist_update.dm"
#include "code\game\antagonist\alien\borer.dm"
+#include "code\game\antagonist\outsider\actor.dm"
#include "code\game\antagonist\outsider\burglar.dm"
#include "code\game\antagonist\outsider\commando.dm"
#include "code\game\antagonist\outsider\deathsquad.dm"
@@ -643,6 +649,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"
@@ -783,6 +790,7 @@
#include "code\game\gamemodes\ninja\ninja.dm"
#include "code\game\gamemodes\nuclear\nuclear.dm"
#include "code\game\gamemodes\nuclear\pinpointer.dm"
+#include "code\game\gamemodes\odyssey\odyssey.dm"
#include "code\game\gamemodes\revenants\revenants.dm"
#include "code\game\gamemodes\revolution\revolution.dm"
#include "code\game\gamemodes\technomancer\catalog.dm"
@@ -2313,6 +2321,7 @@
#include "code\modules\holodeck\HolodeckObjects.dm"
#include "code\modules\holodeck\HolodeckPrograms.dm"
#include "code\modules\holomap\poi.dm"
+#include "code\modules\holomap\portable_map_reader.dm"
#include "code\modules\http\forum_api.dm"
#include "code\modules\http\forumuser_api.dm"
#include "code\modules\http\http.dm"
@@ -2529,6 +2538,13 @@
#include "code\modules\mob\abstract\freelook\ai\eye.dm"
#include "code\modules\mob\abstract\freelook\ai\update_triggers.dm"
#include "code\modules\mob\abstract\freelook\blueprints\blueprints.dm"
+#include "code\modules\mob\abstract\ghost\ghost.dm"
+#include "code\modules\mob\abstract\ghost\observer\login.dm"
+#include "code\modules\mob\abstract\ghost\observer\logout.dm"
+#include "code\modules\mob\abstract\ghost\observer\observer.dm"
+#include "code\modules\mob\abstract\ghost\observer\say.dm"
+#include "code\modules\mob\abstract\ghost\storyteller\storyteller.dm"
+#include "code\modules\mob\abstract\ghost\storyteller\storyteller_verbs.dm"
#include "code\modules\mob\abstract\new_player\character_traits.dm"
#include "code\modules\mob\abstract\new_player\login.dm"
#include "code\modules\mob\abstract\new_player\logout.dm"
@@ -2537,10 +2553,6 @@
#include "code\modules\mob\abstract\new_player\poll.dm"
#include "code\modules\mob\abstract\new_player\preferences_setup.dm"
#include "code\modules\mob\abstract\new_player\sprite_accessories.dm"
-#include "code\modules\mob\abstract\observer\login.dm"
-#include "code\modules\mob\abstract\observer\logout.dm"
-#include "code\modules\mob\abstract\observer\observer.dm"
-#include "code\modules\mob\abstract\observer\say.dm"
#include "code\modules\mob\abstract\unauthed\login.dm"
#include "code\modules\mob\language\generic.dm"
#include "code\modules\mob\language\language.dm"
@@ -2948,9 +2960,10 @@
#include "code\modules\nano\nanoexternal.dm"
#include "code\modules\nano\nanomapgen.dm"
#include "code\modules\nano\nanoui.dm"
-#include "code\modules\nano\modules\ghost_menu.dm"
+#include "code\modules\nano\modules\follow_menu.dm"
#include "code\modules\nano\modules\human_appearance.dm"
#include "code\modules\nano\modules\nano_module.dm"
+#include "code\modules\nano\modules\narrate_panel.dm"
#include "code\modules\ntsl2\guide.dm"
#include "code\modules\ntsl2\ntsl2_program.dm"
#include "code\modules\ntsl2\ntsl2_types.dm"
@@ -3888,6 +3901,17 @@
#include "maps\away\away_site\uueoaesa\tret\tret_industrial_complex_theme.dm"
#include "maps\away\away_site\wrecked_nt_ship\wrecked_nt_ship.dm"
#include "maps\away\away_site\zavod_shuttle_destroyed\zavod_shuttle_destroyed.dm"
+#include "maps\away\scenarios\cryo_outpost\cryo_outpost_.dm"
+#include "maps\away\scenarios\cryo_outpost\cryo_outpost_areas.dm"
+#include "maps\away\scenarios\cryo_outpost\cryo_outpost_landmarks.dm"
+#include "maps\away\scenarios\cryo_outpost\cryo_outpost_outfits.dm"
+#include "maps\away\scenarios\cryo_outpost\cryo_outpost_scenario.dm"
+#include "maps\away\scenarios\cryo_outpost\cryo_outpost_theme.dm"
+#include "maps\away\scenarios\ruined_propellant_depot\ruined_propellant_depot_.dm"
+#include "maps\away\scenarios\ruined_propellant_depot\ruined_propellant_depot_areas.dm"
+#include "maps\away\scenarios\ruined_propellant_depot\ruined_propellant_depot_landmarks.dm"
+#include "maps\away\scenarios\ruined_propellant_depot\ruined_propellant_depot_roles.dm"
+#include "maps\away\scenarios\ruined_propellant_depot\ruined_propellant_depot_scenario.dm"
#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette.dm"
#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_areas.dm"
#include "maps\away\ships\biesel\tcaf_corvette\tcaf_corvette_ghostroles.dm"
diff --git a/code/ZAS/Airflow.dm b/code/ZAS/Airflow.dm
index f2cc6b9ce06..cbdf51b0e21 100644
--- a/code/ZAS/Airflow.dm
+++ b/code/ZAS/Airflow.dm
@@ -43,7 +43,7 @@ Contains helper procs for airflow, handled in /connection_group.
return 0
return 1
-/mob/abstract/observer/check_airflow_movable()
+/mob/abstract/ghost/observer/check_airflow_movable()
return 0
/mob/living/silicon/check_airflow_movable()
diff --git a/code/__DEFINES/_macros.dm b/code/__DEFINES/_macros.dm
index 8e330a338d7..32661a15e52 100644
--- a/code/__DEFINES/_macros.dm
+++ b/code/__DEFINES/_macros.dm
@@ -8,6 +8,7 @@
#define EXAMINE_BLOCK_BLUE(str) ("" + str + "
")
#define EXAMINE_BLOCK_RED(str) ("" + str + "
")
#define EXAMINE_BLOCK_DEEP_CYAN(str) ("" + str + "
")
+#define EXAMINE_BLOCK_ODYSSEY(str) ("" + str + "
")
#define MATRIX_DANGER(str) (FONT_LARGE(SPAN_DANGER(str)))
#define MATRIX_NOTICE(str) (FONT_LARGE(SPAN_NOTICE(str)))
diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
index bb79b8193dd..461aa24f29d 100644
--- a/code/__DEFINES/access.dm
+++ b/code/__DEFINES/access.dm
@@ -824,3 +824,12 @@
id = ACCESS_LONE_SPACER
desc = "Independent Skiff Access"
+#define ACCESS_CRYO_OUTPOST 244
+/datum/access/cryo_outpost_access
+ id = ACCESS_CRYO_OUTPOST
+ desc = "Outpost #187-D Access"
+
+#define ACCESS_RUINED_PROPELLANT_DEPOT 245
+/datum/access/ruined_propellant_depot_access
+ id = ACCESS_RUINED_PROPELLANT_DEPOT
+ desc = "Propellant Depot AG5 Access"
diff --git a/code/__DEFINES/gamemode.dm b/code/__DEFINES/gamemode.dm
index cd75f65e098..2b3722a994b 100644
--- a/code/__DEFINES/gamemode.dm
+++ b/code/__DEFINES/gamemode.dm
@@ -63,6 +63,8 @@
#define MODE_REVENANT "revenant"
#define MODE_GOLEM "golem"
#define MODE_JOCKEY "jockey"
+#define MODE_ACTOR "actor"
+#define MODE_STORYTELLER "storyteller"
#define DEFAULT_TELECRYSTAL_AMOUNT 20
#define DEFAULT_BLUECRYSTAL_AMOUNT 15
diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index 12c9beccb99..6a2d0c9009e 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -13,7 +13,7 @@
#define isbrain(A) istype(A, /mob/living/carbon/brain)
-#define isvirtualmob(A) istype(A, /mob/abstract/observer/virtual)
+#define isvirtualmob(A) istype(A, /mob/abstract/ghost/observer/virtual)
#define iscarbon(A) istype(A, /mob/living/carbon)
@@ -37,7 +37,13 @@
#define isspaceturf(A) istype(A, /turf/space)
-#define isobserver(A) istype(A, /mob/abstract/observer)
+#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)
+
+#define isabstractmob(A) istype(A, /mob/abstract)
#define isorgan(A) istype(A, /obj/item/organ/external)
diff --git a/code/__DEFINES/machinery.dm b/code/__DEFINES/machinery.dm
index 3dc7f732189..50cdea364ca 100644
--- a/code/__DEFINES/machinery.dm
+++ b/code/__DEFINES/machinery.dm
@@ -83,6 +83,7 @@
#define NETWORK_CANARY "Canary" // horizon shuttle, scout/fighter
#define NETWORK_QUARK "Quark" // horizon shuttle, xenoarch/science
#define NETWORK_NEWS "News"
+#define NETWORK_CRYO_OUTPOST "#187-D Outpost"
// Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them.
diff --git a/code/__DEFINES/rust_bapi.dm b/code/__DEFINES/rust_bapi.dm
index a5fc6e8d55c..b5454d8994a 100644
--- a/code/__DEFINES/rust_bapi.dm
+++ b/code/__DEFINES/rust_bapi.dm
@@ -41,5 +41,3 @@
// Should only call functions ending with `_ffi`.
#define bapi_read_dmm_file(arg) BAPI_CALL(read_dmm_file_ffi, arg)
-
-// ------------------------------------------- fin
diff --git a/code/__DEFINES/scenarios.dm b/code/__DEFINES/scenarios.dm
new file mode 100644
index 00000000000..dd6fe994341
--- /dev/null
+++ b/code/__DEFINES/scenarios.dm
@@ -0,0 +1,4 @@
+/// This mission is canon.
+#define SCENARIO_TYPE_CANON "canon"
+/// This mission is not canon.
+#define SCENARIO_TYPE_NONCANON "non-canon"
diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm
index b6fe3c16ad5..27f7581e517 100644
--- a/code/__DEFINES/span.dm
+++ b/code/__DEFINES/span.dm
@@ -23,6 +23,7 @@
#define SPAN_STYLE(style, str) "[str] "
#define SPAN_COLOR(color, str) SPAN_STYLE("color: [color]", "[str]")
#define SPAN_CAUTION(str) ("" + str + " ")
+#define SPAN_STORYTELLER(str) ("" + str + " ")
#define SPAN_RED(str) "[str] "
#define SPAN_YELLOW(str) "[str] "
diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm
index 5c89a51a997..5a9790e096b 100644
--- a/code/__DEFINES/subsystems.dm
+++ b/code/__DEFINES/subsystems.dm
@@ -241,6 +241,7 @@
#define INIT_ORDER_ICON_SMOOTHING -6
#define INIT_ORDER_OVERLAY -7
#define INIT_ORDER_WEATHER -9
+#define INIT_ORDER_ODYSSEY -15
#define INIT_ORDER_LIGHTING -20
#define INIT_ORDER_ZCOPY -21 //Aurora snowflake, Z-mimic flush. Should run after SSoverlay & SSicon_smooth so it copies the smoothed sprites.
#define INIT_ORDER_PATH -50
diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 539f4cd9807..8a01da3a0ed 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -95,7 +95,7 @@
var/list/candidates = list() //List of candidate KEYS to assume control of the new larva ~Carn
var/i = 0
while(candidates.len <= 0 && i < 5)
- for(var/mob/abstract/observer/G in GLOB.player_list)
+ for(var/mob/abstract/ghost/observer/G in GLOB.player_list)
if(((G.client.inactivity/10)/60) <= buffer + i) // the most active players are more likely to become an alien
if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
candidates += G.key
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index bcd300aa7bb..0d3dceb1900 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -135,6 +135,9 @@ GLOBAL_LIST_EMPTY(intent_listener)
/// Cache for clothing species adaptability.
GLOBAL_LIST_EMPTY(contained_clothing_species_adaption_cache)
+/// Cache for outfit selection.
+GLOBAL_LIST_EMPTY(outfit_cache)
+
//////////////////////////
/////Initial Building/////
//////////////////////////
diff --git a/code/__HELPERS/logging/subsystems/odyssey.dm b/code/__HELPERS/logging/subsystems/odyssey.dm
new file mode 100644
index 00000000000..9fc1b910726
--- /dev/null
+++ b/code/__HELPERS/logging/subsystems/odyssey.dm
@@ -0,0 +1,3 @@
+/proc/log_subsystem_odyssey(text)
+ if (GLOB.config?.logsettings["log_subsystems_odyssey"])
+ WRITE_LOG(GLOB.config.logfiles["world_subsystems_odyssey_log"], "SSodyssey: [text]")
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index a46b2fe3a08..fbc7ac65c18 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -146,7 +146,7 @@
if (rights & R_STEALTH) . += "[seperator]+STEALTH"
if (rights & R_REJUVINATE) . += "[seperator]+REJUVINATE"
if (rights & R_VAREDIT) . += "[seperator]+VAREDIT"
- if (rights & R_SOUNDS) . += "[seperator]+SOUND"
+ if (rights & R_SOUNDS) . += "[seperator]+SOUND"
if (rights & R_SPAWN) . += "[seperator]+SPAWN"
if (rights & R_MOD) . += "[seperator]+MODERATOR"
if (rights & R_DEV) . += "[seperator]+DEVELOPER"
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 9b77ded99b0..0265dd86269 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -374,7 +374,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
var/mob/M = old_list[named]
if(issilicon(M))
AI_list |= M
- else if(isobserver(M) || M.stat == 2)
+ else if(isghost(M))
Dead_list |= M
else if(M.key && M.client)
keyclient_list |= M
@@ -408,8 +408,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
namecounts[name] = 1
if (M.real_name && M.real_name != M.name)
name += " \[[M.real_name]\]"
- if (M.stat == 2)
- if(istype(M, /mob/abstract/observer/))
+ if (M.stat == DEAD)
+ if(isobserver(M))
name += " \[ghost\]"
else
name += " \[dead\]"
@@ -435,7 +435,7 @@ Turf and target are seperate in case you want to teleport some distance from a t
moblist.Add(M)
for(var/mob/living/carbon/alien/M in sortmob)
moblist.Add(M)
- for(var/mob/abstract/observer/M in sortmob)
+ for(var/mob/abstract/ghost/observer/M in sortmob)
moblist.Add(M)
for(var/mob/abstract/new_player/M in sortmob)
moblist.Add(M)
@@ -443,6 +443,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
moblist.Add(M)
for(var/mob/living/simple_animal/M in sortmob)
moblist.Add(M)
+ for(var/mob/abstract/ghost/storyteller/M in sortmob)
+ moblist.Add(M)
// for(var/mob/living/silicon/hivebot/M in world)
// mob_list.Add(M)
// for(var/mob/living/silicon/hive_mainframe/M in world)
diff --git a/code/_onclick/hud/other_mobs.dm b/code/_onclick/hud/other_mobs.dm
index df453377559..44d95903a65 100644
--- a/code/_onclick/hud/other_mobs.dm
+++ b/code/_onclick/hud/other_mobs.dm
@@ -2,7 +2,7 @@
/datum/hud/proc/unplayer_hud()
return
-/mob/abstract/observer/instantiate_hud(datum/hud/HUD)
+/mob/abstract/ghost/observer/instantiate_hud(datum/hud/HUD)
HUD.ghost_hud()
/datum/hud/proc/ghost_hud()
diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm
index ec882d5da9f..94e053fa353 100644
--- a/code/_onclick/observer.dm
+++ b/code/_onclick/observer.dm
@@ -1,40 +1,37 @@
/client/var/inquisitive_ghost = 1
-/mob/abstract/observer/verb/toggle_inquisition() // warning: unexpected inquisition
+/mob/abstract/ghost/observer/verb/toggle_inquisition() // warning: unexpected inquisition
set name = "Toggle Inquisitiveness"
set desc = "Sets whether your ghost examines everything on click by default"
set category = "Ghost"
- if(!client) return
+
+ if(!client)
+ return
+
client.inquisitive_ghost = !client.inquisitive_ghost
if(client.inquisitive_ghost)
to_chat(src, SPAN_NOTICE("You will now examine everything you click on."))
else
to_chat(src, SPAN_NOTICE("You will no longer examine things you click on."))
-/mob/abstract/observer/DblClickOn(var/atom/A, var/params)
- if(can_reenter_corpse && mind && mind.current)
- if(A == mind.current || (mind.current in A)) // double click your corpse or whatever holds it
- reenter_corpse() // (cloning scanner, body bag, closet, mech, etc)
- return // seems legit.
-
- orbiting?.end_orbit(src) // stop orbiting
-
+/mob/abstract/ghost/DblClickOn(var/atom/A, var/params)
// Things you might plausibly want to follow
if((ismob(A) && A != src) || istype(A,/obj/machinery/bot) || istype(A,/obj/singularity))
ManualFollow(A)
// Otherwise jump
else
+ orbiting?.end_orbit(src) // stop orbiting
forceMove(get_turf(A))
-/mob/abstract/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)
+/mob/abstract/ghost/observer/DblClickOn(atom/A, params)
+ if(can_reenter_corpse && mind && mind.current)
+ if(A == mind.current || (mind.current in A)) // double click your corpse or whatever holds it
+ reenter_corpse() // (cloning scanner, body bag, closet, mech, etc)
+ return // seems legit.
+ . = ..()
// 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/observer/user as mob)
+/atom/proc/attack_ghost(mob/abstract/ghost/user)
if(user.client && user.client.inquisitive_ghost)
examinate(user, src)
return
@@ -43,7 +40,7 @@
// And here are some good things for free:
// Now you can click through portals, wormholes, gateways, and teleporters while observing. -Sayu
-/obj/machinery/teleport/pad/attack_ghost(mob/user as mob)
+/obj/machinery/teleport/pad/attack_ghost(mob/user)
if(locked_obj)
var/obj/teleport_obj = locked_obj.resolve()
if(teleport_obj)
@@ -53,13 +50,13 @@
if(target)
user.forceMove(get_turf(target))
-/obj/machinery/gateway/centerstation/attack_ghost(mob/user as mob)
+/obj/machinery/gateway/centerstation/attack_ghost(mob/user)
if(awaygate)
user.forceMove(awaygate.loc)
else
to_chat(user, "[src] has no destination.")
-/obj/machinery/gateway/centeraway/attack_ghost(mob/user as mob)
+/obj/machinery/gateway/centeraway/attack_ghost(mob/user)
if(stationgate)
user.forceMove(stationgate.loc)
else
diff --git a/code/controllers/subsystems/ghostroles.dm b/code/controllers/subsystems/ghostroles.dm
index ceef74018cf..8bd560ca40b 100644
--- a/code/controllers/subsystems/ghostroles.dm
+++ b/code/controllers/subsystems/ghostroles.dm
@@ -197,7 +197,7 @@ SUBSYSTEM_DEF(ghostroles)
if("jump_to")
var/spawner_id = params["spawner_id"]
var/datum/ghostspawner/human/spawner = spawners[spawner_id]
- var/mob/abstract/observer/observer = usr
+ var/mob/abstract/ghost/observer/observer = usr
if(spawner && istype(observer) && spawner.can_jump_to(observer))
var/atom/turf = spawner.select_spawnlocation(FALSE)
if(isturf(turf))
@@ -208,7 +208,7 @@ SUBSYSTEM_DEF(ghostroles)
var/spawner_id = params["spawner_id"]
var/spawned_mob_name = params["spawned_mob_name"]
var/datum/ghostspawner/human/spawner = spawners[spawner_id]
- var/mob/abstract/observer/observer = usr
+ var/mob/abstract/ghost/observer/observer = usr
if(istype(observer) && spawner.can_jump_to(observer) && spawner && LAZYLEN(spawner.spawned_mobs))
for(var/datum/weakref/mob_ref in spawner.spawned_mobs)
var/mob/spawned_mob = mob_ref.resolve()
diff --git a/code/controllers/subsystems/initialization/misc_late.dm b/code/controllers/subsystems/initialization/misc_late.dm
index a810643707f..5e4fb2e3326 100644
--- a/code/controllers/subsystems/initialization/misc_late.dm
+++ b/code/controllers/subsystems/initialization/misc_late.dm
@@ -37,6 +37,11 @@ SUBSYSTEM_DEF(misc_late)
if (GLOB.config.use_forumuser_api)
update_admins_from_api(TRUE)
+ // Load outfits here so that the verb isn't laggy as balls.
+ for(var/outfit_type in subtypesof(/obj/outfit))
+ var/obj/outfit/new_outfit = new outfit_type()
+ GLOB.outfit_cache[new_outfit.name] = new_outfit
+
return SS_INIT_SUCCESS
/proc/sorted_add_area(area/A)
diff --git a/code/controllers/subsystems/pai.dm b/code/controllers/subsystems/pai.dm
index 54d61d7ea8d..e62246ed751 100644
--- a/code/controllers/subsystems/pai.dm
+++ b/code/controllers/subsystems/pai.dm
@@ -181,7 +181,7 @@ SUBSYSTEM_DEF(pai)
for(var/datum/paiCandidate/c in SSpai.pai_candidates)
if(c.ready)
var/found = 0
- for(var/mob/abstract/observer/o in GLOB.player_list)
+ for(var/mob/abstract/ghost/observer/o in GLOB.player_list)
if(o.key == c.key && o.MayRespawn())
found = 1
if(found)
@@ -293,7 +293,7 @@ SUBSYSTEM_DEF(pai)
/datum/controller/subsystem/pai/proc/requestRecruits(mob/user)
inquirer = user
- for(var/mob/abstract/observer/O in GLOB.player_list)
+ for(var/mob/abstract/ghost/observer/O in GLOB.player_list)
if(!O.MayRespawn())
continue
if(jobban_isbanned(O, "pAI"))
diff --git a/code/controllers/subsystems/processing/odyssey.dm b/code/controllers/subsystems/processing/odyssey.dm
new file mode 100644
index 00000000000..a072fbdbb3f
--- /dev/null
+++ b/code/controllers/subsystems/processing/odyssey.dm
@@ -0,0 +1,250 @@
+SUBSYSTEM_DEF(odyssey)
+ name = "Odyssey"
+ init_order = INIT_ORDER_ODYSSEY
+ runlevels = RUNLEVELS_PLAYING
+
+ /// The selected scenario singleton.
+ var/singleton/scenario/scenario
+ /// The z-levels that the odyssey takes place in.
+ var/list/scenario_zlevels = list()
+ /// This is the site the odyssey takes place on. If null, then the mission takes place on a non-site zlevel.
+ /// Should only be changed through set_scenario_site().
+ var/datum/map_template/ruin/away_site/scenario_site
+ /// A list of currently spawned actors for easy access.
+ var/list/mob/living/carbon/human/actors
+ /// A list of currently spawned storytellers for easy access.
+ var/list/mob/abstract/ghost/storyteller/storytellers
+ /// Whether or not we've sent the odyssey's roundstart report yet.
+ var/has_sent_roundstart_announcement = FALSE
+ /// The current station map's overmap object. We keep it here for convenience.
+ var/obj/effect/overmap/visitable/ship/main_map
+ /// If ships can dock on the Odyssey site. True by default, edited by the scenario.
+ var/site_landing_restricted = TRUE
+
+/datum/controller/subsystem/odyssey/Initialize()
+ return SS_INIT_SUCCESS
+
+/datum/controller/subsystem/odyssey/Recover()
+ scenario = SSodyssey.scenario
+ scenario_site = SSodyssey.scenario_site
+ scenario_zlevels = SSodyssey.scenario_zlevels
+ actors = SSodyssey.actors
+ storytellers = SSodyssey.storytellers
+
+/datum/controller/subsystem/odyssey/fire()
+ if(!has_sent_roundstart_announcement)
+ // First of all, notify the Horizon.
+ addtimer(CALLBACK(scenario, TYPE_PROC_REF(/singleton/scenario, send_main_map_message), main_map), rand(4 MINUTES, 6 MINUTES))
+ addtimer(CALLBACK(scenario, TYPE_PROC_REF(/singleton/scenario, unrestrict_landing_and_message_horizon), main_map), 40 MINUTES)
+
+ var/obj/effect/overmap/odyssey_site = get_odyssey_overmap_effect()
+
+ if(odyssey_site)
+ // Next, notify the offships - these announcements can happen earlier to potentially give them a bit of an edge in reaching the objective area.
+ addtimer(CALLBACK(scenario, TYPE_PROC_REF(/singleton/scenario, notify_offships), odyssey_site), rand(20 MINUTES, 50 MINUTES))
+
+ has_sent_roundstart_announcement = TRUE
+
+/**
+ * Returns the current scenario's overmap effect. Returns null if there isn't any.
+ */
+/datum/controller/subsystem/odyssey/proc/get_odyssey_overmap_effect()
+ var/obj/effect/overmap/odyssey_site
+ for(var/z in scenario_zlevels)
+ odyssey_site = GLOB.map_sectors["[z]"]
+ if(!istype(odyssey_site))
+ continue
+ return odyssey_site
+
+/**
+ * Picks a random odyssey while keeping in mind sector requirements.
+ * If successful, makes the SS start firing.
+ */
+/datum/controller/subsystem/odyssey/proc/pick_odyssey()
+ var/list/singleton/scenario/all_scenarios = GET_SINGLETON_SUBTYPE_LIST(/singleton/scenario)
+ var/list/possible_scenarios = list()
+ for(var/singleton/scenario/S as anything in all_scenarios)
+ if((SSatlas.current_sector.name in S.sector_whitelist) || !length(S.sector_whitelist))
+ possible_scenarios[S] = S.weight
+
+ if(!length(possible_scenarios))
+ log_subsystem_odyssey("CRITICAL ERROR: No available odyssey for sector [SSatlas.current_sector.name]!")
+ log_and_message_admins(SPAN_DANGER(FONT_HUGE("CRITICAL ERROR: NO SITUATIONS ARE AVAILABLE FOR THIS SECTOR!")))
+ return FALSE
+
+ scenario = pickweight(possible_scenarios)
+ setup_scenario_variables()
+ // Now that we actually have an odyssey, the subsystem can fire!
+ var/list/possible_station_levels = SSmapping.levels_by_all_traits(list(ZTRAIT_STATION))
+ main_map = GLOB.map_sectors["[pick(possible_station_levels)]"]
+ return TRUE
+
+/**
+ * This proc overrides the gamemode variables for the amount of actors and takes care of overriding any other variables the scenario might set on external things.
+ * Note that Storytellers spawn through a ghost role.
+ */
+/datum/controller/subsystem/odyssey/proc/setup_scenario_variables()
+ var/datum/game_mode/odyssey/ody_gamemode = GLOB.gamemode_cache["odyssey"]
+ if(scenario)
+ ody_gamemode.required_players = scenario.min_player_amount
+ ody_gamemode.required_enemies = scenario.min_actor_amount
+ site_landing_restricted = scenario.site_landing_restricted
+
+/**
+ * This is the proc that should be used to set the odyssey away site.
+ */
+/datum/controller/subsystem/odyssey/proc/set_scenario_site(datum/map_template/ruin/away_site/site)
+ if(!istype(site))
+ return
+
+ scenario_site = site
+
+/**
+ * Adds an actor to the subsystem actor list.
+ */
+/datum/controller/subsystem/odyssey/proc/add_actor(mob/living/carbon/human/H)
+ LAZYDISTINCTADD(actors, H)
+
+/**
+ * Adds a storyteller to the subsystem storyteller list.
+ */
+/datum/controller/subsystem/odyssey/proc/add_storyteller(mob/abstract/ghost/storyteller/S)
+ LAZYDISTINCTADD(storytellers, S)
+
+/**
+ * Removes an actor from the subsystem actor list.
+ */
+/datum/controller/subsystem/odyssey/proc/remove_actor(mob/living/carbon/human/H)
+ LAZYREMOVE(actors, H)
+
+/**
+ * Removes a storyteller from the subsystem storyteller list.
+ */
+/datum/controller/subsystem/odyssey/proc/remove_storyteller(mob/abstract/ghost/storyteller/S)
+ LAZYREMOVE(storytellers, S)
+
+/datum/controller/subsystem/odyssey/ui_state()
+ return GLOB.always_state
+
+/datum/controller/subsystem/odyssey/ui_interact(mob/user, datum/tgui/ui)
+ . = ..()
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "OdysseyPanel", "Odyssey Panel")
+ ui.open()
+
+/datum/controller/subsystem/odyssey/ui_data(mob/user)
+ var/list/data = list()
+ if(scenario)
+ data["scenario_name"] = SSodyssey.scenario.name
+ data["scenario_desc"] = SSodyssey.scenario.desc
+ data["scenario_canonicity"] = SSodyssey.scenario.scenario_type == SCENARIO_TYPE_CANON ? "Canon" : "Non-Canon"
+ data["is_storyteller"] = isstoryteller(user) || check_rights(R_ADMIN, FALSE, user)
+
+ if(length(scenario.roles))
+ data["scenario_roles"] = list()
+ for(var/role_singleton in scenario.roles)
+ var/singleton/role/scenario_role = GET_SINGLETON(role_singleton)
+ data["scenario_roles"] += list(
+ list(
+ "name" = scenario_role.name,
+ "desc" = scenario_role.desc,
+ "outfit" = "[scenario_role.outfit]",
+ "type" = scenario_role.type
+ )
+ )
+ return data
+
+/datum/controller/subsystem/odyssey/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+
+ var/mob/odyssey_user = ui.user
+ if(!ismob(odyssey_user))
+ return
+
+ var/is_admin = check_rights(R_ADMIN, FALSE, odyssey_user)
+
+ switch(action)
+ if("equip_outfit")
+ if(!ishuman(odyssey_user))
+ return
+
+ var/mob/living/carbon/human/player = odyssey_user
+ if(player.incapacitated())
+ return
+
+ if(!((player.z in SSodyssey.scenario_zlevels) || (isAdminLevel(player.z))))
+ to_chat(player, SPAN_WARNING("You can only equip outfits on the odyssey scenario z-level, or the actor prep area!"))
+ return
+
+ var/outfit_type = text2path(params["outfit_type"])
+ if(ispath(outfit_type, /obj/outfit))
+ player.delete_inventory(TRUE)
+ player.preEquipOutfit(outfit_type, FALSE)
+ player.equipOutfit(outfit_type, FALSE)
+ return TRUE
+
+ if("edit_scenario_name")
+ if(!isstoryteller(odyssey_user) && !is_admin)
+ return
+
+ var/new_scenario_name = tgui_input_text(usr, "Insert the new name for your scenario. Remember that this will be visible for anyone in the Stat Panel.", "Odyssey Panel", max_length = MAX_NAME_LEN)
+ if(!new_scenario_name)
+ return
+
+ log_and_message_admins("has changed the scenario name from [SSodyssey.scenario.name] to [new_scenario_name]", odyssey_user)
+ SSodyssey.scenario.name = new_scenario_name
+ return TRUE
+
+ if("edit_scenario_desc")
+ if(!isstoryteller(odyssey_user) && !is_admin)
+ return
+
+ var/new_scenario_desc = tgui_input_text(odyssey_user, "Insert the new description for your scenario. This is visible only in the Odyssey Panel.", "Odyssey Panel", max_length = MAX_MESSAGE_LEN)
+ if(!new_scenario_desc)
+ return
+
+ log_and_message_admins("has changed the scenario description", odyssey_user)
+ SSodyssey.scenario.desc = new_scenario_desc
+ return TRUE
+
+ if("edit_role")
+ if(!isstoryteller(odyssey_user) && !is_admin)
+ return
+
+ var/role_path = text2path(params["role_type"])
+ if(!role_path || !ispath(role_path, /singleton/role))
+ to_chat(odyssey_user, SPAN_WARNING("Invalid or inexisting role!"))
+ return
+
+ var/singleton/role/role_to_edit = GET_SINGLETON(role_path)
+ var/editing_name = params["new_name"]
+ var/editing_desc = params["new_desc"]
+ var/editing_outfit = params["edit_outfit"]
+
+ if(editing_name)
+ var/new_name = tgui_input_text(odyssey_user, "Insert the new name for this role.", "Odyssey Panel", max_length = MAX_NAME_LEN)
+ if(new_name)
+ log_and_message_admins("has changed the [role_to_edit.name] role's name to [new_name]", odyssey_user)
+ role_to_edit.name = new_name
+ return TRUE
+
+ if(editing_desc)
+ var/new_desc = tgui_input_text(odyssey_user, "Insert the new description for this role.", "Odyssey Panel", max_length = MAX_MESSAGE_LEN)
+ if(new_desc)
+ log_and_message_admins("has changed the [role_to_edit.name] role's description", odyssey_user)
+ role_to_edit.desc = new_desc
+ return TRUE
+
+ if(editing_outfit)
+ var/chosen_outfit = tgui_input_list(odyssey_user, "Select the new outfit for this role.", "Odyssey Panel", GLOB.outfit_cache)
+ if(chosen_outfit)
+ var/obj/outfit/new_outfit = GLOB.outfit_cache[chosen_outfit]
+ if(new_outfit)
+ log_and_message_admins("has changed the [role_to_edit.name] role's outfit from [role_to_edit.outfit] to [new_outfit]", odyssey_user)
+ role_to_edit.outfit = new_outfit.type
+ return TRUE
+
+
diff --git a/code/controllers/subsystems/records.dm b/code/controllers/subsystems/records.dm
index 093df3e192a..f4db33492df 100644
--- a/code/controllers/subsystems/records.dm
+++ b/code/controllers/subsystems/records.dm
@@ -203,7 +203,7 @@ SUBSYSTEM_DEF(records)
return GLOB.always_state
/datum/controller/subsystem/records/ui_status(mob/user, datum/ui_state/state)
- return (isnewplayer(user) || isobserver(user) || issilicon(user)) ? UI_INTERACTIVE : UI_CLOSE
+ return (isnewplayer(user) || isghost(user) || issilicon(user)) ? UI_INTERACTIVE : UI_CLOSE
/datum/controller/subsystem/records/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
@@ -211,7 +211,7 @@ SUBSYSTEM_DEF(records)
return
if(action == "follow")
- var/mob/abstract/observer/O = usr
+ var/mob/abstract/ghost/O = usr
if(istype(O))
for(var/mob/living/M in GLOB.human_mob_list)
if(istype(M) && M.real_name == params["name"])
@@ -222,7 +222,7 @@ SUBSYSTEM_DEF(records)
/datum/controller/subsystem/records/ui_static_data(mob/user)
var/list/data = list()
data["manifest"] = SSrecords.get_manifest_list()
- data["allow_follow"] = isobserver(user)
+ data["allow_follow"] = isghost(user)
return data
/datum/controller/subsystem/records/proc/open_manifest_tgui(mob/user, datum/tgui/ui)
diff --git a/code/controllers/subsystems/statpanel.dm b/code/controllers/subsystems/statpanel.dm
index d2ab2447abc..d4a983417c6 100644
--- a/code/controllers/subsystems/statpanel.dm
+++ b/code/controllers/subsystems/statpanel.dm
@@ -41,6 +41,10 @@ SUBSYSTEM_DEF(statpanels)
if(eta_status)
global_data += eta_status
+ if(SSodyssey && SSodyssey.scenario)
+ global_data += "Odyssey: [SSodyssey.scenario.name]"
+ global_data += "Storytellers: [length(SSodyssey.storytellers)]"
+
src.currentrun = GLOB.clients.Copy()
mc_data = null
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index c658743fd2f..12dfc854166 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -64,6 +64,9 @@ var/datum/controller/subsystem/ticker/SSticker
var/list/roundstart_callbacks
+ /// Used to prevent players from readying or unreadying, such as for Odyssey's setup.
+ var/prevent_unready = FALSE
+
// Pre-game ready menu handling
var/total_players = 0
var/total_players_ready = 0
@@ -262,8 +265,8 @@ var/datum/controller/subsystem/ticker/SSticker
else
to_chat(Player, SPAN_NOTICE(SPAN_BOLD("You missed the crew transfer after the events on [station_name()] as [Player.real_name].")))
else
- if(istype(Player,/mob/abstract/observer))
- var/mob/abstract/observer/O = Player
+ if(isobserver(Player))
+ var/mob/abstract/ghost/observer/O = Player
if(!O.started_as_observer)
to_chat(Player, SPAN_WARNING(SPAN_BOLD("You did not survive the events on [station_name()]...")))
else
@@ -533,6 +536,15 @@ var/datum/controller/subsystem/ticker/SSticker
to_world("Serious error in mode setup! Reverting to pre-game lobby.")
return SETUP_REVOTE
+ // This proc must return TRUE on success.
+ if(!mode.pre_game_setup())
+ current_state = GAME_STATE_PREGAME
+ to_world("Round start pre-game setup failed! Reverting to pre-game lobby.")
+ prevent_unready = FALSE
+ return SETUP_REVOTE
+
+ prevent_unready = FALSE
+
SSjobs.ResetOccupations()
src.mode.create_antagonists()
src.mode.pre_setup()
diff --git a/code/datums/components/eye/freelook.dm b/code/datums/components/eye/freelook.dm
index 427eb869699..38d6f91ecca 100644
--- a/code/datums/components/eye/freelook.dm
+++ b/code/datums/components/eye/freelook.dm
@@ -1,6 +1,6 @@
//For mobs connecting to the station's cameranet without needing AI procs
-/datum/component/eye/cameranet
- eye_type = /mob/abstract/eye/cameranet
+/datum/component/eye/freelook
+ eye_type = /mob/abstract/eye/freelook
//For mobs connecting to other visualnets. Pass visualnet as eye_args in look()
/datum/component/eye/freelook
diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm
index e73d4da5631..d30782937d7 100644
--- a/code/datums/components/orbiter.dm
+++ b/code/datums/components/orbiter.dm
@@ -122,7 +122,7 @@
orbiter_mob.glide_size = 8
if(isobserver(orbiter))
- var/mob/abstract/observer/ghostie = orbiter //is var/mob/dead/observer/ghostie = orbiter in tg
+ var/mob/abstract/ghost/ghostie = orbiter //is var/mob/dead/observer/ghostie = orbiter in tg
ghostie.orbiting_ref = null
// REMOVE_TRAIT(orbiter, TRAIT_NO_FLOATING_ANIM, ORBITING_TRAIT)
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index c8d2eb119dd..bdce42505bc 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -313,7 +313,7 @@
return FALSE
- if(isobserver(teleatom)) // do not teleport ghosts
+ if(isghost(teleatom)) // do not teleport ghosts
return FALSE
diff --git a/code/datums/scenarios/roles.dm b/code/datums/scenarios/roles.dm
new file mode 100644
index 00000000000..60cdfb6ce80
--- /dev/null
+++ b/code/datums/scenarios/roles.dm
@@ -0,0 +1,8 @@
+/singleton/role
+ /// The role's name.
+ var/name = "Generic Goon"
+ /// The role's description. It should contain the information on what it's supposed to do.
+ var/desc = "Your job is to be a generic goon in this scenario. Nothing special."
+ /// The /obj/outfit this role equips you with.
+ var/outfit = /obj/outfit/admin/generic
+
diff --git a/code/datums/scenarios/scenario.dm b/code/datums/scenarios/scenario.dm
new file mode 100644
index 00000000000..3a07ae6cfbb
--- /dev/null
+++ b/code/datums/scenarios/scenario.dm
@@ -0,0 +1,151 @@
+/singleton/scenario
+ /// The scenario's name. Displayed in the round end report and some other places.
+ var/name = "Generic Scenario"
+ /// The scenario's description. Displayed in the round end report and some other places.
+ var/desc = "A generic scenario that should not be in the rotation."
+ /// What sectors this scenario can spawn in. An empty list is all sectors.
+ var/list/sector_whitelist = list()
+ /// The type of scenario this is. NOT a boolean or a bitfield.
+ var/scenario_type = SCENARIO_TYPE_NONCANON
+ /// Whether or not landing on the Odyssey away site is restricted by default. Has to be either unrestricted by Storytellers manually, or happens forcefully at 40 minutes in.
+ var/site_landing_restricted = TRUE
+
+ // All scenarios happen in an away site, which is manually spawned the very second the round starts.
+ // This away site can have its exoplanet themes defined and then mapped to give the semblance of being on a planet (see the Tret away site).
+ // Alternatively, without defining exoplanet themes, it can take place in space, for example.
+ // In the future there will likely be support for no-away site scenarios that take place on the Horizon.
+
+ /// The away site ID of the scenario to spawn. This is what you should edit, set it to the away site's id variable.
+ var/scenario_site_id
+ /// This is the away site where the scenario takes place. Do not edit this variable - it's set automatically.
+ var/datum/map_template/ruin/away_site/scenario_site
+ /// Weight given to the odyssey in pickweight when being picked.
+ var/weight = 20
+ /// The minimum amount of total players required for an odyssey to spawn.
+ var/min_player_amount = 8
+ /// The minimum amount of actors we want to spawn in this odyssey.
+ var/min_actor_amount = 1
+
+ /// The scenario_announcements singleton for this scenario. Contains information on the announcements sent to the Horizon and the offships.
+ /// Initially set to a type, which is then created in Initialize().
+ var/singleton/scenario_announcements/scenario_announcements = /singleton/scenario_announcements
+
+ /// The default outfit every actor is given on this scenario.
+ /// They can select their role and outfit on the Odyssey UI when ingame.
+ var/default_outfit = /obj/outfit/admin/generic
+
+ /// The displayed list of scenario roles.
+ /// The players will be able to see the role names in the Odyssey UI, and when they click them, they'll equip the relevant outfit.
+ var/list/singleton/role/roles
+
+ /// The base area of this scenario's away site. Used for blueprints. Must have AREA_FLAG_IS_BACKGROUND.
+ var/base_area
+
+ /// The name of the frequency that will be used by the radios on the away site.
+ var/radio_frequency_name = "Sector"
+
+/singleton/scenario/Initialize()
+ . = ..()
+ if(!ispath(scenario_announcements))
+ crash_with("Scenario [type] tried initializing without appropriate announcements!")
+ scenario_announcements = GET_SINGLETON(scenario_announcements)
+
+/**
+ * This proc handles the creation and spawning of everything that the odyssey needs.
+ * This could be a map or landmarks or whatever.
+ */
+/singleton/scenario/proc/setup_scenario()
+ SHOULD_NOT_OVERRIDE(TRUE)
+ scenario_site = SSmapping.away_sites_templates[scenario_site_id]
+ if(istype(scenario_site))
+ to_world(FONT_LARGE(SPAN_DANGER("Setting up this round's Odyssey...")))
+ setup_away_site()
+ to_world(FONT_LARGE(SPAN_DANGER("Your Odyssey is ready!")))
+ else
+ // To edit this part eventually for Horizon odyssey scenarios.
+ log_and_message_admins(FONT_HUGE("CRITICAL FAILURE: SCENARIO [name] DOES NOT HAVE A VALID SITE!"))
+ return FALSE
+ return TRUE
+
+/**
+ * This proc is the one called to set up a new z-level for the odyssey.
+ * This is the one you should override for custom logic.
+ */
+/singleton/scenario/proc/setup_away_site()
+ // load the site
+ var/list/bounds = scenario_site.load_new_z()
+ for(var/z_index in bounds[MAP_MINZ] to bounds[MAP_MAXZ])
+ SSodyssey.scenario_zlevels += world.maxz
+ base_area = new base_area()
+
+ // regenerate minimaps
+ SSholomap.generate_all_minimaps()
+
+/**
+ * This proc sends the early message to the Horizon. It is supposed to be sent around 5 minutes in, telling them to get ready for the expedition and to start going there.
+ * It essentially lets them move to the away site and prepare stuff for the expeditions, like shuttles, manpower and resources, without it being metagaming.
+ * You can override it with an empty return if you don't want anything sent early on.
+ */
+/singleton/scenario/proc/send_main_map_message(var/obj/effect/overmap/visitable/ship/horizon)
+ command_announcement.Announce(scenario_announcements.horizon_early_announcement_message, scenario_announcements.horizon_announcement_title, do_print = TRUE)
+ var/obj/effect/overmap/odyssey_site = SSodyssey.get_odyssey_overmap_effect()
+ if(odyssey_site)
+ for(var/obj/machinery/computer/ship/sensors/sensors in SSodyssey.main_map.consoles)
+ sensors.add_contact(odyssey_site)
+
+/**
+ * This proc is called when the away site landing restrictions are lifted. Generally the flavour message here should contain something about the landing site being cleared/authorized or whatever to get the point across.
+ * This also automatically unrestricts the landing if there is no storyteller.
+ */
+/singleton/scenario/proc/unrestrict_landing_and_message_horizon(var/obj/effect/overmap/visitable/ship/horizon)
+ // We don't want to send the default announcement if there are Storytellers. Let them make their own.
+ if(!length(SSodyssey.storytellers))
+ command_announcement.Announce(scenario_announcements.horizon_unrestrict_landing_message, scenario_announcements.horizon_announcement_title, do_print = TRUE)
+ unrestrict_away_site_landing()
+ else
+ for(var/mob/storyteller in SSodyssey.storytellers)
+ to_chat(storyteller, FONT_LARGE(SPAN_NOTICE("The automated announcement to the Horizon would have been sent now, but it has been blocked by the presence of a Storyteller.")))
+ to_chat(storyteller, FONT_LARGE(SPAN_NOTICE("Remember that nobody can dock with the Scenario away site yet.")))
+ to_chat(storyteller, FONT_LARGE(SPAN_DANGER("When you are ready, use the Unrestrict Away Site Landing verb!")))
+/**
+ * This proc notifies the offships about the presence of the Scenario and its coordinates.
+ */
+/singleton/scenario/proc/notify_offships(obj/effect/overmap/odyssey_site)
+ if(!istype(odyssey_site))
+ return
+
+ for(var/obj/effect/overmap/visitable/ship/ship as anything in SSshuttle.ships)
+ // Don't duplicate the message for landable ships. We don't want to notify both the big ship and its shuttle.
+ // Or notify the Horizon again, for that matter...
+ if(istype(ship, /obj/effect/overmap/visitable/ship/landable) || (ship == SSodyssey.main_map))
+ continue
+
+ for(var/obj/machinery/computer/ship/sensors/sensors in ship.consoles)
+ priority_announcement.Announce(scenario_announcements.offship_announcement_message, "[ship.name] Sensors Report", zlevels = ship.map_z)
+ sensors.add_contact(odyssey_site)
+
+/**
+ * Unrestricts the landing on the away site. This proc is on the scenario so it can be overridden if a scenario wants to do something specific
+ * when the away site landing is unrestricted.
+ */
+/singleton/scenario/proc/unrestrict_away_site_landing()
+ SHOULD_CALL_PARENT(TRUE)
+ SSodyssey.site_landing_restricted = FALSE
+
+/singleton/scenario_announcements
+ /// The title for the messages sent to the Horizon to notify them of the scenarios, both in notify_scenario_early and notify_scenario_late.
+ var/horizon_announcement_title = "Central Command Situation Report"
+ /// The announcement message sent to the Horizon immediately after roundstart (5 minutes or so), telling them to prepare for a yet unknown expedition.
+ var/horizon_early_announcement_message = "SCCV Horizon, your sensors suite has located a site of interest and the coordinates have been marked on your sensors. Please prepare an expedition while we investigate landing conditions."
+ /// The announcement message sent to the Horizon around 20 minutes in, typically telling them to go investigate the scenario and the reason why.
+ var/horizon_unrestrict_landing_message = "The landing sites have been registered and cleared. An expedition is now authorized to depart."
+
+ /// The announcement message for offships. This one contains all the info, without time segmentation.
+ var/offship_announcement_message = "A recent sensors scan indicates the presence of a site of interest to investigate. The oordinates have been registered on the sensors consoles."
+
+/obj/effect/landmark/actor
+ name = "actor"
+
+/obj/effect/ghostspawpoint/storyteller
+ name = "storyteller"
+ identifier = "storyteller"
diff --git a/code/datums/votes/round_type.dm b/code/datums/votes/round_type.dm
index 019bc757391..f703926efe5 100644
--- a/code/datums/votes/round_type.dm
+++ b/code/datums/votes/round_type.dm
@@ -77,8 +77,7 @@
for(var/votable_mode_name in GLOB.config.votable_modes)
var/datum/game_mode/M = GLOB.gamemode_cache[votable_mode_name]
-
- if(M.name == winning_option)
+ if(M?.name == winning_option)
GLOB.master_mode = M.config_tag
break
diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm
index f0724be4383..b6c22c83c92 100644
--- a/code/datums/wires/wires.dm
+++ b/code/datums/wires/wires.dm
@@ -248,7 +248,7 @@ var/global/list/wire_name_directory = list()
*/
/datum/wires/proc/can_reveal_wires(mob/user)
// Admin ghost can see a purpose of each wire.
- if(isobserver(user) && check_rights(R_MOD, FALSE, user))
+ if(isghost(user) && check_rights(R_MOD, FALSE, user))
return TRUE
// Station blueprints do that too, but only if the wires are not randomized.
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index 985c3e32c7d..cdb6f6ab693 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -44,7 +44,10 @@
var/msg = FormMessage(message, message_title)
for(var/mob/M in GLOB.player_list)
- if(!istype(M, /mob/abstract/new_player) && !isdeaf(M) && (GET_Z(M) in (zlevels | SSatlas.current_map.admin_levels)))
+ if(isnewplayer(M))
+ continue
+
+ if(isghost(M) || (!isdeaf(M) && (GET_Z(M) in (zlevels | SSatlas.current_map.admin_levels))))
var/turf/T = get_turf(M)
if(T)
to_chat(M, msg)
diff --git a/code/game/antagonist/antagonist.dm b/code/game/antagonist/antagonist.dm
index 5c85b2e2ee9..7e0fb90b6b6 100644
--- a/code/game/antagonist/antagonist.dm
+++ b/code/game/antagonist/antagonist.dm
@@ -30,7 +30,7 @@
// Faction data.
var/faction_role_text // Role for sub-antags. Mandatory for faction role.
var/faction_descriptor // Description of the cause. Mandatory for faction role.
- var/faction_verb // Verb added when becoming a member of the faction, if any.
+ var/list/faction_verbs // Verbs added when becoming a member of the faction, if any.
var/faction_welcome // Message shown to faction members.
var/faction = "neutral" // Faction name, mostly used for simple animals.
@@ -53,6 +53,7 @@
var/suspicion_chance = 50 // Prob of being on the initial Command report
var/flags = 0 // Various runtime options.
var/db_log_id = null // ID of the db entry used to track that antagonist
+ var/allow_no_mob = FALSE // This antagonist allows ghosts as antag, or other mobs that don't fill out the current var.
// Used for setting appearance.
var/list/valid_species = list(SPECIES_UNATHI,SPECIES_TAJARA,SPECIES_SKRELL,SPECIES_SKRELL_AXIORI,SPECIES_HUMAN)
diff --git a/code/game/antagonist/antagonist_add.dm b/code/game/antagonist/antagonist_add.dm
index b1c149edad4..c2f6dd529ee 100644
--- 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)
@@ -32,8 +33,8 @@
return 0
current_antagonists |= player
- if(faction_verb && player.current)
- add_verb(player.current.client, faction_verb)
+ if(LAZYLEN(faction_verbs) && player.current)
+ add_verb(player.current.client, faction_verbs)
if(player.current.client)
add_verb(player.current.client, /client/proc/aooc)
@@ -58,8 +59,8 @@
if(!istype(player))
return 0
- if(player.current && faction_verb)
- remove_verb(player.current.client, faction_verb)
+ if(player.current && LAZYLEN(faction_verbs))
+ remove_verb(player.current.client, faction_verbs)
if(player in current_antagonists)
log_antagonist_remove()
diff --git a/code/game/antagonist/antagonist_factions.dm b/code/game/antagonist/antagonist_factions.dm
index 3700d38ccf3..306afa744f5 100644
--- a/code/game/antagonist/antagonist_factions.dm
+++ b/code/game/antagonist/antagonist_factions.dm
@@ -21,7 +21,7 @@
if(!player || !faction || !player.current)
return
- if(!faction.faction_verb || !faction.faction_descriptor || !faction.faction_verb)
+ if(!faction.faction_descriptor || !LAZYLEN(faction.faction_verbs))
return
if(faction.is_antagonist(player))
diff --git a/code/game/antagonist/outsider/actor.dm b/code/game/antagonist/outsider/actor.dm
new file mode 100644
index 00000000000..36ff159815a
--- /dev/null
+++ b/code/game/antagonist/outsider/actor.dm
@@ -0,0 +1,63 @@
+GLOBAL_DATUM(actors, /datum/antagonist/actor)
+
+/datum/antagonist/actor
+ id = MODE_ACTOR
+ role_text = "Actor"
+ role_text_plural = "Actors"
+ welcome_text = "You are an actor. Your role is to provide an interesting roleplay scenario for the crew. You may use your scenario's guidelines, or \
+ agree with everyone else to play something different. Your creativity is the limit! Remember that you are an antagonist, and so you have \
+ all the freedoms an antagonist does."
+ faction = "actor"
+ landmark_id = "ActorSpawnLandmark"
+ flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_HAS_NUKE | ANTAG_SET_APPEARANCE | ANTAG_NO_FLAVORTEXT
+ hard_cap = 10
+ hard_cap_round = 15
+ initial_spawn_req = 2 // Needs to be set to 2 to allow it to show as a group antag on the lobby setup screen.
+
+ bantype = "actor"
+
+ faction_verbs = list(
+ /mob/living/carbon/human/proc/odyssey_panel
+ )
+
+/datum/antagonist/actor/New()
+ ..()
+ GLOB.actors = src
+
+/datum/antagonist/actor/equip(var/mob/living/carbon/human/player)
+ if(!..())
+ return FALSE
+
+ for (var/obj/item/I in player)
+ if (istype(I, /obj/item/implant))
+ continue
+ player.drop_from_inventory(I)
+ if(I.loc != player)
+ qdel(I)
+
+ if(SSodyssey?.scenario)
+ player.preEquipOutfit(SSodyssey.scenario.default_outfit, FALSE)
+ player.equipOutfit(SSodyssey.scenario.default_outfit, FALSE)
+
+ player.force_update_limbs()
+ player.update_eyes()
+ player.regenerate_icons()
+
+ return TRUE
+
+/obj/effect/landmark/actor_spawn
+ name = "ActorSpawnLandmark"
+
+/mob/living/carbon/human/proc/odyssey_panel()
+ set name = "Odyssey Panel"
+ set category = "Actor"
+
+ if(!ishuman(usr))
+ return
+
+ var/mob/living/carbon/human/H = usr
+ if(H.incapacitated())
+ return
+
+ SSodyssey.ui_interact(H)
+
diff --git a/code/game/antagonist/outsider/commando.dm b/code/game/antagonist/outsider/commando.dm
index 378ce500c39..e4e18b80e2e 100644
--- a/code/game/antagonist/outsider/commando.dm
+++ b/code/game/antagonist/outsider/commando.dm
@@ -19,5 +19,5 @@ var/datum/antagonist/deathsquad/mercenary/commandos
if(istype(M)) M.age = rand(25,45)
/datum/antagonist/deathsquad/mercenary/New()
- ..(1)
+ ..()
commandos = src
diff --git a/code/game/antagonist/outsider/storyteller.dm b/code/game/antagonist/outsider/storyteller.dm
new file mode 100644
index 00000000000..43a126f649c
--- /dev/null
+++ 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()
+ ..()
+ GLOB.storytellers = src
diff --git a/code/game/antagonist/station/loyalist.dm b/code/game/antagonist/station/loyalist.dm
index 74aa370d87a..dba99b06283 100644
--- a/code/game/antagonist/station/loyalist.dm
+++ b/code/game/antagonist/station/loyalist.dm
@@ -22,7 +22,7 @@ var/datum/antagonist/loyalists/loyalists
// Inround loyalists.
faction_role_text = "Loyalist"
faction_descriptor = "Loyalists"
- faction_verb = /mob/living/proc/convert_to_loyalist
+ faction_verbs = list(/mob/living/proc/convert_to_loyalist)
faction_welcome = "You have decided to defend the establishment, no matter what it takes.. Follow your leaders' instructions and try to achieve the Loyalists' goals."
faction_indicator = "fellowship"
faction_invisible = FALSE
diff --git a/code/game/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm
index 5a43d5c2da4..014e8bf52dd 100644
--- a/code/game/antagonist/station/revolutionary.dm
+++ b/code/game/antagonist/station/revolutionary.dm
@@ -22,7 +22,7 @@ var/datum/antagonist/revolutionary/revs
// Inround revs.
faction_role_text = "Revolutionary"
faction_descriptor = "Revolutionaries"
- faction_verb = /mob/living/proc/convert_to_rev
+ faction_verbs = list(/mob/living/proc/convert_to_rev)
faction_indicator = "contender"
faction_invisible = FALSE
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 05075a8b753..8f78a7b3a5f 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -516,7 +516,7 @@ var/list/mob/living/forced_ambiance_list = new
blurb_verb.do_area_blurb(src, TRUE)
/// A ghost version of the view area blurb verb so you can view it while observing.
-/mob/abstract/observer/verb/ghost_show_area_blurb()
+/mob/abstract/ghost/observer/verb/ghost_show_area_blurb()
set name = "Show Area Blurb"
set category = "IC"
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index be3f6fb6a03..3fc82af2273 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -150,7 +150,7 @@
|| locate(/obj/machinery/computer/cloning, get_step(src, WEST)))
if(!M.client && M.mind)
- for(var/mob/abstract/observer/ghost in GLOB.player_list)
+ for(var/mob/abstract/ghost/observer/ghost in GLOB.player_list)
if(ghost.mind == M.mind)
to_chat(ghost, "Your corpse has been placed into a cloning scanner. Return to your body if you want to be resurrected/cloned! [L.name] ([ckey(D.mind.key)]), the [L.job] (Dead)\n"
diff --git a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
index 0a5e026b72b..1729f1b0448 100644
--- a/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
+++ b/code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
@@ -182,7 +182,7 @@
// return
log_ability_use(user, "advanced encryption hack (SUCCESS - title: [reporttitle])")
to_world(SPAN_ALERT("New [SSatlas.current_map.company_name] Update available at all communication consoles."))
- sound_to(world, ('sound/AI/commandreport.ogg'))
+ sound_to_playing_players('sound/AI/commandreport.ogg')
post_comm_message(reporttitle, reportbody)
/datum/game_mode/malfunction/verb/elite_encryption_hack()
diff --git a/code/game/gamemodes/odyssey/odyssey.dm b/code/game/gamemodes/odyssey/odyssey.dm
new file mode 100644
index 00000000000..545369992df
--- /dev/null
+++ b/code/game/gamemodes/odyssey/odyssey.dm
@@ -0,0 +1,34 @@
+/datum/game_mode/odyssey
+ name = "Odyssey"
+ round_description = "Continue the Horizon's odyssey throughout the Spur and partake in whatever goes wrong (or right) today."
+ extended_round_description = "The SCCV Horizon - being an exploration vessel - often finds itself in various situations, good or bad. Today could be a good day for you, \
+ or you could end up brutally murdered by otherworldly horrors. Do it for Miranda."
+ config_tag = "odyssey"
+ required_players = 8
+ required_enemies = 2 // The actual antag-setting is handled by the mission singleton.
+ antag_tags = list(MODE_ACTOR)
+ antag_scaling_coeff = 1
+
+/datum/game_mode/odyssey/pre_game_setup()
+ SSticker.prevent_unready = TRUE
+
+ if(!SSodyssey.pick_odyssey())
+ return FALSE
+
+ var/odyssey_message = "The scenario picked for this round is: [SPAN_BOLD(SPAN_NOTICE(SSodyssey.scenario.name))].\The [user] is shaking \the [src], hoping to get an answer to \"[question]\".(Answer) Unconscious Observing "
else
msg += "DEAD STORYTELLING DEAD EYE "
-/mob/abstract/observer/extra_admin_link(var/source)
+/mob/abstract/ghost/observer/extra_admin_link(var/source)
if(mind && mind.current)
return "|BDY "
diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm
index 1e765a75f34..74bd12da18e 100644
--- a/code/modules/admin/verbs/adminjump.dm
+++ b/code/modules/admin/verbs/adminjump.dm
@@ -1,7 +1,7 @@
/mob/proc/on_mob_jump()
return
-/mob/abstract/observer/on_mob_jump()
+/mob/abstract/ghost/on_mob_jump()
QDEL_NULL(orbiting)
/client/proc/Jump(var/area/A in GLOB.all_areas)
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 67f8ce23a41..6a7bff6f67d 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -22,7 +22,7 @@
if(T.mob)
if(istype(T.mob, /mob/abstract/new_player))
targets["(New Player) - [T]"] = T
- else if(istype(T.mob, /mob/abstract/observer))
+ else if(istype(T.mob, /mob/abstract/ghost/observer))
targets["[T.mob.name](Ghost) - [T]"] = T
else
targets["[T.mob.real_name](as [T.mob.name]) - [T]"] = T
diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm
index 3fa5ddd1760..3d4014cc581 100644
--- a/code/modules/admin/verbs/antag-ooc.dm
+++ b/code/modules/admin/verbs/antag-ooc.dm
@@ -3,7 +3,7 @@
set name = "AOOC"
set desc = "Antagonist OOC"
- if (istype(src.mob, /mob/abstract/observer) && !check_rights(R_ADMIN|R_MOD|R_CCIAA, 0))
+ if (istype(src.mob, /mob/abstract/ghost/observer) && !check_rights(R_ADMIN|R_MOD|R_CCIAA, 0))
to_chat(src, SPAN_WARNING("You cannot use AOOC while ghosting/observing!"))
return
diff --git a/code/modules/admin/verbs/bluespacetech.dm b/code/modules/admin/verbs/bluespacetech.dm
index 49c793dfffc..853ffadee3b 100644
--- 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?
@@ -35,15 +36,13 @@
bst_cooldown = TRUE
- if(istype(mob, /mob/living))
- if(!holder.original_mob)
- holder.original_mob = mob
-
//I couldn't get the normal way to work so this works.
//This whole section looks like a hack, I don't like it.
var/T = get_turf(usr)
var/mob/living/carbon/human/bst/bst = new(T)
-// bst.original_mob = usr
+ if(istype(mob, /mob/living))
+ bst.original_mob = mob
+
bst.anchored = 1
bst.ckey = usr.ckey
bst.name = "Bluespace Technician"
@@ -138,6 +137,13 @@
universal_understand = 1
status_flags = GODMODE|NOFALL
+ /// The BST's original mob. Moved here from /datum/holder to support storytellers.
+ var/mob/original_mob
+
+/mob/living/carbon/human/bst/Destroy(force)
+ original_mob = null
+ return ..()
+
/mob/living/carbon/human/bst/can_inject(var/mob/user, var/error_msg, var/target_zone)
to_chat(user, SPAN_ALERT("The [src] disarms you before you can inject them."))
user.drop_item()
@@ -168,11 +174,11 @@
QDEL_IN(src, 10)
animate(src, alpha = 0, time = 9, easing = QUAD_EASING)
if(key)
- if(client.holder && client.holder.original_mob)
- client.holder.original_mob.key = key
+ if(original_mob)
+ client.key = key
client.init_verbs()
else
- var/mob/abstract/observer/ghost = new(src) //Transfer safety to observer spawning proc.
+ var/mob/abstract/ghost/observer/ghost = new(src, src) //Transfer safety to observer spawning proc.
ghost.key = key
ghost.mind.name = "[ghost.key] BSTech"
ghost.name = "[ghost.key] BSTech"
@@ -320,14 +326,13 @@
set desc = "Jump into bluespace and continue wherever you left off. Deletes the BSTech and returns to your original mob if you have one."
set category = "BST"
- var/client/C = src.client
- if(C.holder && C.holder.original_mob)
- if(C.holder.original_mob.key)//Thanks for kicking Tish off the Server Meow, wouldn't have spotted this otherwise.
+ if(original_mob)
+ if(original_mob.key)//Thanks for kicking Tish off the Server Meow, wouldn't have spotted this otherwise.
//suicide()
return
- C.holder.original_mob.key = key
- C.holder.original_mob = null
+ original_mob.key = key
+ original_mob = null
suicide()
/mob/living/carbon/human/bst/verb/tgm()
@@ -519,3 +524,8 @@
/mob/living/carbon/human/bst/restrained()
return 0
+
+/mob/living/carbon/human/bst/vv_edit_var(var_name, var_value)
+ if(var_name == NAMEOF(src, original_mob))
+ return FALSE
+ return ..()
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 7597dd179b9..b3ab6e5e1a0 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -121,7 +121,7 @@
set name = "Del-All"
// to prevent REALLY stupid deletions
- var/blocked = list(/obj, /mob, /mob/living, /mob/living/carbon, /mob/living/carbon/human, /mob/abstract, /mob/abstract/observer, /mob/living/silicon, /mob/living/silicon/robot, /mob/living/silicon/ai)
+ var/blocked = list(/obj, /mob, /mob/living, /mob/living/carbon, /mob/living/carbon/human, /mob/abstract, /mob/abstract/ghost/observer, /mob/living/silicon, /mob/living/silicon/robot, /mob/living/silicon/ai)
var/hsbitem = input(usr, "Choose an object to delete.", "Delete:") as null|anything in typesof(/obj) + typesof(/mob) - blocked
if(hsbitem)
for(var/atom/O in world)
@@ -177,7 +177,7 @@
if(alert("This mob is being controlled by [M.ckey]. Are you sure you wish to assume control of it? [M.ckey] will be made a ghost.",,"Yes","No") != "Yes")
return
else
- var/mob/abstract/observer/ghost = new/mob/abstract/observer(M,1)
+ var/mob/abstract/ghost/observer/ghost = new/mob/abstract/ghost/observer(M,1)
ghost.ckey = M.ckey
message_admins(SPAN_NOTICE("[key_name_admin(usr)] assumed direct control of [M]."), 1)
log_admin("[key_name(usr)] assumed direct control of [M].")
@@ -301,7 +301,7 @@
for(var/spawn_observer in chosen_observers)
var/mob/living/carbon/human/H = new /mob/living/carbon/human(get_turf(usr))
do_dressing(H)
- var/mob/abstract/observer/O = spawn_observer
+ var/mob/abstract/ghost/observer/O = spawn_observer
H.ckey = O.ckey
qdel(O)
@@ -313,58 +313,20 @@
return
do_dressing(H)
-/client/proc/do_dressing(var/mob/living/carbon/human/M = null)
+/proc/do_dressing(var/mob/living/carbon/human/M = null)
if(!M || !istype(M))
- M = input("Select a mob you would like to dress.", "Set Human Outfit") as null|anything in GLOB.human_mob_list
+ M = tgui_input_list(usr, "Select a mob you would like to dress.", "Set Human Outfit", GLOB.human_mob_list)
if(!M)
return
- var/list/outfit_catagories = list()
- switch(alert("Would you like ERT outfits, or standard admin outfits?", "ERT-or-Admin?", "ERT", "Admin", "Cancel"))
- if("Cancel")
- return
- if("ERT")
- outfit_catagories["SCC-ERT"] = typesof(/obj/outfit/admin/ert/scc)
- outfit_catagories["NT-ERT"] = typesof(/obj/outfit/admin/ert/nanotrasen)
- outfit_catagories["Deathsquad"] = typesof(/obj/outfit/admin/deathsquad)
- outfit_catagories["TCFL"] = typesof(/obj/outfit/admin/ert/legion)
- outfit_catagories["Syndicate"] = typesof(/obj/outfit/admin/deathsquad/syndicate)
- outfit_catagories["Freelance Mercenaries"] = typesof(/obj/outfit/admin/ert/mercenary)
- outfit_catagories["Free Solarian Fleets Marines"] = typesof(/obj/outfit/admin/ert/fsf)
- outfit_catagories["Kataphracts"] = typesof(/obj/outfit/admin/ert/kataphract)
- outfit_catagories["Eridani"] = typesof(/obj/outfit/admin/ert/ap_eridani)
- outfit_catagories["IAC"] = typesof(/obj/outfit/admin/ert/iac)
- outfit_catagories["Kosmostrelki"] = typesof(/obj/outfit/admin/ert/pra_cosmonaut)
- outfit_catagories["Elyran Navy"] = typesof(/obj/outfit/admin/ert/elyran_trooper)
- if("Admin")
- outfit_catagories["Stellar Corporate Conglomerate"] = typesof(/obj/outfit/admin/scc)
- outfit_catagories["NanoTrasen"] = typesof(/obj/outfit/admin/nt)
- outfit_catagories["Antagonist"] = typesof(/obj/outfit/admin/syndicate)
- outfit_catagories["Event"] = typesof(/obj/outfit/admin/event)
- outfit_catagories["TCFL"] = typesof(/obj/outfit/admin/tcfl)
- outfit_catagories["Killers"] = typesof(/obj/outfit/admin/killer)
- outfit_catagories["Job"] = subtypesof(/obj/outfit/job)
- outfit_catagories["Megacorps"] = subtypesof(/obj/outfit/admin/megacorp)
- outfit_catagories["Pod Survivors"] = subtypesof(/obj/outfit/admin/pod)
- outfit_catagories["Miscellaneous"] = typesof(/obj/outfit/admin/random)
- outfit_catagories["Miscellaneous"] += /obj/outfit/admin/random_employee
- var/chosen_catagory = input("Select an outfit catagory.", "Robust Quick-dress Shop") as null|anything in outfit_catagories
- if(isnull(chosen_catagory))
- return
-
- var/list/outfit_types = list()
- for(var/outfit in outfit_catagories[chosen_catagory])
- var/obj/outfit/admin/A = new outfit
- outfit_types[A.name] = A
-
- var/chosen_outfit = input("Select an outfit.", "Robust Quick-dress Shop") as null|anything in outfit_types
+ var/chosen_outfit = tgui_input_list(usr, "Select an outfit.", "Set Human Outfit", GLOB.outfit_cache)
if(isnull(chosen_outfit))
return
feedback_add_details("admin_verb","SEQ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc
- var/obj/outfit/O = outfit_types[chosen_outfit]
+ var/obj/outfit/O = GLOB.outfit_cache[chosen_outfit]
if(O)
for(var/obj/item/I in M)
if(istype(I, /obj/item/implant))
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 56280ee3868..96267a384ce 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -239,7 +239,7 @@ Ccomp's first proc.
var/list/ghosts = list()
var/list/sortmob = sortAtom(GLOB.mob_list) // get the mob list.
var/any=0
- for(var/mob/abstract/observer/M in sortmob)
+ for(var/mob/abstract/ghost/observer/M in sortmob)
mobs.Add(M) //filter it where it's only ghosts
any = 1 //if no ghosts show up, any will just be 0
if(!any)
@@ -269,7 +269,7 @@ Ccomp's first proc.
to_chat(src, SPAN_WARNING("You didn't select a ghost!")) // Sanity check, if no ghosts in the list we don't want to edit a null variable and cause a runtime error.)
return
- var/mob/abstract/observer/G = ghosts[target]
+ var/mob/abstract/ghost/observer/G = ghosts[target]
if(G.has_enabled_antagHUD && GLOB.config.antag_hud_restricted)
var/response = alert(src, "Are you sure you wish to allow this individual to play?","Ghost has used AntagHUD","Yes","No")
if(response == "No") return
@@ -330,9 +330,9 @@ Ccomp's first proc.
to_chat(src, "Only administrators may use this command.")
var/action=""
if(GLOB.config.antag_hud_allowed)
- for(var/mob/abstract/observer/g in get_ghosts())
+ for(var/mob/abstract/ghost/observer/g in get_ghosts())
if(!g.client.holder) //Remove the verb from non-admin ghosts
- remove_verb(g, /mob/abstract/observer/verb/toggle_antagHUD)
+ remove_verb(g, /mob/abstract/ghost/observer/verb/toggle_antagHUD)
if(g.antagHUD)
g.antagHUD = 0 // Disable it on those that have it enabled
g.has_enabled_antagHUD = 2 // We'll allow them to respawn
@@ -341,9 +341,9 @@ Ccomp's first proc.
to_chat(src, SPAN_DANGER("AntagHUD usage has been disabled."))
action = "disabled"
else
- for(var/mob/abstract/observer/g in get_ghosts())
+ for(var/mob/abstract/ghost/observer/g in get_ghosts())
if(!g.client.holder) // Add the verb back for all non-admin ghosts
- add_verb(g, /mob/abstract/observer/verb/toggle_antagHUD)
+ add_verb(g, /mob/abstract/ghost/observer/verb/toggle_antagHUD)
to_chat(g, SPAN_NOTICE("The Administrator has enabled AntagHUD. ")) // Notify all observers they can now use AntagHUD)
GLOB.config.antag_hud_allowed = 1
action = "enabled"
@@ -363,13 +363,13 @@ Ccomp's first proc.
to_chat(src, "Only administrators may use this command.")
var/action=""
if(GLOB.config.antag_hud_restricted)
- for(var/mob/abstract/observer/g in get_ghosts())
+ for(var/mob/abstract/ghost/observer/g in get_ghosts())
to_chat(g, SPAN_NOTICE("The administrator has lifted restrictions on joining the round if you use AntagHUD "))
action = "lifted restrictions"
GLOB.config.antag_hud_restricted = 0
to_chat(src, SPAN_NOTICE("AntagHUD restrictions have been lifted "))
else
- for(var/mob/abstract/observer/g in get_ghosts())
+ for(var/mob/abstract/ghost/observer/g in get_ghosts())
to_chat(g, SPAN_DANGER("The administrator has placed restrictions on joining the round if you use AntagHUD"))
to_chat(g, SPAN_DANGER("Your AntagHUD has been disabled, you may choose to re-enabled it but will be under restrictions "))
g.antagHUD = 0
@@ -398,8 +398,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!input)
return
- var/mob/abstract/observer/G_found
- for(var/mob/abstract/observer/G in GLOB.player_list)
+ var/mob/abstract/ghost/observer/G_found
+ for(var/mob/abstract/ghost/observer/G in GLOB.player_list)
if(G.ckey == input)
G_found = G
break
@@ -602,7 +602,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
command_announcement.Announce("[reportbody]", reporttitle, new_sound = 'sound/AI/commandreport.ogg', msg_sanitized = 1);
if("No")
to_world(SPAN_WARNING("New [SSatlas.current_map.company_name] Update available at all communication consoles."))
- sound_to(world, ('sound/AI/commandreport.ogg'))
+ sound_to_playing_players('sound/AI/commandreport.ogg')
log_admin("[key_name(src)] has created a command report: [reportbody]")
message_admins("[key_name_admin(src)] has created a command report", 1)
@@ -621,11 +621,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/action = alert(src, "Are you sure you want to delete:\n[O]\nat ([O.x], [O.y], [O.z])?", "Confirmation", "Yes", "No", "Hard Delete")
- if (action == "No")
+ if (action == "No" || !action)
return
- if (istype(O, /mob/abstract/observer))
- var/mob/abstract/observer/M = O
+ if (istype(O, /mob/abstract/ghost/observer))
+ var/mob/abstract/ghost/observer/M = O
if (M.client && alert(src, "They are still connected. Are you sure, they will loose connection.", "Confirmation", "Yes", "No") != "Yes")
return
log_admin("[key_name(usr)] deleted [O] at ([O.x],[O.y],[O.z])")
@@ -720,7 +720,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
log_admin("[key_name(usr)] has gibbed [key_name(M)]")
message_admins("[key_name_admin(usr)] has gibbed [key_name_admin(M)]", 1)
- if(istype(M, /mob/abstract/observer))
+ if(isobserver(M))
gibs(M.loc, M.viruses)
return
@@ -733,7 +733,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
if(confirm == "Yes")
- if (istype(mob, /mob/abstract/observer)) // so they don't spam gibs everywhere
+ if (istype(mob, /mob/abstract/ghost/observer)) // so they don't spam gibs everywhere
return
else
mob.gib()
@@ -751,7 +751,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
if(confirm != "Yes")
- if(istype(mob, /mob/abstract/observer))
+ if(istype(mob, /mob/abstract/ghost/observer))
return
else
mob.dust()
diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm
index bc17bb5ee7a..fb6e8bd2aab 100644
--- a/code/modules/admin/view_variables/topic.dm
+++ b/code/modules/admin/view_variables/topic.dm
@@ -170,7 +170,7 @@
return
var/del_action = alert("Are you really sure you want to delete all objects of type [O.type]?",,"Yes","No", "Hard Delete")
- if(del_action == "No")
+ if (del_action == "No" || !del_action)
return
if(alert("Second confirmation required. Delete?",,"Yes","No") != "Yes")
diff --git a/code/modules/atmospherics/components/valve.dm b/code/modules/atmospherics/components/valve.dm
index 65abfd30632..0245f02e3b3 100644
--- a/code/modules/atmospherics/components/valve.dm
+++ b/code/modules/atmospherics/components/valve.dm
@@ -244,7 +244,7 @@
log_and_message_admins("has [open ? SPAN_WARNING("OPENED") : "closed"] [name].", user)
-/obj/machinery/atmospherics/valve/digital/AltClick(var/mob/abstract/observer/admin)
+/obj/machinery/atmospherics/valve/digital/AltClick(var/mob/abstract/ghost/observer/admin)
if (istype(admin))
if (admin.client && admin.client.holder && ((R_MOD|R_ADMIN) & admin.client.holder.rights))
if (open)
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 78a1e54c713..8b04f31433b 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -147,7 +147,7 @@
/obj/item/clothing/mask/ai/Initialize()
. = ..()
- AddComponent(/datum/component/eye/cameranet)
+ AddComponent(/datum/component/eye/freelook)
/obj/item/clothing/mask/ai/attack_self(mob/user)
if(user.incapacitated())
@@ -155,7 +155,7 @@
if(user.get_equipped_item(slot_wear_mask) != src)
to_chat(user, SPAN_WARNING("You must be wearing \the [src] to activate it!"))
return
- var/datum/component/eye/cameranet/CN = GetComponent(/datum/component/eye)
+ var/datum/component/eye/freelook/CN = GetComponent(/datum/component/eye)
if(!CN)
to_chat(user, SPAN_WARNING("\The [src] doesn't respond!"))
return
diff --git a/code/modules/effects/map_effects/map_effects.dm b/code/modules/effects/map_effects/map_effects.dm
index ab0319408bb..3e3bb679475 100644
--- a/code/modules/effects/map_effects/map_effects.dm
+++ b/code/modules/effects/map_effects/map_effects.dm
@@ -60,7 +60,7 @@
for(var/thing in GLOB.player_list)
var/mob/M = thing // Avoiding typechecks for more speed, player_list will only contain mobs anyways.
- if(ignore_ghosts && isobserver(M))
+ if(ignore_ghosts && isghost(M))
continue
if(ignore_afk && M.client && M.client.is_afk(5 MINUTES))
continue
diff --git a/code/modules/emotes/emote_mob.dm b/code/modules/emotes/emote_mob.dm
index a8f43e8b7d2..7dc105eb6a3 100644
--- a/code/modules/emotes/emote_mob.dm
+++ b/code/modules/emotes/emote_mob.dm
@@ -179,7 +179,7 @@
/mob/living/captive_brain/emote(var/message)
return
-/mob/abstract/observer/emote(var/act, var/type, var/message)
+/mob/abstract/ghost/observer/emote(var/act, var/type, var/message)
if(!message)
return
diff --git a/code/modules/ghostroles/spawner/base.dm b/code/modules/ghostroles/spawner/base.dm
index 1ad20f8d659..ec06456ffc8 100644
--- a/code/modules/ghostroles/spawner/base.dm
+++ b/code/modules/ghostroles/spawner/base.dm
@@ -107,7 +107,7 @@
var/cant_see = cant_see(user)
if(cant_see) //If we cant see it, we cant spawn it
return cant_see
- if(!(istype(user, /mob/abstract/observer) || isnewplayer(user)))
+ if(!(istype(user, /mob/abstract/ghost/observer) || isnewplayer(user)))
return "You are not a ghost."
if(!enabled) //If the spawner id disabled, we cant spawn in
return "This spawner is not enabled."
@@ -252,7 +252,7 @@
log_and_message_admins("has enabled the ghostspawner [src.name]")
enabled = TRUE
if(enable_dmessage)
- for(var/mob/abstract/observer/O in GLOB.player_list)
+ for(var/mob/abstract/ghost/observer/O in GLOB.player_list)
if(O.client && !cant_see(O))
if(enable_dmessage == TRUE)
to_chat(O, "A ghostspawner for a \"[src.name]\" has been enabled. [target] ."))
+ update_sight()
+
+/mob/abstract/ghost/proc/on_restricted_level(var/check)
+ if(!check)
+ check = z
+ //Check if they are a staff member
+ if(check_rights(R_MOD|R_ADMIN|R_DEV, show_msg=FALSE, user=src))
+ return FALSE
+
+ //Check if the z level is in the restricted list
+ if (!(check in SSatlas.current_map.restricted_levels))
+ return FALSE
+
+ return TRUE
+
+/mob/abstract/ghost/verb/analyze_air()
+ set name = "Analyze Air"
+ set category = "Ghost"
+
+ // Shamelessly copied from the Gas Analyzers
+ if(!isturf(loc))
+ return
+
+ var/datum/gas_mixture/environment = loc.return_air()
+
+ var/pressure = environment.return_pressure()
+ var/total_moles = environment.total_moles
+
+ to_chat(src, SPAN_NOTICE("Results: "))
+ if(abs(pressure - ONE_ATMOSPHERE) < 10)
+ to_chat(src, SPAN_NOTICE("Pressure: [round(pressure,0.1)] kPa"))
+ else
+ to_chat(src, SPAN_WARNING("Pressure: [round(pressure,0.1)] kPa"))
+ if(total_moles)
+ for(var/g in environment.gas)
+ to_chat(src, SPAN_NOTICE("[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)"))
+ to_chat(src, SPAN_NOTICE("Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)"))
+ to_chat(src, SPAN_NOTICE("Heat Capacity: [round(environment.heat_capacity(),0.1)]"))
+
+/mob/abstract/ghost/verb/view_manifest()
+ set name = "Show Crew Manifest"
+ set category = "Ghost"
+ SSrecords.open_manifest_tgui(usr)
diff --git a/code/modules/mob/abstract/observer/login.dm b/code/modules/mob/abstract/ghost/observer/login.dm
similarity index 67%
rename from code/modules/mob/abstract/observer/login.dm
rename to code/modules/mob/abstract/ghost/observer/login.dm
index 0794f6ccf06..7bbc25e8d36 100644
--- a/code/modules/mob/abstract/observer/login.dm
+++ b/code/modules/mob/abstract/ghost/observer/login.dm
@@ -1,4 +1,4 @@
-/mob/abstract/observer/LateLogin()
+/mob/abstract/ghost/observer/LateLogin()
..()
if (ghostimage)
ghostimage.icon_state = src.icon_state
diff --git a/code/modules/mob/abstract/observer/logout.dm b/code/modules/mob/abstract/ghost/observer/logout.dm
similarity index 90%
rename from code/modules/mob/abstract/observer/logout.dm
rename to code/modules/mob/abstract/ghost/observer/logout.dm
index d0b0fdab116..0f2a697ce8a 100644
--- a/code/modules/mob/abstract/observer/logout.dm
+++ b/code/modules/mob/abstract/ghost/observer/logout.dm
@@ -1,4 +1,4 @@
-/mob/abstract/observer/Logout()
+/mob/abstract/ghost/observer/Logout()
..()
// This is one of very few spawn()s that we cannot get rid of
// Yes it needs to be like this
diff --git a/code/modules/mob/abstract/observer/observer.dm b/code/modules/mob/abstract/ghost/observer/observer.dm
similarity index 69%
rename from code/modules/mob/abstract/observer/observer.dm
rename to code/modules/mob/abstract/ghost/observer/observer.dm
index 7e7226540a2..be0cb2a65ff 100644
--- a/code/modules/mob/abstract/observer/observer.dm
+++ b/code/modules/mob/abstract/ghost/observer/observer.dm
@@ -1,53 +1,44 @@
-/mob/abstract/observer
+/mob/abstract/ghost/observer
name = "ghost"
desc = "It's a g-g-g-g-ghooooost!" //jinkies!
icon = 'icons/mob/mob.dmi'
icon_state = "ghost"
- layer = OBSERVER_LAYER
- plane = OBSERVER_PLANE
- stat = DEAD
density = 0
canmove = 0
blinded = 0
anchored = 1 // don't get pushed around
invisibility = INVISIBILITY_OBSERVER
simulated = FALSE
- var/can_reenter_corpse
- var/datum/hud/hud = null // hud
- var/bootime = 0
- var/started_as_observer //This variable is set to 1 when you enter the game as an observer.
- //If you died in the game and are a ghsot - this will remain as null.
- //Note that this is not a reliable way to determine if admins started as observers, since they change mobs a lot.
- var/has_enabled_antagHUD = 0
- var/medHUD = 0
- var/antagHUD = 0
universal_speak = 1
- // var/atom/movable/following = null
- var/admin_ghosted = 0
- var/anonsay = 0
- var/image/ghostimage = null //this mobs ghost image, for deleting and stuff
- var/ghostvision = 1 //is the ghost able to see things humans can't?
- var/seedarkness = 1
-
- var/is_manifest = 0
- var/ghost_cooldown = 0
-
- var/obj/item/device/multitool/ghost_multitool
incorporeal_move = INCORPOREAL_GHOST
-
mob_thinks = FALSE
- /// The POI we're orbiting (orbit menu)
- var/orbiting_ref
+ /// If the ghost can re-enter their corpse.
+ var/can_reenter_corpse
+ /// The ghost's HUD datum.
+ var/datum/hud/hud = null
+ /// This variable is set to 1 when you enter the game as an observer. Remains null if you died in the game and are a ghost. Not reliable for admins; they change mobs a lot.
+ var/started_as_observer
+ /// If the ghost has enabled antagHUD.
+ var/has_enabled_antagHUD = 0
+ /// If the ghost has enabled medHUD.
+ var/medHUD = 0
+ /// If this is an adminghost.
+ var/admin_ghosted = 0
+ /// If this ghost has enabled chat anonymization.
+ var/anonsay = 0
+ /// This mob's ghost image, for deleting and stuff.
+ var/image/ghostimage
+ /// If the ghost can be seen through cult shenanigans.
+ var/is_manifest = 0
+ /// Cooldown for ghost abilities, such as move_item().
+ var/ghost_cooldown = 0
-/mob/abstract/observer/New(mob/body)
- if (istype(body, /mob/abstract/observer))
+/mob/abstract/ghost/observer/Initialize(mapload, mob/body)
+ . = ..()
+ if (istype(body, /mob/abstract/ghost/observer))
return//A ghost can't become a ghost.
- sight |= SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF
- see_invisible = SEE_INVISIBLE_OBSERVER
- add_verb(src, /mob/abstract/observer/proc/dead_tele)
-
set_stat(DEAD)
ghostimage = image(src.icon,src,src.icon_state)
@@ -96,32 +87,16 @@
name = capitalize(pick(first_names_male)) + " " + capitalize(pick(last_names))
real_name = name
- ghost_multitool = new(src)
- ..()
-
-/mob/abstract/observer/Destroy()
- qdel(ghost_multitool)
- ghost_multitool = null
-
+/mob/abstract/ghost/observer/Destroy()
if (ghostimage)
SSmobs.ghost_darkness_images -= ghostimage
qdel(ghostimage)
ghostimage = null
updateallghostimages()
+
return ..()
-/mob/abstract/observer/Topic(href, href_list)
- if (href_list["track"])
- if(istype(href_list["track"],/mob))
- var/mob/target = locate(href_list["track"]) in GLOB.mob_list
- if(target)
- ManualFollow(target)
- else
- var/atom/target = locate(href_list["track"])
- if(istype(target))
- ManualFollow(target)
-
-/mob/abstract/observer/proc/initialise_postkey(set_timers = TRUE)
+/mob/abstract/ghost/observer/proc/initialise_postkey(set_timers = TRUE)
//This function should be run after a ghost has been created and had a ckey assigned
if (!set_timers)
return
@@ -135,19 +110,19 @@
if (!get_death_time(CREW))
set_death_time(CREW, world.time)
-/mob/abstract/observer/attackby(obj/item/attacking_item, mob/user)
+/mob/abstract/ghost/observer/attackby(obj/item/attacking_item, mob/user)
if(istype(attacking_item, /obj/item/book/tome))
- var/mob/abstract/observer/M = src
+ var/mob/abstract/ghost/observer/M = src
M.manifest(user)
-/mob/abstract/observer/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
+/mob/abstract/ghost/observer/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
return 1
/*
Transfer_mind is there to check if mob is being deleted/not going to have a body.
Works together with spawning an observer, noted above.
*/
-/mob/abstract/observer/Life(seconds_per_tick, times_fired)
+/mob/abstract/ghost/observer/Life(seconds_per_tick, times_fired)
..()
if(!loc) return
if(!client) return 0
@@ -164,20 +139,7 @@ Works together with spawning an observer, noted above.
if(medHUD)
process_medHUD(src)
-/mob/abstract/observer/proc/on_restricted_level(var/check)
- if(!check)
- check = z
- //Check if they are a staff member
- if(check_rights(R_MOD|R_ADMIN|R_DEV, show_msg=FALSE, user=src))
- return FALSE
-
- //Check if the z level is in the restricted list
- if (!(check in SSatlas.current_map.restricted_levels))
- return FALSE
-
- return TRUE
-
-/mob/abstract/observer/proc/teleport_to_spawn(var/message)
+/mob/abstract/ghost/observer/proc/teleport_to_spawn(var/message)
if(!message)
message = "You can not freely observe on this z-level."
@@ -187,14 +149,13 @@ Works together with spawning an observer, noted above.
to_chat(src, SPAN_NOTICE("[message]"))
forceMove(O.loc)
-
-/mob/abstract/observer/proc/process_medHUD(var/mob/M)
+/mob/abstract/ghost/observer/proc/process_medHUD(var/mob/M)
var/client/C = M.client
for(var/mob/living/carbon/human/patient in oview(M, 14))
C.images += patient.hud_list[HEALTH_HUD]
C.images += patient.hud_list[STATUS_HUD_OOC]
-/mob/abstract/observer/proc/assess_targets(list/target_list, mob/abstract/observer/U)
+/mob/abstract/ghost/observer/proc/assess_targets(list/target_list, mob/abstract/ghost/observer/U)
var/client/C = U.client
for(var/mob/living/carbon/human/target in target_list)
C.images += target.hud_list[SPECIALROLE_HUD]
@@ -205,7 +166,7 @@ Works together with spawning an observer, noted above.
/mob/proc/ghostize(var/can_reenter_corpse = TRUE, var/should_set_timer = TRUE)
if(ckey)
CutOverlays(image('icons/effects/effects.dmi', "zzz_glow")) // not very efficient but ghostize isn't called /too/ often.
- var/mob/abstract/observer/ghost = new(src) //Transfer safety to observer spawning proc.
+ var/mob/abstract/ghost/observer/ghost = new(src, src) //Transfer safety to observer spawning proc.
ghost.can_reenter_corpse = can_reenter_corpse
ghost.timeofdeath = src.stat == DEAD ? src.timeofdeath : world.time
@@ -213,7 +174,7 @@ Works together with spawning an observer, noted above.
ghost.initialise_postkey(should_set_timer)
if(ghost.client)
if(!ghost.client.holder && !GLOB.config.antag_hud_allowed) // For new ghosts we remove the verb from even showing up if it's not allowed.
- remove_verb(ghost, /mob/abstract/observer/verb/toggle_antagHUD) // Poor guys, don't know what they are missing!
+ remove_verb(ghost, /mob/abstract/ghost/observer/verb/toggle_antagHUD) // Poor guys, don't know what they are missing!
ghost.client.init_verbs()
return ghost
@@ -243,20 +204,20 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/turf/location = get_turf(src)
message_admins("[key_name_admin(usr)] has ghosted. (JMP )")
log_game("[key_name_admin(usr)] has ghosted.")
- var/mob/abstract/observer/ghost = ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
+ var/mob/abstract/ghost/observer/ghost = ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly.
announce_ghost_joinleave(ghost)
-/mob/abstract/observer/can_use_hands()
+/mob/abstract/ghost/observer/can_use_hands()
return FALSE
-/mob/abstract/observer/is_active()
+/mob/abstract/ghost/observer/is_active()
return FALSE
-/mob/abstract/observer/set_stat()
+/mob/abstract/ghost/observer/set_stat()
stat = DEAD // They are also always dead
-/mob/abstract/observer/verb/reenter_corpse()
+/mob/abstract/ghost/observer/verb/reenter_corpse()
set category = "Ghost"
set name = "Re-enter Corpse"
if(!client) return
@@ -284,7 +245,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
announce_ghost_joinleave(mind, 0, "They now occupy their body again.")
return 1
-/mob/abstract/observer/verb/toggle_medHUD()
+/mob/abstract/ghost/observer/verb/toggle_medHUD()
set category = "Ghost"
set name = "Toggle MedicHUD"
set desc = "Toggles Medical HUD allowing you to see how everyone is doing"
@@ -297,7 +258,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
medHUD = 1
to_chat(src, SPAN_NOTICE("Medical HUD Enabled "))
-/mob/abstract/observer/verb/scan_target()
+/mob/abstract/ghost/observer/verb/scan_target()
set category = "Ghost"
set name = "Medical Scan Target"
set desc = "Analyse the health of whatever you are following."
@@ -313,7 +274,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
else
to_chat(src, SPAN_WARNING("This isn't a scannable target."))
-/mob/abstract/observer/verb/toggle_antagHUD()
+/mob/abstract/ghost/observer/verb/toggle_antagHUD()
set category = "Ghost"
set name = "Toggle AntagHUD"
set desc = "Toggles AntagHUD allowing you to see who is the antagonist"
@@ -324,7 +285,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(!GLOB.config.antag_hud_allowed && (!client.holder || aux_staff))
to_chat(src, SPAN_WARNING("Admins have disabled this for this round."))
return
- var/mob/abstract/observer/M = src
+ var/mob/abstract/ghost/observer/M = src
if(jobban_isbanned(M, "AntagHUD"))
to_chat(src, SPAN_DANGER("You have been banned from using this feature"))
return
@@ -341,145 +302,40 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
M.antagHUD = 1
to_chat(src, SPAN_NOTICE("AntagHUD Enabled "))
-/mob/abstract/observer/proc/dead_tele(A in GLOB.ghostteleportlocs)
- set category = "Ghost"
- set name = "Teleport"
- set desc= "Teleport to a location"
- if(!istype(usr, /mob/abstract/observer))
- to_chat(usr, "Not when you're not dead!")
- return
- remove_verb(usr, /mob/abstract/observer/proc/dead_tele)
- ADD_VERB_IN(usr, 30, /mob/abstract/observer/proc/dead_tele)
- var/area/thearea = GLOB.ghostteleportlocs[A]
- if(!thearea) return
-
- var/list/L = list()
- var/holyblock = 0
-
- if(usr.invisibility <= SEE_INVISIBLE_LIVING || (usr.mind in cult.current_antagonists))
- for(var/turf/T in get_area_turfs(thearea))
- if(!T.holy)
- L+=T
- else
- holyblock = 1
- else
- for(var/turf/T in get_area_turfs(thearea))
- L+=T
-
- if(!L || !L.len)
- if(holyblock)
- to_chat(usr, SPAN_WARNING("This area has been entirely made into sacred grounds, you cannot enter it while you are in this plane of existence!"))
- return
- else
- to_chat(usr, "No area available.")
- return
-
- var/turf/P = pick(L)
- if(on_restricted_level(P.z))
- to_chat(usr, "You can not teleport to this area")
- return
-
- usr.abstract_move(pick(L))
-
-/mob/abstract/observer/verb/follow()
- set category = "Ghost"
- set name = "Follow" // "Haunt"
- set desc = "Follow and haunt a mob."
-
- var/datum/tgui_module/ghost_menu/GM = new /datum/tgui_module/ghost_menu(usr)
- GM.ui_interact(usr)
-
-// This is the ghost's follow verb with an argument
-/mob/abstract/observer/proc/ManualFollow(atom/movable/target)
- if(!target)
- return
-
- //Stops orbit if there's any; TG doesn't do this, but if you don't it breaks the orbiting reference
- //if you are jumping from one mob to another, hence why we're doing it here
- orbiting?.end_orbit(src)
-
- var/list/icon_dimensions = get_icon_dimensions(target.icon)
- var/orbitsize = (icon_dimensions["width"] + icon_dimensions["height"]) * 0.5
- orbitsize -= (orbitsize/ICON_SIZE_ALL)*(ICON_SIZE_ALL*0.25)
-
- var/rot_seg = 30 //Let's make it simple and it's just a circle
-
- orbit(target,orbitsize, FALSE, 20, rot_seg)
-
- to_chat(src, SPAN_NOTICE("Now following \the [target] ."))
- updateghostsight()
-
-/mob/abstract/observer/orbit()
- set_dir(2)//reset dir so the right directional sprites show up
- return ..()
-
/mob/proc/check_holy(var/turf/T)
return 0
-/mob/abstract/observer/check_holy(var/turf/T)
+/mob/abstract/ghost/observer/check_holy(var/turf/T)
if(check_rights(R_ADMIN|R_FUN, 0, src))
return 0
return (T && T.holy) && (invisibility <= SEE_INVISIBLE_LIVING || (mind in cult.current_antagonists))
-/mob/abstract/observer/verb/jumptomob(input in getmobs()) //Moves the ghost instead of just changing the ghosts's eye -Nodrak
+/mob/abstract/ghost/observer/verb/jumptomob(input in getmobs()) //Moves the ghost instead of just changing the ghosts's eye -Nodrak
set category = "Ghost"
set name = "Jump to Mob"
set desc = "Teleport to a mob"
- if(istype(src, /mob/abstract/observer)) //Make sure they're an observer!
- var/mob/source_mob = src //Source mob
-
+ if(istype(usr, /mob/abstract/ghost/observer)) //Make sure they're an observer!
var/target = getmobs()[input]
if(!target) return
var/turf/T = get_turf(target) //Turf of the destination mob
if(T && isturf(T)) //Make sure the turf exists, then move the source to that destination.
- source_mob.abstract_move(T)
+ abstract_move(T)
else
to_chat(src, "This mob is not located in the game world.")
-/mob/abstract/observer/memory()
+/mob/abstract/ghost/observer/memory()
set hidden = 1
to_chat(src, SPAN_WARNING("You are dead! You have no mind to store memory!"))
-/mob/abstract/observer/add_memory()
+/mob/abstract/ghost/observer/add_memory()
set hidden = 1
to_chat(src, SPAN_WARNING("You are dead! You have no mind to store memory!"))
-/mob/abstract/observer/verb/analyze_air()
- set name = "Analyze Air"
- set category = "Ghost"
-
- if(!istype(usr, /mob/abstract/observer)) return
-
- // Shamelessly copied from the Gas Analyzers
- if (!( istype(usr.loc, /turf) ))
- return
-
- var/datum/gas_mixture/environment = usr.loc.return_air()
-
- var/pressure = environment.return_pressure()
- var/total_moles = environment.total_moles
-
- to_chat(src, SPAN_NOTICE("Results: "))
- if(abs(pressure - ONE_ATMOSPHERE) < 10)
- to_chat(src, SPAN_NOTICE("Pressure: [round(pressure,0.1)] kPa"))
- else
- to_chat(src, SPAN_WARNING("Pressure: [round(pressure,0.1)] kPa"))
- if(total_moles)
- for(var/g in environment.gas)
- to_chat(src, SPAN_NOTICE("[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]% ([round(environment.gas[g], 0.01)] moles)"))
- to_chat(src, SPAN_NOTICE("Temperature: [round(environment.temperature-T0C,0.1)]°C ([round(environment.temperature,0.1)]K)"))
- to_chat(src, SPAN_NOTICE("Heat Capacity: [round(environment.heat_capacity(),0.1)]"))
-
-/mob/abstract/observer/verb/view_manifest()
- set name = "Show Crew Manifest"
- set category = "Ghost"
- SSrecords.open_manifest_tgui(usr)
-
//This is called when a ghost is drag clicked to something.
-/mob/abstract/observer/MouseDrop(atom/over)
+/mob/abstract/ghost/observer/MouseDrop(atom/over)
if(!usr || !over) return
if(isobserver(usr) && usr.client && isliving(over))
var/mob/living/M = over
@@ -496,7 +352,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return ..()
-/mob/abstract/observer/proc/try_possession(var/mob/living/M)
+/mob/abstract/ghost/observer/proc/try_possession(var/mob/living/M)
if(!GLOB.config.ghosts_can_possess_animals)
to_chat(usr, SPAN_WARNING("Ghosts are not permitted to possess animals."))
return 0
@@ -505,7 +361,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return M.do_possession(src)
//Used for drawing on walls with blood puddles as a spooky ghost.
-/mob/abstract/observer/verb/bloody_doodle()
+/mob/abstract/ghost/observer/verb/bloody_doodle()
set category = "Ghost"
set name = "Write in blood"
set desc = "If the round is sufficiently spooky, write a short message in blood on the floor or a wall. Remember, no IC in OOC or OOC in IC."
@@ -573,19 +429,19 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
W.add_hiddenprint(src)
W.visible_message(SPAN_WARNING("Invisible fingers crudely paint something in blood on [T]..."))
-/mob/abstract/observer/pointed(atom/A as mob|obj|turf in view())
+/mob/abstract/ghost/observer/pointed(atom/A as mob|obj|turf in view())
if(!..())
return 0
src.visible_message("[src] points to [A]Your key will be publicly visible again. ")
-/mob/abstract/observer/canface()
+/mob/abstract/ghost/observer/canface()
return 1
/mob/proc/can_admin_interact()
return 0
-/mob/abstract/observer/can_admin_interact()
+/mob/abstract/ghost/observer/can_admin_interact()
return check_rights(R_ADMIN, 0, src)
-/mob/abstract/observer/verb/toggle_ghostsee()
- set name = "Toggle Ghost Vision"
- set desc = "Toggles your ability to see things only ghosts can see, like other ghosts"
- set category = "Ghost"
- ghostvision = !(ghostvision)
- updateghostsight()
- to_chat(usr, "You [(ghostvision ? "now" : "no longer")] have ghost vision.")
-
-/mob/abstract/observer/verb/toggle_darkness()
- set name = "Toggle Darkness"
- set category = "Ghost"
- seedarkness = !(seedarkness)
- updateghostsight()
-
-/mob/abstract/observer/proc/updateghostsight()
+/mob/abstract/ghost/observer/update_sight()
//if they are on a restricted level, then set the ghost vision for them.
if(on_restricted_level())
//On the restricted level they have the same sight as the mob
@@ -740,7 +582,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
set_sight(sight|SEE_TURFS|SEE_MOBS|SEE_OBJS)
set_see_invisible(SEE_INVISIBLE_LEVEL_TWO)
- if (!seedarkness)
+ if (!see_darkness)
set_see_invisible(SEE_INVISIBLE_NOLIGHTING)
else
set_see_invisible(ghostvision ? SEE_INVISIBLE_OBSERVER : SEE_INVISIBLE_LIVING)
@@ -748,13 +590,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
updateghostimages()
/proc/updateallghostimages()
- for (var/mob/abstract/observer/O in GLOB.player_list)
+ for (var/mob/abstract/ghost/observer/O in GLOB.player_list)
O.updateghostimages()
-/mob/abstract/observer/proc/updateghostimages()
+/mob/abstract/ghost/observer/proc/updateghostimages()
if (!client)
return
- if (seedarkness || !ghostvision)
+ if (see_darkness || !ghostvision)
client.images -= SSmobs.ghost_darkness_images
client.images |= SSmobs.ghost_sightless_images
else
@@ -764,7 +606,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if (ghostimage)
client.images -= ghostimage //remove ourself
-/mob/abstract/observer/MayRespawn(var/feedback = 0, var/respawn_type = null)
+/mob/abstract/ghost/observer/MayRespawn(var/feedback = 0, var/respawn_type = null)
if(!client)
return 0
if(GLOB.config.antag_hud_restricted && has_enabled_antagHUD == 1)
@@ -798,7 +640,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(client && eyeobj)
return "|\[E \]"
-/mob/abstract/observer/extra_ghost_link(var/atom/ghost)
+/mob/abstract/ghost/observer/extra_ghost_link(var/atom/ghost)
if(mind && mind.current)
return "|\[B \]"
@@ -809,7 +651,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
//Opens the Ghost Spawner Menu
-/mob/abstract/observer/verb/ghost_spawner()
+/mob/abstract/ghost/observer/verb/ghost_spawner()
set category = "Ghost"
set name = "Ghost Spawner"
@@ -819,7 +661,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
SSghostroles.ui_interact(usr)
-/mob/abstract/observer/verb/submitpai()
+/mob/abstract/ghost/observer/verb/submitpai()
set category = "Ghost"
set name = "Submit pAI personality"
set desc = "Submits you pAI personality to the pAI candidate pool."
@@ -829,7 +671,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return
SSpai.recruitWindow(src)
-/mob/abstract/observer/verb/revokepai()
+/mob/abstract/ghost/observer/verb/revokepai()
set category = "Ghost"
set name = "Revoke pAI personality"
set desc = "Removes you from the pAI candidite pool."
@@ -837,10 +679,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(SSpai.revokeCandidancy(src))
to_chat(src, "You have been removed from the pAI candidate pool.")
-/mob/abstract/observer/can_hear_radio(speaker_coverage = list())
+/mob/abstract/ghost/observer/can_hear_radio(speaker_coverage = list())
if(client && (client.prefs.toggles & CHAT_GHOSTRADIO))
return TRUE
return ..()
-/mob/abstract/observer/get_speech_bubble_state_modifier()
+/mob/abstract/ghost/observer/get_speech_bubble_state_modifier()
return "ghost"
diff --git a/code/modules/mob/abstract/observer/say.dm b/code/modules/mob/abstract/ghost/observer/say.dm
similarity index 58%
rename from code/modules/mob/abstract/observer/say.dm
rename to code/modules/mob/abstract/ghost/observer/say.dm
index 631373b80b6..986307b3a0a 100644
--- a/code/modules/mob/abstract/observer/say.dm
+++ b/code/modules/mob/abstract/ghost/observer/say.dm
@@ -1,4 +1,4 @@
-/mob/abstract/observer/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/ghost_hearing = GHOSTS_ALL_HEAR, var/whisper = FALSE)
+/mob/abstract/ghost/observer/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/ghost_hearing = GHOSTS_ALL_HEAR, var/whisper = FALSE)
if (!message)
return
diff --git a/code/modules/mob/abstract/ghost/storyteller/storyteller.dm b/code/modules/mob/abstract/ghost/storyteller/storyteller.dm
new file mode 100644
index 00000000000..ca88fde8267
--- /dev/null
+++ b/code/modules/mob/abstract/ghost/storyteller/storyteller.dm
@@ -0,0 +1,158 @@
+/mob/abstract/ghost/storyteller
+ name = "Storyteller"
+ desc = "You wonder what story will be told today. Hopefully one where your character with 200 euros' worth of custom art doesn't die. That would be a shame. Wouldn't it?"
+ icon = 'icons/mob/mob.dmi'
+ icon_state = "ghost"
+ status_flags = GODMODE
+ invisibility = INVISIBILITY_OBSERVER
+ see_invisible = SEE_INVISIBLE_OBSERVER
+ layer = OBSERVER_LAYER
+ incorporeal_move = INCORPOREAL_GHOST
+ simulated = FALSE
+
+ density = FALSE
+ mob_thinks = FALSE
+ universal_speak = TRUE
+
+/mob/abstract/ghost/storyteller/Initialize()
+ . = ..()
+ SSghostroles.add_spawn_atom("storyteller", src)
+
+/mob/abstract/ghost/storyteller/Destroy()
+ SSodyssey.remove_storyteller(src)
+ GLOB.storytellers.remove_antagonist(mind)
+ SSghostroles.remove_spawn_atom("storyteller", src)
+ return ..()
+
+/mob/abstract/ghost/storyteller/LateLogin()
+ . = ..()
+ var/client/C = client
+
+ // if there's no mind, the initial setup hasn't run
+ if(C && !mind)
+
+ mind = new /datum/mind(key)
+ mind.active = TRUE
+ mind.current = src
+
+ real_name = "Storyteller ([client.ckey])"
+ name = "Storyteller ([client.ckey])"
+ SSodyssey.add_storyteller(src)
+ GLOB.storytellers.add_antagonist(mind)
+
+/mob/abstract/ghost/storyteller/ghostize(can_reenter_corpse, should_set_timer)
+ . = ..()
+ if(!can_reenter_corpse)
+ SSodyssey.remove_storyteller(src)
+
+/mob/abstract/ghost/storyteller/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/ghost_hearing = GHOSTS_ALL_HEAR, var/whisper = FALSE)
+ if (!message)
+ return
+
+ var/msg = sanitize(message)
+ if(!msg)
+ return
+
+ log_ooc("(STORYTELLER) [name]/[key] : [msg]")
+
+ var/list/turf/messageturfs = list() //List of turfs we broadcast to.
+ var/list/mob/messagemobs = list() //List of living mobs nearby who can hear it
+
+ for(var/turf in range(world.view, get_turf(src)))
+ messageturfs += turf
+
+ for(var/mob/M in GLOB.player_list)
+ if(!M.client || istype(M, /mob/abstract/new_player))
+ continue
+ if(isAI(M))
+ var/mob/living/silicon/ai/AI = M
+ if(get_turf(AI.eyeobj) in messageturfs)
+ messagemobs += M
+ continue
+ if(get_turf(M) in messageturfs)
+ messagemobs += M
+
+ var/display_name = key
+ if(client.holder && client.holder.fakekey)
+ display_name = client.holder.fakekey
+
+ msg = process_chat_markup(msg, list("*"))
+
+ var/prefix
+ var/admin_stuff
+ for(var/client/target in GLOB.clients)
+ admin_stuff = ""
+ var/display_remote = FALSE
+ if (target.holder && ((R_MOD|R_ADMIN) & target.holder.rights))
+ display_remote = TRUE
+ if(display_remote)
+ prefix = "(R)"
+ admin_stuff += "/([key])"
+ if(target != client)
+ admin_stuff += "(JMP )"
+ if(target.mob in messagemobs)
+ prefix = ""
+ if((target.mob in messagemobs) || display_remote)
+ to_chat(target, SPAN_STORYTELLER("[create_text_tag("STORY", target)] [span("prefix", prefix)][display_name][admin_stuff]: [span("message linkify", msg)]"))
+
+/mob/abstract/ghost/storyteller/dust()
+ return
+
+/mob/abstract/ghost/storyteller/gib()
+ return
+
+/mob/abstract/ghost/storyteller/can_fall()
+ return FALSE
+
+/mob/abstract/ghost/storyteller/conveyor_act()
+ return
+
+/mob/abstract/ghost/storyteller/ex_act(var/severity = 2.0)
+ return
+
+/mob/abstract/ghost/storyteller/singularity_act()
+ return
+
+/mob/abstract/ghost/storyteller/singularity_pull()
+ return
+
+/mob/abstract/ghost/storyteller/singuloCanEat()
+ return FALSE
+
+/mob/abstract/ghost/storyteller/can_hear_radio(list/speaker_coverage)
+ return TRUE
+
+/mob/abstract/ghost/storyteller/get_speech_bubble_state_modifier()
+ return "ghost"
+
+/mob/abstract/ghost/storyteller/can_admin_interact()
+ return TRUE
+
+/mob/abstract/ghost/storyteller/on_restricted_level(var/check)
+ return FALSE
+
+/mob/abstract/ghost/storyteller/can_ztravel(direction)
+ return TRUE
+
+/mob/abstract/ghost/storyteller/verb/odyssey_panel()
+ set name = "Odyssey Panel"
+ set category = "Storyteller"
+
+ SSodyssey.ui_interact(src)
+
+/**
+ * Currently whitelisted in the config behind the head of staff whitelist.
+ * Let's see if they can play nice.
+ */
+/datum/ghostspawner/storyteller
+ name = "Storyteller"
+ short_name = "storyteller"
+ desc = "As the Storyteller, you have creative direction over the current round. You are trusted to change, mix up and make interesting experiences for the \
+ players. Use this power with responsibility!"
+ tags = list("Odyssey")
+ loc_type = GS_LOC_ATOM
+ enabled = TRUE
+
+ show_on_job_select = TRUE
+ spawn_mob = /mob/abstract/ghost/storyteller
+ atom_add_message = "A Storyteller position is available!"
diff --git a/code/modules/mob/abstract/ghost/storyteller/storyteller_verbs.dm b/code/modules/mob/abstract/ghost/storyteller/storyteller_verbs.dm
new file mode 100644
index 00000000000..61f5fbf968a
--- /dev/null
+++ b/code/modules/mob/abstract/ghost/storyteller/storyteller_verbs.dm
@@ -0,0 +1,343 @@
+// Okay, these verbs are a lot of ugly copypaste. The issue is that we don't really have any other choice.
+// The alternative (and the first thing I tried) was to make the Storyteller into basically admin perms, but that introduces way too many issues.
+
+/mob/abstract/ghost/storyteller/verb/storyteller_panel()
+ set name = "Storyteller Panel"
+ set category = "Storyteller"
+
+ open_storyteller_panel()
+
+/mob/abstract/ghost/storyteller/proc/open_storyteller_panel()
+ var/dat = {"
+ Storyteller Panel Create Object Create Turf Create Mob [message] "
var/track = null
- if(isobserver(src))
+ if(isghost(src))
if(speaker_name != speaker.real_name && speaker.real_name)
speaker_name = "[speaker.real_name] ([speaker_name])"
track = "[ghost_follow_link(speaker, src)] "
@@ -214,7 +214,7 @@
else
track = "[speaker_name] ([jobname]) "
- if(istype(src, /mob/abstract/observer))
+ if(isghost(src))
if(speaker != null)
if(speaker_name != speaker.real_name && !isAI(speaker)) //Announce computer and various stuff that broadcasts doesn't use it's real name but AI's can't pretend to be other mobs.
speaker_name = "[speaker.real_name] ([speaker_name])"
@@ -240,7 +240,7 @@
if(vr_mob)
to_chat(vr_mob, "[part_a][speaker_name][part_b][formatted]")
-/mob/abstract/observer/on_hear_radio(part_a, speaker_name, track, part_b, formatted)
+/mob/abstract/ghost/observer/on_hear_radio(part_a, speaker_name, track, part_b, formatted)
to_chat(src, "[track][part_a][speaker_name][part_b][formatted]")
/mob/living/silicon/on_hear_radio(part_a, speaker_name, track, part_b, formatted)
diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm
index ca90f707737..88ecbfcb0be 100644
--- a/code/modules/mob/language/language.dm
+++ b/code/modules/mob/language/language.dm
@@ -232,7 +232,7 @@
/mob/abstract/new_player/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
return
-/mob/abstract/observer/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
+/mob/abstract/ghost/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message)
if(speaker.name == speaker_name || antagHUD)
to_chat(src, "[ghost_follow_link(speaker, src)] [language.name], [speaker_name] [message] Telepathic message from [src] to [target] : [say] ")
/mob/living/carbon/human/proc/remoteobserve()
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index b0f5b58aaf5..d768b1de3a1 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -567,7 +567,7 @@
var/mob/M = targets[target]
- if(istype(M, /mob/abstract/observer) || M.stat == DEAD)
+ if(isobserver(M) || M.stat == DEAD)
to_chat(src, SPAN_DANGER("[M]'s hivenet implant is inactive!"))
return
@@ -577,12 +577,12 @@
log_say("[key_name(src)] issued a hivenet order to [key_name(M)]: [text]")
- if(istype(M, /mob/living/carbon/human) && isvaurca(M))
+ if(ishuman(M) && isvaurca(M))
to_chat(M, SPAN_DANGER("You feel a buzzing in the back of your head, and your mind fills with the authority of [src.real_name], your ruler:"))
to_chat(M, SPAN_NOTICE(" [text]"))
else
to_chat(M, SPAN_DANGER("Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]"))
- if(istype(M,/mob/living/carbon/human))
+ if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.species.name == src.species.name)
return
diff --git a/code/modules/mob/living/carbon/slime/items.dm b/code/modules/mob/living/carbon/slime/items.dm
index 31a189fddc7..050eae19701 100644
--- a/code/modules/mob/living/carbon/slime/items.dm
+++ b/code/modules/mob/living/carbon/slime/items.dm
@@ -302,8 +302,8 @@
return ..()
/obj/effect/golemrune/process()
- var/mob/abstract/observer/ghost
- for(var/mob/abstract/observer/O in src.loc)
+ var/mob/abstract/ghost/observer/ghost
+ for(var/mob/abstract/ghost/observer/O in src.loc)
if(!O.client)
continue
if(O.mind && O.mind.current && O.mind.current.stat != DEAD)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 04337ac35b0..c9431870be0 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -863,10 +863,10 @@ default behaviour is:
if(deaf >= 0)
ear_deaf = deaf
-/mob/proc/can_be_possessed_by(var/mob/abstract/observer/possessor)
+/mob/proc/can_be_possessed_by(var/mob/abstract/ghost/observer/possessor)
return istype(possessor) && possessor.client
-/mob/living/can_be_possessed_by(var/mob/abstract/observer/possessor)
+/mob/living/can_be_possessed_by(var/mob/abstract/ghost/observer/possessor)
if(!..())
return 0
if(!possession_candidate)
@@ -879,7 +879,7 @@ default behaviour is:
return 0
return 1
-/mob/living/proc/do_possession(var/mob/abstract/observer/possessor)
+/mob/living/proc/do_possession(var/mob/abstract/ghost/observer/possessor)
if(!(istype(possessor) && possessor.ckey))
return 0
diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm
index f47e8bfc185..2b23ae65ca7 100644
--- a/code/modules/mob/living/silicon/ai/examine.dm
+++ b/code/modules/mob/living/silicon/ai/examine.dm
@@ -35,6 +35,6 @@
/mob/proc/examine_laws(var/mob/living/silicon/S)
return
-/mob/abstract/observer/examine_laws(var/mob/living/silicon/S)
+/mob/abstract/ghost/observer/examine_laws(var/mob/living/silicon/S)
if(antagHUD || is_admin(src))
return S.laws.get_laws(src)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 55feaec84d4..11f90e6a51a 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -132,7 +132,7 @@
return ..()
-/mob/living/silicon/robot/drone/can_be_possessed_by(var/mob/abstract/observer/possessor)
+/mob/living/silicon/robot/drone/can_be_possessed_by(var/mob/abstract/ghost/observer/possessor)
if(!istype(possessor) || !possessor.client || !possessor.ckey)
return FALSE
if(!GLOB.config.allow_drone_spawn)
@@ -148,7 +148,7 @@
return FALSE
return TRUE
-/mob/living/silicon/robot/drone/do_possession(var/mob/abstract/observer/possessor)
+/mob/living/silicon/robot/drone/do_possession(var/mob/abstract/ghost/observer/possessor)
if(!(istype(possessor) && possessor.ckey))
return 0
if(src.ckey || src.client)
@@ -246,7 +246,7 @@
assign_drone_to_matrix(src, matrix_tag)
master_matrix.message_drones(MATRIX_NOTICE("Energy surges through your circuits. The matriarch has come online."))
-/mob/living/silicon/robot/drone/construction/matriarch/do_possession(mob/abstract/observer/possessor)
+/mob/living/silicon/robot/drone/construction/matriarch/do_possession(mob/abstract/ghost/observer/possessor)
. = ..()
SSghostroles.remove_spawn_atom("matriarchmaintdrone", src)
diff --git a/code/modules/mob/living/silicon/robot/items/upgrades/robot_upgrades.dm b/code/modules/mob/living/silicon/robot/items/upgrades/robot_upgrades.dm
index 2eee5f83e4d..fb01cf976b3 100644
--- a/code/modules/mob/living/silicon/robot/items/upgrades/robot_upgrades.dm
+++ b/code/modules/mob/living/silicon/robot/items/upgrades/robot_upgrades.dm
@@ -83,7 +83,7 @@
return FALSE
if(!R.key)
- for(var/mob/abstract/observer/ghost in GLOB.player_list)
+ for(var/mob/abstract/ghost/observer/ghost in GLOB.player_list)
if(ghost.mind?.current == R)
R.key = ghost.key
diff --git a/code/modules/mob/living/silicon/robot/presets.dm b/code/modules/mob/living/silicon/robot/presets.dm
index 671781dd25d..bdcea8b9e0a 100644
--- a/code/modules/mob/living/silicon/robot/presets.dm
+++ b/code/modules/mob/living/silicon/robot/presets.dm
@@ -26,6 +26,13 @@
scrambled_codes = TRUE
status_flags = GODMODE|NOFALL
+ /// The BST's original mob. Moved here from /datum/holder to support storytellers.
+ var/mob/original_mob
+
+/mob/living/silicon/robot/bluespace/Destroy(force)
+ original_mob = null
+ return ..()
+
/mob/living/silicon/robot/bluespace/verb/antigrav()
set name = "Toggle Gravity"
set desc = "Use bluespace technology to ignore gravity."
@@ -67,10 +74,10 @@
animate(src, alpha = 0, time = 9, easing = QUAD_EASING)
if(key)
- if(client.holder && client.holder.original_mob)
- client.holder.original_mob.key = key
+ if(original_mob)
+ original_mob.key = key
else
- var/mob/abstract/observer/ghost = new(src) //Transfer safety to observer spawning proc.
+ var/mob/abstract/ghost/observer/ghost = new(src, src) //Transfer safety to observer spawning proc.
ghost.key = key
ghost.mind.name = "[ghost.key] BSTech"
ghost.name = "[ghost.key] BSTech"
@@ -85,6 +92,11 @@
status_flags ^= GODMODE
to_chat(src, SPAN_NOTICE("God mode is now [status_flags & GODMODE ? "enabled" : "disabled"]"))
+/mob/living/silicon/robot/bluespace/vv_edit_var(var_name, var_value)
+ if(var_name == NAMEOF(src, original_mob))
+ return FALSE
+ return ..()
+
/mob/living/silicon/robot/purpose
mod_type = "Purpose"
spawn_module = /obj/item/robot_module/purpose
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index c3b3351985d..30bac69f959 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -76,7 +76,7 @@
GLOB.move_manager.stop_looping(src)
if(prob(2)) //spooky
- var/mob/abstract/observer/spook = locate() in range(src,5)
+ var/mob/abstract/ghost/observer/spook = locate() in range(src,5)
if(spook)
var/turf/T = spook.loc
var/list/visible = list()
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index 894858d7494..4da6ad9eb4e 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -90,7 +90,7 @@
if(!B.brainmob.key)
var/ghost_can_reenter = 0
if(B.brainmob.mind)
- for(var/mob/abstract/observer/G in GLOB.player_list)
+ for(var/mob/abstract/ghost/observer/G in GLOB.player_list)
if(G.can_reenter_corpse && G.mind == B.brainmob.mind)
ghost_can_reenter = 1
break
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index a1bc4fc7a73..0ec7edf8f61 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -41,7 +41,8 @@
//None of these mobs can 'die' in any sense, and none of them should be able to become ghosts.
//Ghosts are the only ones that even technically 'exist' and aren't just an abstraction using mob code for convenience
- if (istype(src, /mob/living))
+ //Well, those and storytellers. This code is seriously shit and needs a rework, but who gives a fuck right now. Sue me.
+ if (istype(src, /mob/living) && !isstoryteller(src))
ghostize()
if (istype(src.loc, /atom/movable))
@@ -180,7 +181,7 @@
continue
if (!M.client || istype(M, /mob/abstract/new_player))
continue
- if((get_turf(M) in messageturfs) || (show_observers && isobserver(M) && (M.client.prefs.toggles & CHAT_GHOSTSIGHT)))
+ if((get_turf(M) in messageturfs) || (show_observers && isghost(M) && (M.client.prefs.toggles & CHAT_GHOSTSIGHT)))
messagemobs += M
for(var/o in GLOB.listening_objects)
@@ -191,7 +192,7 @@
for(var/A in messagemobs)
var/mob/M = A
- if(isobserver(M))
+ if(isghost(M))
M.show_message("[ghost_follow_link(src, M)] [message]", 1)
continue
if(self_message && M == src)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index d480126948c..3f690255117 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -582,8 +582,8 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
follow = "[ghost_follow_link(subject, M)] "
if(M.stat != DEAD && M.client.holder)
follow = "([admin_jump_link(subject, M.client.holder)]) "
- var/mob/abstract/observer/DM
- if(istype(subject, /mob/abstract/observer))
+ var/mob/abstract/ghost/observer/DM
+ if(istype(subject, /mob/abstract/ghost/observer))
DM = subject
if(M.client.holder) // What admins see
lname = "[keyname][(DM && DM.anonsay) ? "*" : (DM ? "" : "^")] ([name])"
@@ -1092,7 +1092,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
if(P?.ismultitool())
return P
-/mob/abstract/observer/get_multitool()
+/mob/abstract/ghost/observer/get_multitool()
return can_admin_interact() && ..(ghost_multitool)
/mob/living/carbon/human/get_multitool()
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 630bc0b0afa..580bb32a9c8 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -250,7 +250,7 @@
if(mob.control_object)
Move_object(direct)
- if(mob.incorporeal_move && isobserver(mob))
+ if(mob.incorporeal_move && isabstractmob(mob))
Process_Incorpmove(direct, mob)
return
diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm
index 3366e98a040..62587d59408 100644
--- a/code/modules/modular_computers/computers/modular_computer/interaction.dm
+++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm
@@ -181,10 +181,10 @@
else if(scan_mode == SCANNER_GAS)
analyze_gases(A, user)
-/obj/item/modular_computer/attack_ghost(var/mob/abstract/observer/user)
+/obj/item/modular_computer/attack_ghost(var/mob/abstract/ghost/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/modular_computers/file_system/programs/security/camera.dm b/code/modules/modular_computers/file_system/programs/security/camera.dm
index b9214406fe7..7db7fb3d0d6 100644
--- a/code/modules/modular_computers/file_system/programs/security/camera.dm
+++ b/code/modules/modular_computers/file_system/programs/security/camera.dm
@@ -24,6 +24,8 @@
return ACCESS_HEADS
if(NETWORK_CRESCENT,NETWORK_ERT)
return ACCESS_CENT_SPECOPS
+ if(NETWORK_CRYO_OUTPOST)
+ return ACCESS_CRYO_OUTPOST
return ACCESS_SECURITY // Default for all other networks
diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm
index b247cb89eed..03a27947773 100644
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -112,7 +112,7 @@
else
to_chat(owner, SPAN_NOTICE("There is nothing of interest in this direction."))
-/mob/abstract/observer/zMove(direction)
+/mob/abstract/ghost/observer/zMove(direction)
var/turf/T = get_turf(src)
var/turf/destination = (direction == UP) ? GET_TURF_ABOVE(T) : GET_TURF_BELOW(T)
if(destination)
@@ -133,7 +133,7 @@
return TRUE
return FALSE
-/mob/abstract/observer/can_ztravel(var/direction)
+/mob/abstract/ghost/observer/can_ztravel(var/direction)
return TRUE
/mob/living/carbon/human/can_ztravel(var/direction)
diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm
index e243ad2c60a..ef54fc0643c 100644
--- a/code/modules/multiz/structures.dm
+++ b/code/modules/multiz/structures.dm
@@ -148,7 +148,7 @@
return FALSE
return TRUE
-/mob/abstract/observer/may_climb_ladders(var/ladder)
+/mob/abstract/ghost/observer/may_climb_ladders(var/ladder)
return TRUE
/obj/structure/ladder/proc/climbLadder(var/mob/M, var/target_ladder)
diff --git a/code/modules/nano/modules/ghost_menu.dm b/code/modules/nano/modules/follow_menu.dm
similarity index 75%
rename from code/modules/nano/modules/ghost_menu.dm
rename to code/modules/nano/modules/follow_menu.dm
index 4aca1e9e752..87b033df6f1 100644
--- a/code/modules/nano/modules/ghost_menu.dm
+++ b/code/modules/nano/modules/follow_menu.dm
@@ -1,24 +1,25 @@
-/datum/tgui_module/ghost_menu/ui_interact(var/mob/user, var/datum/tgui/ui)
+/datum/tgui_module/follow_menu/ui_interact(var/mob/user, var/datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "FollowMenu", "Follow Menu", 800, 400)
ui.open()
-/datum/tgui_module/ghost_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+/datum/tgui_module/follow_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
- var/mob/abstract/observer/ghost = usr
+ var/mob/abstract/ghost/ghost = usr
if(!istype(ghost))
return
if(action == "follow_target")
ghost.ManualFollow(locate(params["follow_target"]) in GLOB.mob_list)
-/datum/tgui_module/ghost_menu/ui_data(mob/user)
+/datum/tgui_module/follow_menu/ui_data(mob/user)
var/list/data = list()
- var/is_mod = check_rights(R_MOD|R_ADMIN, 0, user)
+ // Don't worry about this is_mod check being for storytellers as well - all it does is highlight antags in red.
+ var/is_mod = check_rights(R_MOD|R_ADMIN, 0, user) || isstoryteller(user)
data["is_mod"] = is_mod
var/list/ghosts = list()
@@ -46,6 +47,9 @@
if(isobserver(M))
name += " \[Ghost\]"
category = "Observer"
+ else if(isstoryteller(M))
+ name += "\[Storyteller\]"
+ category = "Storytellers"
else
name += " \[Dead\]"
category = "Dead"
@@ -53,7 +57,7 @@
if(player_is_obvious_antag(M.mind))
category = M.mind.special_role
else if(isobserver(user))
- var/mob/abstract/observer/O = user
+ var/mob/abstract/ghost/observer/O = user
if(O.antagHUD && player_is_antag(M.mind))
category = M.mind.special_role
if(!category)
@@ -69,7 +73,7 @@
data["ghosts"] = ghosts
return data
-/datum/tgui_module/ghost_menu/proc/sort_categories(var/list/menu_info)
+/datum/tgui_module/follow_menu/proc/sort_categories(var/list/menu_info)
var/static/list/ordered_categories = list("Alive", "Dead", "Observer", "NPCs", "Dead NPCs")
var/list/sorted_menu_info = list()
diff --git a/code/modules/nano/modules/narrate_panel.dm b/code/modules/nano/modules/narrate_panel.dm
new file mode 100644
index 00000000000..7a59f2f89ba
--- /dev/null
+++ b/code/modules/nano/modules/narrate_panel.dm
@@ -0,0 +1,67 @@
+/datum/tgui_module/narrate_panel/ui_interact(var/mob/user, var/datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "NarratePanel", "Narrate Panel", 800, 400)
+ ui.open()
+
+/datum/tgui_module/narrate_panel/ui_data(mob/user)
+ var/list/data = list()
+ data["narrate_styles"] = list("danger", "notice", "warning", "alien", "cult")
+ data["narrate_locations"] = list("View", "Range", "Z-Level", "Global")
+ return data
+
+/datum/tgui_module/narrate_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+
+ var/mob/abstract/ghost/ghost = ui.user
+ if(!istype(ghost))
+ return FALSE
+
+ if(action == "narrate")
+ var/narrate_text = sanitizeSafe(params["narrate_text"])
+ if(!length(narrate_text))
+ to_chat(ghost, SPAN_WARNING("No text was supplied!"))
+ return FALSE
+
+ var/narrate_style = params["narrate_style"]
+ if(!narrate_style)
+ to_chat(ghost, SPAN_WARNING("No text style was supplied!"))
+ return FALSE
+
+ var/narrate_size = text2num(params["narrate_size"])
+ if(!isnum(narrate_size))
+ to_chat(ghost, SPAN_WARNING("No text size was supplied!"))
+ return FALSE
+
+ var/narrate_range = text2num(params["narrate_range"])
+ if(!isnum(narrate_range))
+ to_chat(ghost, SPAN_WARNING("No narrate range was supplied!"))
+ return FALSE
+
+ var/narrate_location = params["narrate_location"]
+ if(!narrate_location)
+ to_chat(ghost, SPAN_WARNING("No narrate location was supplied!"))
+ return FALSE
+
+ var/list/mobs_to_message = list()
+ switch(narrate_location)
+ if("View")
+ for(var/mob/M in get_hearers_in_view(narrate_range, ghost))
+ mobs_to_message |= M
+
+ if("Range")
+ for(var/mob/M in get_hearers_in_range(narrate_range, ghost))
+ mobs_to_message |= M
+
+ if("Z-Level")
+ for(var/mob/M in GLOB.player_list)
+ if(GET_Z(M) == ghost.z)
+ mobs_to_message |= M
+
+ if("Global")
+ mobs_to_message = GLOB.player_list.Copy()
+
+ for(var/mob/actor in mobs_to_message)
+ to_chat(actor, "[narrate_text] \The [src] states, \"Contact '[contact.unknown_id]' tracing [objects_in_view[contact]]% complete, bearing [bearing_estimate], error +/- [bearing_variability].\""))
playsound(loc, 'sound/machines/sensors/contactgeneric.ogg', 10, 1) //Let players know there's something nearby.
if(objects_in_view[contact] >= 100) // Identification complete.
- record = new /datum/overmap_contact(src, contact)
- contact_datums[contact] = record
- if(contact.scannable)
- playsound(loc, 'sound/machines/sensors/newcontact.ogg', 30, 1)
- visible_message(SPAN_NOTICE("\The [src] states, \"New contact identified, designation [record.name], bearing [bearing].\""))
- record.show()
- animate(record.marker, alpha=255, 2 SECOND, 1, LINEAR_EASING)
+ record = add_contact(contact)
continue
// Update identification information for this record.
record.update_marker_icon()
@@ -152,6 +144,28 @@
if(!record.pinged)
addtimer(CALLBACK(record, PROC_REF(ping)), time_delay)
+/**
+ * Adds an overmap object to the known contacts.
+ */
+/obj/machinery/computer/ship/sensors/proc/add_contact(obj/effect/overmap/contact)
+ var/datum/overmap_contact/record = new(src, contact)
+ var/bearing = get_bearing(contact)
+ contact_datums[contact] = record
+ if(contact.scannable)
+ playsound(loc, 'sound/machines/sensors/newcontact.ogg', 30, 1)
+ visible_message(SPAN_NOTICE("\The [src] states, \"New contact identified, designation [record.name], bearing [bearing].\""))
+ record.show()
+ animate(record.marker, alpha=255, 2 SECOND, 1, LINEAR_EASING)
+ return record
+
+/**
+ * Gets the bearing of an obj/effect/overmap/contact from src.
+ */
+/obj/machinery/computer/ship/sensors/proc/get_bearing(obj/effect/overmap/contact)
+ . = round(90 - Atan2(contact.x - linked.x, contact.y - linked.y),5)
+ if(. < 0)
+ . += 360
+
/obj/machinery/computer/ship/sensors/attackby(obj/item/attacking_item, mob/user)
. = ..()
var/obj/item/device/multitool/P = attacking_item
diff --git a/code/modules/overmap/exoplanets/decor/_turfs.dm b/code/modules/overmap/exoplanets/decor/_turfs.dm
index ba788eb7ff2..7c65a621fa2 100644
--- a/code/modules/overmap/exoplanets/decor/_turfs.dm
+++ b/code/modules/overmap/exoplanets/decor/_turfs.dm
@@ -17,20 +17,33 @@
var/has_edge_icon = TRUE
/turf/simulated/floor/exoplanet/New()
- // try to get the the atmos and area of the exoplanet
+ // try to get the the atmos and area of the planet
if(SSatlas.current_map.use_overmap)
- var/obj/effect/overmap/visitable/sector/exoplanet/E = GLOB.map_sectors["[z]"]
- if(istype(E))
- if(E.atmosphere)
- initial_gas = E.atmosphere.gas.Copy()
- temperature = E.atmosphere.temperature
+ // if exoplanet
+ var/datum/site = GLOB.map_sectors["[z]"]
+ if(istype(site, /obj/effect/overmap/visitable/sector/exoplanet))
+ var/obj/effect/overmap/visitable/sector/exoplanet/exoplanet = site
+ if(exoplanet.atmosphere)
+ initial_gas = exoplanet.atmosphere.gas.Copy()
+ temperature = exoplanet.atmosphere.temperature
else
initial_gas = list()
temperature = T0C
//Must be done here, as light data is not fully carried over by ChangeTurf (but overlays are).
- set_light(MINIMUM_USEFUL_LIGHT_RANGE, E.lightlevel, E.lightcolor)
- if(E.planetary_area && istype(loc, world.area))
- ChangeArea(src, E.planetary_area)
+ set_light(MINIMUM_USEFUL_LIGHT_RANGE, exoplanet.lightlevel, exoplanet.lightcolor)
+ if(exoplanet.planetary_area && istype(loc, world.area))
+ ChangeArea(src, exoplanet.planetary_area)
+ // if away site
+ else if(istype(site, /datum/map_template/ruin/away_site))
+ var/datum/map_template/ruin/away_site/away_site = site
+ if(away_site.exoplanet_atmosphere)
+ initial_gas = away_site.exoplanet_atmosphere.gas.Copy()
+ temperature = away_site.exoplanet_atmosphere.temperature
+ else
+ initial_gas = list()
+ temperature = T0C
+ set_light(MINIMUM_USEFUL_LIGHT_RANGE, away_site.lightlevel, away_site.lightcolor)
+
// if not on an exoplanet, instead just keep the default or mapped in atmos
..()
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index df54e3d461d..09dd4aa8140 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -139,7 +139,7 @@
paper_win.open()
/obj/item/paper/proc/can_read(var/mob/user, var/forceshow = FALSE)
- var/can_read = (istype(user, /mob/living/carbon/human) || isobserver(user) || istype(user, /mob/living/silicon)) || forceshow
+ var/can_read = (istype(user, /mob/living/carbon/human) || isghost(user) || istype(user, /mob/living/silicon)) || forceshow
if(!forceshow && istype(user,/mob/living/silicon/ai))
var/mob/living/silicon/ai/AI = user
can_read = get_dist(src, AI.camera) < 2
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index bd0bd2f45b3..6c9a310d5c6 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -875,7 +875,7 @@ ABSTRACT_TYPE(/obj/machinery/power/apc)
/obj/machinery/power/apc/ui_data(mob/user)
var/list/data = list()
- var/isAdmin = isobserver(user) && check_rights(R_ADMIN, FALSE, user)
+ var/isAdmin = (isobserver(user) && check_rights(R_ADMIN, FALSE, user)) || isstoryteller(user)
data["locked"] = (locked && !emagged)
data["power_cell_inserted"] = cell != null
data["power_cell_charge"] = cell?.percent()
@@ -902,7 +902,7 @@ ABSTRACT_TYPE(/obj/machinery/power/apc)
/obj/machinery/power/apc/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
- ui = new(user, src, "Apc", "[area.name] - APC", 665, (isobserver(user) && check_rights(R_ADMIN, FALSE, user) || issilicon(user)) ? 540 : 480)
+ ui = new(user, src, "Apc", "[area.name] - APC", 665, (isobserver(user) && check_rights(R_ADMIN, FALSE, user) || issilicon(user) || isstoryteller(user)) ? 540 : 480)
ui.open()
/obj/machinery/power/apc/proc/update()
@@ -923,11 +923,12 @@ ABSTRACT_TYPE(/obj/machinery/power/apc)
if(!operable())
return FALSE
var/use_flags = issilicon(user) && USE_ALLOW_NON_ADJACENT // AIs and borgs can use it at range
- use_flags |= (check_rights(R_ADMIN, FALSE, user) && USE_ALLOW_NONLIVING) // admins can use the UI when ghosting
- if(use_check(user, use_flags, show_messages = TRUE))
- return FALSE
+ if(isstoryteller(user))
+ return TRUE
if(isobserver(user))
return check_rights(R_ADMIN, FALSE, user)
+ if(use_check(user, use_flags, show_messages = TRUE))
+ return FALSE
if(!user.client)
return FALSE
if(user.restrained())
@@ -970,7 +971,7 @@ ABSTRACT_TYPE(/obj/machinery/power/apc)
if(!can_use(usr, 1))
return
- var/isAdmin = isobserver(usr) && check_rights(R_ADMIN, FALSE)
+ var/isAdmin = (isobserver(usr) && check_rights(R_ADMIN, FALSE)) || isstoryteller(usr)
switch(action)
if("lmode")
toggle_nightlight(params["lmode"])
diff --git a/code/modules/random_map/drop/droppod.dm b/code/modules/random_map/drop/droppod.dm
index 48e42846b67..bda28faae84 100644
--- a/code/modules/random_map/drop/droppod.dm
+++ b/code/modules/random_map/drop/droppod.dm
@@ -174,7 +174,7 @@
else
var/list/candidates = list()
for(var/client/player in GLOB.clients)
- if(player.mob && istype(player.mob, /mob/abstract/observer))
+ if(player.mob && istype(player.mob, /mob/abstract/ghost/observer))
candidates |= player
if(!candidates.len)
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index 22db2d3fe78..15b809cf2a0 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -6795,7 +6795,7 @@
name = "Pulque"
description = "A traditional Mictlanian drink made from fermented sap of maguey."
strength = 15
- color = "f1f1f1"
+ color = "#f1f1f1"
taste_description = "yeast"
glass_icon_state = "pulque"
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 88d46f396de..f1d9e4b1ef6 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -181,7 +181,7 @@
return ..()
-/obj/structure/reagent_dispensers/fueltank/attack_ghost(mob/user as mob)
+/obj/structure/reagent_dispensers/fueltank/attack_ghost(mob/user)
if(user.client && user.client.inquisitive_ghost)
examine()
if(!user.client.holder)
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index 77f82b83b90..9c44648429c 100644
--- a/code/modules/security levels/keycard authentication.dm
+++ b/code/modules/security levels/keycard authentication.dm
@@ -78,7 +78,6 @@
dat += "Red alert Broadcast Distress Beacon Unlock Leviathan Safeties Emergency Evacuation (context);
+ const [narrateText, setNarrateText] = useLocalState(
+ context,
+ 'narrateText',
+ ''
+ );
+ const [narrateSize, setNarrateSize] = useLocalState(
+ context,
+ 'narrateSize',
+ 2
+ );
+ const [narrateRange, setNarrateRange] = useLocalState(
+ context,
+ 'narrateRange',
+ 7
+ );
+ const [narrateStyle, setNarrateStyle] = useLocalState(
+ context,
+ 'textStyle',
+ 'notice'
+ );
+ const [narrateLocation, setNarrateLocation] = useLocalState(
+ context,
+ 'narrateLocation',
+ 'View'
+ );
+
+ return (
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/OdysseyPanel.tsx b/tgui/packages/tgui/interfaces/OdysseyPanel.tsx
new file mode 100644
index 00000000000..19df54e32a0
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/OdysseyPanel.tsx
@@ -0,0 +1,149 @@
+import { BooleanLike } from 'common/react';
+import { useBackend } from '../backend';
+import { Box, Button, LabeledList, NoticeBox, Section } from '../components';
+import { Window } from '../layouts';
+
+export type OdysseyData = {
+ scenario_name: string;
+ scenario_desc: string;
+ scenario_canonicity: string;
+ is_storyteller: BooleanLike;
+
+ scenario_roles: Role[];
+};
+
+type Role = {
+ name: string;
+ desc: string;
+ outfit: string;
+ type: string;
+};
+
+export const OdysseyPanel = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ return (
+
+
+ act('edit_scenario_name')}
+ />
+ }>
+ {data.scenario_desc}{' '}
+ act('edit_scenario_desc')}
+ />
+
+ This is a{' '}
+
+ {data.scenario_canonicity}
+ {' '}
+ scenario. Please remember that the one thing you cannot change about
+ the round is its canonicity! Stay within the bounds of the
+ scenario's intended canon status.
+
+
+ {data.scenario_roles && data.scenario_roles.length ? (
+ There are no roles for this scenario.
+ )}
+
+
+ );
+};
+
+export const RoleDisplay = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ return (
+
+
+ You are not beholden to following the role names and descriptions. You
+ can use their equipment and change up the premises or what your
+ objective is as you like! These are just guidelines in the end, or how
+ the developer envisioned the story. Your creativity is the limit!
+
+ {data.scenario_roles.map((role) => (
+
+ act('edit_role', { new_name: 1, role_type: role.type })
+ }
+ />
+ ) : (
+ {role.name}
+ )
+ }
+ key={role.name}
+ buttons={
+ !data.is_storyteller ? (
+
+ act('equip_outfit', { outfit_type: role.outfit })
+ }
+ />
+ ) : (
+ ''
+ )
+ }>
+ {role.desc}{' '}
+ {data.is_storyteller ? (
+
+ act('edit_role', { new_desc: 1, role_type: role.type })
+ }
+ />
+ ) : (
+ ''
+ )}
+ {data.is_storyteller ? (
+
+
+
+ act('edit_role', { edit_outfit: 1, role_type: role.type })
+ }
+ />
+
+
+ ) : (
+ ''
+ )}
+
+ ))}
+
+ );
+};
diff --git a/tgui/yarn.lock b/tgui/yarn.lock
index c6728a89c6b..8a7e3a86e4d 100644
--- a/tgui/yarn.lock
+++ b/tgui/yarn.lock
@@ -3465,9 +3465,9 @@ __metadata:
linkType: hard
"caniuse-lite@npm:^1.0.30001248":
- version: 1.0.30001480
- resolution: "caniuse-lite@npm:1.0.30001480"
- checksum: c0b40f02f45ee99c73f732a3118028b2ab1544962d473d84f2afcb898a5e3099bd4c45f316ebc466fb1dbda904e86b72695578ca531a0bfa9d6337e7aad1ee2a
+ version: 1.0.30001651
+ resolution: "caniuse-lite@npm:1.0.30001651"
+ checksum: c31a5a01288e70cdbbfb5cd94af3df02f295791673173b8ce6d6a16db4394a6999197d44190be5a6ff06b8c2c7d2047e94dfd5e5eb4c103ab000fca2d370afc7
languageName: node
linkType: hard