Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds the Odyssey gamemode. #18972

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
1399ec5
some more basic work
liermattia Apr 10, 2024
28d3c2d
AI eye and all sorts of fancy shit
liermattia Apr 12, 2024
9f42935
storyteller verbs
liermattia Apr 15, 2024
dd1f986
rebrand to odyssey
liermattia Apr 16, 2024
fa6423c
compile
liermattia Apr 16, 2024
fbc0e44
basic maploading work
liermattia Apr 17, 2024
383b523
more maploading
liermattia Apr 19, 2024
c9c0237
face à la mer
liermattia Apr 22, 2024
59f6eee
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Apr 22, 2024
1d3b822
we're so sick and tired
liermattia Apr 22, 2024
45fb2a3
tis the season
liermattia Apr 22, 2024
4648c43
the true me
liermattia Apr 22, 2024
f8409b9
compile already Jesus Christ
liermattia Apr 22, 2024
cff27a6
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Jun 3, 2024
a0f3368
one more hour
liermattia Jun 3, 2024
5ef88d8
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Jun 11, 2024
f4dec6e
all i want for christmas is this to work
liermattia Jun 11, 2024
ced83ce
cryo_outpost (unfinished)
Jun 19, 2024
8d11d22
missing stuff for cryo_outpost mission
Jun 19, 2024
94cfc5a
ugh
Jun 19, 2024
d017ed3
again and again we refuse to be...
liermattia Jun 19, 2024
49d7cdd
ugh prefix fix
Jun 19, 2024
5d0602c
oh man
liermattia Jun 21, 2024
ff96940
things
liermattia Jun 24, 2024
282cc77
TODO: the visualnet disaster
liermattia Jun 28, 2024
c25008d
abstract storyteller
liermattia Jun 28, 2024
454d822
sight tweaks
liermattia Jun 29, 2024
7895f3f
ghost icon
liermattia Jul 2, 2024
136c6f8
the boy lost to the stars that dared to dream of a new server
liermattia Jul 29, 2024
f574186
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Jul 29, 2024
d5fe947
To me To me To me To me
liermattia Jul 29, 2024
f34faae
TODO: fix that weird ass bapi error?
liermattia Aug 1, 2024
fec3c6d
seeking purpose
liermattia Aug 2, 2024
f7c5d07
cryo_outpost stuff from dreamys branch
Aug 2, 2024
69ddfac
more stuff from dreamys branch...
Aug 2, 2024
25303ba
oops
Aug 2, 2024
1e1cd62
Help
liermattia Aug 2, 2024
3f62dda
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Aug 20, 2024
de00d43
The chains of time / Underneath the canopy
liermattia Aug 20, 2024
e470415
FUCK THE MAPLOADER
liermattia Aug 20, 2024
b360d8f
todo: rename odyssey singletons to 'scenarios' or whatever
liermattia Aug 20, 2024
2962832
armed and ready
liermattia Aug 21, 2024
e6e77ca
vengo pe' chi n'è capace de sta zitto e bono si qualcosa non je piace
liermattia Aug 21, 2024
42ffa6b
Aka why did you have to fuck up oshi no ko? No seriously what the fuc…
liermattia Aug 21, 2024
2effb67
roles framework
liermattia Aug 22, 2024
153d339
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Aug 22, 2024
4047eeb
wow almost done with the fixes
liermattia Aug 22, 2024
cfb5f69
the stars burn bright, so bright
liermattia Aug 23, 2024
7ee92ad
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Aug 23, 2024
c8615bf
unfuck the blueprints (?)
liermattia Aug 23, 2024
2ffa732
blueprint fixes and odyssey panel is now prettier
liermattia Aug 23, 2024
f408902
fix that thanks to dreamy
liermattia Aug 23, 2024
a0e3f38
it's mostly ready i think
liermattia Aug 24, 2024
8a8d946
stuff
liermattia Aug 24, 2024
55082ff
move scenario def to cryo outpost map folder
Aug 24, 2024
a27888d
mapping + generic instead of zeng-hu + rename folder from odysseys to…
Aug 24, 2024
17aa2d2
mapping
Aug 24, 2024
8c5e426
map prefix oops
Aug 24, 2024
48edb95
minimap pois
Aug 24, 2024
c7e9ba0
mapping
Aug 24, 2024
a4c4dad
mapping
Aug 24, 2024
12f9d19
portable map reader
Aug 24, 2024
b09f3c5
remove AREA_FLAG_HIDE_FROM_HOLOMAP from areas
Aug 24, 2024
2625b22
fixes from the test pt1
liermattia Aug 27, 2024
3fdabe3
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Sep 27, 2024
de8ea24
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Oct 4, 2024
ecf8072
what makes the sky blue?
liermattia Oct 4, 2024
876ce20
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Oct 12, 2024
d3dda5a
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Oct 12, 2024
0078a1f
zero
liermattia Oct 12, 2024
a1f9f26
actually that's kinda better
liermattia Oct 12, 2024
fa3b6c6
ruined propellant depot
Oct 12, 2024
c4c3ebf
Merge branch 'there_ends_the_world' of https://github.com/NonQueueing…
Oct 12, 2024
6ce42ea
ruined propellant depot tweaks
Oct 12, 2024
ae2c8ca
ruined propellant depot tweaks
Oct 12, 2024
7a8244a
ruined propellant depot tweaks
Oct 12, 2024
1c33477
ruined propellant depot tweaks
Oct 12, 2024
7c53085
ruined propellant depot tweaks
Oct 12, 2024
32e60ab
ruined propellant depot tweaks
Oct 12, 2024
8571eeb
ruined propellant depot tweaks
Oct 12, 2024
a5eed8c
actor tweaks, makes unready prevention work
liermattia Oct 12, 2024
acb07b9
ruined propellant depot tweaks
Oct 12, 2024
5d29307
well, that's a pain in the ass
liermattia Oct 19, 2024
d77717c
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Oct 19, 2024
6272f7d
for the empire
liermattia Oct 19, 2024
bb17209
slipping through the cracks of a dark eternity
liermattia Oct 19, 2024
b0b9c69
lastprep
liermattia Oct 19, 2024
1147d4b
e basta dai
liermattia Oct 19, 2024
70c6f88
bruh
liermattia Oct 19, 2024
92fa712
a
liermattia Oct 19, 2024
e7fbdad
artifact cleanup
liermattia Oct 19, 2024
c906bea
some more stuff
liermattia Oct 19, 2024
df7b580
enable that
liermattia Oct 19, 2024
8c484c2
fixes pt1
liermattia Oct 19, 2024
19414af
update changelog
Oct 20, 2024
22263df
cryo outpost id access fix
Oct 20, 2024
5707776
update portable map reader
Oct 20, 2024
83ff6c4
fixes
liermattia Oct 20, 2024
55af5f3
sanitizes vars on odyssey maps
Oct 20, 2024
52ec38a
map fix
liermattia Oct 25, 2024
d8d9afa
fix that stuff
liermattia Oct 25, 2024
4bf8927
Will tomorrow ever come?
liermattia Oct 25, 2024
c3ccec4
pass the tests already bro holy shit
liermattia Oct 25, 2024
cdb93aa
what am i even doing man
liermattia Oct 25, 2024
826db02
tragic
liermattia Oct 26, 2024
480d670
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Oct 26, 2024
9e57c47
sdsds
liermattia Oct 26, 2024
f443c53
edit this stuff
liermattia Oct 26, 2024
f5961da
wording again
liermattia Oct 26, 2024
0455796
add midis back
liermattia Oct 26, 2024
291b47a
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Nov 2, 2024
0700c73
motherfucker
liermattia Nov 2, 2024
6c0d6e2
bad apple
liermattia Nov 2, 2024
270767e
adssda
liermattia Nov 2, 2024
1006629
sdadsa
liermattia Nov 2, 2024
57f9646
Merge remote-tracking branch 'Aurora/master' into there_ends_the_world
liermattia Nov 10, 2024
18d153b
stella magna
liermattia Nov 10, 2024
96fe772
scenario announcements
liermattia Nov 11, 2024
9fa2b52
fix all of that
liermattia Nov 12, 2024
28702d2
every time you start it's like the 4th of july
liermattia Nov 17, 2024
71267a7
but the pressure keeps growing
liermattia Nov 17, 2024
f577c8c
CUT IT DOWN CUT IT DOWN DOWN DOWN CUT IT DOWN
liermattia Nov 17, 2024
c83de88
have you been telling me a lie??
liermattia Nov 17, 2024
26af6c0
you don't even find a way around a battle
liermattia Nov 17, 2024
1af2caf
oops
liermattia Nov 17, 2024
7f236cc
so that's why i kept missing the clues
liermattia Nov 22, 2024
3624fca
dsds
liermattia Nov 22, 2024
cdc762f
actor prep area + odyssey teleporter
Nov 23, 2024
8ab0c60
actor prep area - headsets removed cause uhhh idk how to fix
Nov 23, 2024
e82edf7
actor vending machine
Nov 23, 2024
0a2cd9a
storyteller spawn removed from CC zlevel and added to scenarios
Nov 23, 2024
d4743ad
actors can change outfits on the CC zlevel
Nov 23, 2024
cead134
"You can only equip outfits on the odyssey scenario z-level, or the a…
Nov 23, 2024
b842fbf
odyssey ship headset fixed (odyssey encryption key)
Nov 23, 2024
66f709d
sdadsasdasd
liermattia Nov 24, 2024
f9004ca
ztravel
liermattia Nov 24, 2024
f9b4e75
rework the horizon announcement messages & add site landing locking
liermattia Nov 24, 2024
f34bdef
odyssey headset runtiming fix
Nov 24, 2024
c4e9cce
make fluffy happy
liermattia Nov 25, 2024
d81bed7
asdasd
liermattia Nov 26, 2024
d94c2da
dsadsads
liermattia Nov 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/byond.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
34 changes: 29 additions & 5 deletions aurorastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -3887,6 +3900,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"
Expand Down
2 changes: 1 addition & 1 deletion code/ZAS/Airflow.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/_macros.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#define EXAMINE_BLOCK_BLUE(str) ("<div class='examine_block--blue'>" + str + "</div>")
#define EXAMINE_BLOCK_RED(str) ("<div class='examine_block--red'>" + str + "</div>")
#define EXAMINE_BLOCK_DEEP_CYAN(str) ("<div class='examine_block--deep-cyan'>" + str + "</div>")
#define EXAMINE_BLOCK_ODYSSEY(str) ("<div class='examine_block--odyssey'>" + str + "</div>")

#define MATRIX_DANGER(str) (FONT_LARGE(SPAN_DANGER(str)))
#define MATRIX_NOTICE(str) (FONT_LARGE(SPAN_NOTICE(str)))
Expand Down
9 changes: 9 additions & 0 deletions code/__DEFINES/access.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 2 additions & 0 deletions code/__DEFINES/gamemode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions code/__DEFINES/is_helpers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/machinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions code/__DEFINES/rust_bapi.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions code/__DEFINES/scenarios.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/// This mission is canon.
#define SCENARIO_TYPE_CANON "canon"
/// This mission is not canon.
#define SCENARIO_TYPE_NONCANON "non-canon"
1 change: 1 addition & 0 deletions code/__DEFINES/span.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#define SPAN_STYLE(style, str) "<span style=\"[style]\">[str]</span>"
#define SPAN_COLOR(color, str) SPAN_STYLE("color: [color]", "[str]")
#define SPAN_CAUTION(str) ("<span class='caution'>" + str + "</span>")
#define SPAN_STORYTELLER(str) ("<span class='storyteller'>" + str + "</span>")

#define SPAN_RED(str) "<span style='color:[COLOR_RED]'>[str]</span>"
#define SPAN_YELLOW(str) "<span style='color:[COLOR_YELLOW]'>[str]</span>"
Expand Down
1 change: 1 addition & 0 deletions code/__DEFINES/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/__HELPERS/game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions code/__HELPERS/global_lists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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/////
//////////////////////////
Expand Down
3 changes: 3 additions & 0 deletions code/__HELPERS/logging/subsystems/odyssey.dm
Original file line number Diff line number Diff line change
@@ -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]")
2 changes: 1 addition & 1 deletion code/__HELPERS/type2type.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 6 additions & 4 deletions code/__HELPERS/unsorted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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\]"
Expand All @@ -435,14 +435,16 @@ 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)
for(var/mob/living/carbon/slime/M in sortmob)
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)
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/hud/other_mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
37 changes: 17 additions & 20 deletions code/_onclick/observer.dm
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand All @@ -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
Expand Down
Loading
Loading