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.

Sign up for GitHub

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

Jump to bottom

Makes WJs spawn in the ARES core #4068

Merged
merged 4 commits into from
Aug 3, 2023
Merged

Makes WJs spawn in the ARES core #4068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8500c16
wj-spawn
johndoe2013 Jul 31, 2023
16f9011
charger
johndoe2013 Jul 31, 2023
8c9dcdb
Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into w…
johndoe2013 Jul 31, 2023
a74ee13
copypaste causing harddel moment
johndoe2013 Jul 31, 2023
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
1 change: 1 addition & 0 deletions code/_globalvars/lists/mapping_globals.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ GLOBAL_LIST_EMPTY(latewhiskey)

GLOBAL_LIST_EMPTY(latejoin)
GLOBAL_LIST_EMPTY(latejoin_by_squad)
GLOBAL_LIST_EMPTY(latejoin_by_job)

GLOBAL_LIST_EMPTY(zombie_landmarks)

Expand Down
2 changes: 2 additions & 0 deletions code/game/jobs/job/job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@
join_turf = get_turf(pick(GLOB.spawns_by_job[type]))
else if(assigned_squad && GLOB.latejoin_by_squad[assigned_squad])
join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad]))
else if(GLOB.latejoin_by_job[title])
join_turf = get_turf(pick(GLOB.latejoin_by_job[title]))
else
join_turf = get_turf(pick(GLOB.latejoin))
human.forceMove(join_turf)
Expand Down
2 changes: 2 additions & 0 deletions code/game/jobs/role_authority.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
var/turf/late_join_turf
if(GLOB.latejoin_by_squad[assigned_squad])
late_join_turf = get_turf(pick(GLOB.latejoin_by_squad[assigned_squad]))
else if(GLOB.latejoin_by_job[J.title])
late_join_turf = get_turf(pick(GLOB.latejoin_by_job[J.title]))
else
late_join_turf = get_turf(pick(GLOB.latejoin))
H.forceMove(late_join_turf)
Expand Down
10 changes: 10 additions & 0 deletions code/game/objects/effects/landmarks/landmarks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,8 @@
name = "late join"
icon_state = "x2"
var/squad
/// What job should latejoin on this landmark
var/job

/obj/effect/landmark/late_join/alpha
name = "alpha late join"
Expand All @@ -396,16 +398,24 @@
squad = SQUAD_MARINE_4


/obj/effect/landmark/late_join/working_joe
name = "working joe late join"
job = JOB_WORKING_JOE

/obj/effect/landmark/late_join/Initialize(mapload, ...)
. = ..()
if(squad)
LAZYADD(GLOB.latejoin_by_squad[squad], src)
else if(job)
LAZYADD(GLOB.latejoin_by_job[job], src)
else
GLOB.latejoin += src

/obj/effect/landmark/late_join/Destroy()
if(squad)
LAZYREMOVE(GLOB.latejoin_by_squad[squad], src)
else if(job)
LAZYREMOVE(GLOB.latejoin_by_job[job], src)
else
GLOB.latejoin -= src
return ..()
Expand Down
158 changes: 95 additions & 63 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23219,32 +23219,13 @@
},
/area/almayer/shipboard/brig/lobby)
"bRo" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
id = "ARES StairsLower";
name = "\improper ARES Core Shutters";
plane = -7
},
/obj/effect/step_trigger/ares_alert/public{
alert_id = "AresStairs";
alert_message = "Caution: Movement detected in ARES Core.";
cooldown_duration = 1200
},
/obj/effect/step_trigger/ares_alert/public{
alert_id = "AresStairs";
alert_message = "Caution: Movement detected in ARES Core.";
cooldown_duration = 1200
},
/obj/structure/machinery/door/poddoor/almayer/blended/white/open{
closed_layer = 3.2;
id = "ARES Emergency";
layer = 3.2;
name = "ARES Emergency Lockdown";
needs_power = 0;
open_layer = 1.9;
plane = -7
/obj/effect/landmark/late_join/working_joe,
/obj/effect/landmark/start/working_joe,
/obj/structure/machinery/light{
dir = 8
},
/turf/open/floor/almayer/no_build{
icon_state = "test_floor4"
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
"bRr" = (
Expand Down Expand Up @@ -23953,7 +23934,6 @@
},
/area/almayer/squads/delta)
"bUx" = (
/obj/effect/landmark/start/working_joe,
/obj/structure/machinery/light/small{
dir = 8
},
Expand Down Expand Up @@ -28456,6 +28436,12 @@
icon_state = "redcorner"
},
/area/almayer/shipboard/brig/execution)
"czG" = (
/obj/structure/machinery/recharge_station,
/turf/open/floor/almayer/no_build{
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
"czJ" = (
/obj/structure/sign/safety/restrictedarea{
pixel_x = 8;
Expand Down Expand Up @@ -37871,19 +37857,13 @@
/turf/open/floor/almayer,
/area/almayer/hull/upper_hull/u_f_p)
"gAe" = (
/obj/structure/filingcabinet{
density = 0;
pixel_x = -8;
pixel_y = 18
},
/obj/structure/filingcabinet{
density = 0;
pixel_x = 8;
pixel_y = 18
/obj/structure/machinery/door_control{
id = "ARES JoeCryo";
name = "Working Joe Cryogenics Lockdown";
pixel_x = 24;
pixel_y = 8;
req_one_access_txt = "19;200;90;91;92"
},
/obj/item/folder/white,
/obj/item/folder/white,
/obj/item/folder/white,
/turf/open/floor/almayer/no_build{
icon_state = "ai_floors"
},
Expand Down Expand Up @@ -51742,7 +51722,6 @@
},
/area/almayer/living/pilotbunks)
"mLE" = (
/obj/effect/landmark/start/working_joe,
/turf/open/floor/plating,
/area/almayer/command/airoom)
"mLF" = (
Expand Down Expand Up @@ -58708,6 +58687,25 @@
icon_state = "silvercorner"
},
/area/almayer/command/computerlab)
"pTt" = (
/obj/structure/machinery/door/poddoor/shutters/almayer{
id = "ARES JoeCryo";
name = "\improper ARES Core Shutters";
plane = -7
},
/turf/open/floor/almayer/no_build{
icon_state = "test_floor4"
},
/area/almayer/command/airoom)
"pTM" = (
/obj/structure/sign/safety/water{
pixel_x = 8;
pixel_y = -32
},
/turf/open/floor/almayer{
icon_state = "sterile_green_side"
},
/area/almayer/medical/hydroponics)
"pTT" = (
/obj/structure/platform{
dir = 4
Expand Down Expand Up @@ -62393,6 +62391,13 @@
icon_state = "redfull"
},
/area/almayer/command/cic)
"rzf" = (
/obj/effect/landmark/late_join/working_joe,
/obj/effect/landmark/start/working_joe,
/turf/open/floor/almayer/no_build{
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
"rzj" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/obj/structure/machinery/door/firedoor/border_only/almayer{
Expand Down Expand Up @@ -65411,8 +65416,8 @@
/area/almayer/living/briefing)
"sTV" = (
/obj/structure/machinery/power/apc/almayer/hardened{
dir = 1;
cell_type = /obj/item/cell/hyper
cell_type = /obj/item/cell/hyper;
dir = 1
},
/turf/open/floor/plating,
/area/almayer/command/airoom)
Expand Down Expand Up @@ -70813,12 +70818,19 @@
},
/area/almayer/hull/lower_hull/l_m_p)
"vhe" = (
/obj/structure/prop/server_equipment/yutani_server{
/obj/structure/filingcabinet{
density = 0;
desc = "A powerful server tower housing various AI functions.";
name = "server tower";
pixel_y = 16
pixel_x = -8;
pixel_y = 18
},
/obj/structure/filingcabinet{
density = 0;
pixel_x = 8;
pixel_y = 18
},
/obj/item/folder/white,
/obj/item/folder/white,
/obj/item/folder/white,
/turf/open/floor/almayer/no_build{
icon_state = "ai_floors"
},
Expand Down Expand Up @@ -74141,6 +74153,20 @@
icon_state = "bluefull"
},
/area/almayer/command/cichallway)
"wyv" = (
/obj/structure/machinery/door_control{
id = "ARES JoeCryo";
name = "Working Joe Cryogenics Lockdown";
pixel_x = -24;
pixel_y = -8;
req_one_access_txt = "19;200;90;91;92"
},
/obj/effect/landmark/late_join/working_joe,
/obj/effect/landmark/start/working_joe,
/turf/open/floor/almayer/no_build{
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
"wyK" = (
/obj/structure/pipes/standard/simple/hidden/supply,
/turf/open/floor/almayer{
Expand Down Expand Up @@ -75717,12 +75743,12 @@
pixel_y = 32
},
/obj/item/folded_tent/big{
pixel_y = 10;
pixel_x = -6
pixel_x = -6;
pixel_y = 10
},
/obj/item/storage/box/mousetraps{
pixel_y = 12;
pixel_x = 3
pixel_x = 3;
pixel_y = 12
},
/turf/open/floor/almayer{
icon_state = "plate"
Expand Down Expand Up @@ -78348,6 +78374,12 @@
icon_state = "plate"
},
/area/almayer/squads/delta)
"ylg" = (
/obj/structure/machinery/cryopod,
/turf/open/floor/almayer/no_build{
icon_state = "ai_floors"
},
/area/almayer/command/airoom)
"ylm" = (
/obj/structure/machinery/door/firedoor/border_only/almayer,
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -136553,7 +136585,7 @@ pYi
fMl
gUN
bLv
bRo
wkM
xvM
osy
cBm
Expand Down Expand Up @@ -137355,7 +137387,7 @@ lmz
lmz
lmz
lmz
lmz
daz
sbJ
sbJ
sbJ
Expand Down Expand Up @@ -137558,11 +137590,11 @@ lmz
lmz
lmz
lmz
lmz
lmz
lmz
lmz
daz
rzf
bRo
wyv
pTt
gAe
rCi
gba
Expand Down Expand Up @@ -137761,10 +137793,10 @@ lmz
lmz
lmz
lmz
lmz
lmz
lmz
lmz
daz
czG
ylg
ylg
daz
daz
daz
Expand Down Expand Up @@ -137964,11 +137996,11 @@ bdH
bdH
bdH
lmz
lmz
lmz
lmz
lmz
lmz
daz
daz
daz
daz
daz
lmz
lmz
lmz
Expand Down