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

Subsysteming Attempt 2...? #3912

Draft
wants to merge 24 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
130 changes: 92 additions & 38 deletions _maps/outpost/nanotrasen_ice.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1032,9 +1032,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 1
},
/obj/structure/chair/stool/bar{
dir = 8;
pixel_x = -6
Expand Down Expand Up @@ -2353,12 +2350,6 @@
pixel_y = 28;
pixel_x = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 8
},
/obj/effect/turf_decal/siding/wood{
color = "#543C30";
dir = 9
Expand Down Expand Up @@ -2483,12 +2474,6 @@
pixel_x = 8;
pixel_y = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 10
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood/walnut,
Expand Down Expand Up @@ -3007,17 +2992,20 @@
dir = 8;
pixel_x = -6
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 10
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 1
},
/turf/open/floor/wood/walnut,
/area/outpost/crew/bar)
"tx" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/unary/portables_connector/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 8
},
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2
Expand Down Expand Up @@ -3945,6 +3933,26 @@
},
/turf/open/floor/plating,
/area/outpost/maintenance/starboard)
"zi" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 4
},
/obj/effect/turf_decal/industrial/traffic{
dir = 8
},
/obj/machinery/door/poddoor/ert{
dir = 8;
id = "ice_exterior_port"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
/turf/open/floor/plasteel/patterned/brushed,
/area/outpost/exterior)
"zn" = (
/obj/effect/turf_decal/siding/white,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
Expand Down Expand Up @@ -4345,6 +4353,20 @@
light_range = 2
},
/area/outpost/exterior)
"BE" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/unary/portables_connector/layer2{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 4
},
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2
},
/area/outpost/exterior)
"BL" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
Expand Down Expand Up @@ -4372,8 +4394,8 @@
/obj/structure/cable{
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 1
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 6
},
/turf/open/floor/wood/walnut{
icon_state = "wood-broken6"
Expand Down Expand Up @@ -5018,9 +5040,6 @@
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 5
},
/obj/item/trash/chips,
/obj/effect/spawner/random/maintenance,
/obj/item/trash/candy,
Expand Down Expand Up @@ -6560,6 +6579,17 @@
},
/turf/open/floor/plasteel/patterned,
/area/outpost/crew/bathroom)
"Re" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/unary/portables_connector/layer4{
dir = 8
},
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2
},
/area/outpost/exterior)
"Rg" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/mineral/electrolyzer{
Expand Down Expand Up @@ -6634,12 +6664,6 @@
pixel_x = 8;
pixel_y = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 5
},
/turf/open/floor/wood/walnut,
/area/outpost/crew/bar)
"RC" = (
Expand Down Expand Up @@ -6923,8 +6947,6 @@
/turf/open/floor/plasteel/patterned/brushed,
/area/outpost/crew/bathroom)
"Tv" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
/turf/open/floor/wood/walnut{
icon_state = "wood-broken7"
},
Expand Down Expand Up @@ -7494,6 +7516,27 @@
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/plasteel/dark,
/area/outpost/vacant_rooms/shop)
"WY" = (
/obj/effect/turf_decal/industrial/traffic{
dir = 4
},
/obj/effect/turf_decal/industrial/traffic{
dir = 8
},
/obj/machinery/door/poddoor/ert{
dir = 8;
id = "ice_exterior_starboard"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 8
},
/turf/open/floor/plasteel/patterned/brushed,
/area/outpost/exterior)
"Xa" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
Expand Down Expand Up @@ -7751,6 +7794,17 @@
},
/turf/open/floor/plasteel/tech/techmaint,
/area/outpost/maintenance/starboard)
"Ya" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/atmospherics/components/unary/portables_connector/layer4{
dir = 4
},
/turf/open/floor/plating{
light_color = "#1B1D2E";
light_range = 2
},
/area/outpost/exterior)
"Yb" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/borderfloor{
Expand Down Expand Up @@ -10765,7 +10819,7 @@ cC
Nh
de
Cy
tx
Ya
UF
ct
Nh
Expand Down Expand Up @@ -10849,7 +10903,7 @@ cC
Nh
KD
JN
tx
BE
wL
uy
Nh
Expand Down Expand Up @@ -10933,7 +10987,7 @@ cC
Nh
Nh
dh
Ub
zi
Ub
Nh
Nh
Expand Down Expand Up @@ -14295,7 +14349,7 @@ Ak
Ak
Nh
ZM
Dx
WY
Dx
Nh
Nh
Expand Down Expand Up @@ -14463,7 +14517,7 @@ cC
Nh
ll
vy
tx
Re
Gg
qK
Nh
Expand Down
19 changes: 19 additions & 0 deletions _maps/shuttles/independent/independent_rigger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
"aw" = (
/obj/machinery/power/terminal,
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"ax" = (
Expand Down Expand Up @@ -215,6 +218,9 @@
/obj/machinery/power/terminal,
/obj/structure/cable,
/obj/machinery/firealarm/directional/east,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"db" = (
Expand Down Expand Up @@ -897,6 +903,9 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/auto_name/directional/north,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"lf" = (
Expand Down Expand Up @@ -1875,6 +1884,9 @@
/obj/machinery/atmospherics/components/binary/pump{
name = "engine fuel pump"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"xJ" = (
Expand Down Expand Up @@ -2173,6 +2185,9 @@
pixel_x = -5;
pixel_y = 22
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
/turf/open/floor/plasteel/tech,
/area/ship/maintenance/starboard)
"zV" = (
Expand Down Expand Up @@ -2663,6 +2678,10 @@
/obj/structure/cable{
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
/turf/open/floor/plating,
/area/ship/maintenance/starboard)
"Gf" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/inteq/inteq_vaquero.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2278,10 +2278,10 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 1
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
},
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"In" = (
Expand Down
3 changes: 0 additions & 3 deletions _maps/shuttles/minutemen/minutemen_arke.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1262,9 +1262,6 @@
/turf/open/floor/engine/hull/reinforced/interior,
/area/ship/cargo)
"Ki" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 9
},
/obj/structure/rack,
/obj/item/t_scanner/adv_mining_scanner{
pixel_y = 4;
Expand Down
8 changes: 6 additions & 2 deletions _maps/shuttles/minutemen/minutemen_atlas.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -804,14 +804,18 @@
/area/ship/crew/canteen)
"jL" = (
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
/obj/structure/cable{
icon_state = "1-8"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 4
},
/turf/open/floor/plating,
/area/ship/hallway/central)
"jQ" = (
Expand Down
3 changes: 3 additions & 0 deletions _maps/shuttles/syndicate/syndicate_ngr_kaliandhi.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1291,6 +1291,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/security/armory)
"jM" = (
Expand Down
13 changes: 13 additions & 0 deletions code/__DEFINES/MC.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define MC_TICK_CHECK ((TICK_USAGE > Master.current_ticklimit || src.state != SS_RUNNING) ? pause() : 0)
#define MC_PAUSE_IF_TRUE(value) (value ? pause() : 0)

#define MC_TICK_REMAINING_MS ((Master.current_ticklimit - TICK_USAGE) * world.tick_lag)

Expand Down Expand Up @@ -117,3 +118,15 @@
}\
/datum/controller/subsystem/verb_manager/##X/fire() {..() /*just so it shows up on the profiler*/} \
/datum/controller/subsystem/verb_manager/##X

//If you use this, MAKE SURE that all shared data and calls in Fire() are on the main subsystem, otherwise, the background subsystem will do nothing.
#define BACKGROUND_SUBSYSTEM_DEF(X) /datum/controller/subsystem/##X/background/New(){\
PreInit();\
ss_id="background_[#X]";\
}\
/datum/controller/subsystem/##X/background/fire() {\
if(SS##X.can_fire) { ..() }\
}\
/datum/controller/subsystem/##X/background/Recover(){}\
/datum/controller/subsystem/##X/background/flags=SS_BACKGROUND|SS_NO_INIT;\
/datum/controller/subsystem/##X/background
Loading
Loading