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

Departmental officers are now put together, rather than separate, if possible #57685

Merged
merged 16 commits into from
Mar 21, 2021
Merged

Departmental officers are now put together, rather than separate, if possible #57685

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3a95f2d
Initial work, I'll finish later
Mothblocks Mar 12, 2021
5a18f58
Assign roundstart sec officers
Mothblocks Mar 13, 2021
13fc99b
Add more spots for sec officers on Meta
Mothblocks Mar 13, 2021
19a34ec
Merge remote-tracking branch 'upstream/master' into partners-in-not-c…
Mothblocks Mar 13, 2021
3429ede
Add multiple officer spawns on every map
Mothblocks Mar 13, 2021
b2bbbc0
Support multiple depsec spawns
Mothblocks Mar 13, 2021
dcc6e5a
Late join officers
Mothblocks Mar 13, 2021
1071b11
Appease linter
Mothblocks Mar 13, 2021
e457383
Remove random, only none
Mothblocks Mar 13, 2021
4bacece
Fix linters, I think
Mothblocks Mar 13, 2021
277e9f1
PDA/radio updates
Mothblocks Mar 14, 2021
0ad604c
Merge remote-tracking branch 'upstream/master' into partners-in-not-c…
Mothblocks Mar 17, 2021
7177131
Split lines
Mothblocks Mar 17, 2021
f1b5bf2
Add note about the department check
Mothblocks Mar 17, 2021
81c7bc4
ifdef -> if
Mothblocks Mar 17, 2021
f9de4da
Fix typo in docs
Mothblocks Mar 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 32 additions & 0 deletions _maps/map_files/Deltastation/DeltaStation2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8936,6 +8936,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/obj/effect/landmark/start/depsec/supply,
/turf/open/floor/iron,
/area/security/checkpoint/supply)
"aHO" = (
Expand All @@ -8946,6 +8947,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 4
},
/obj/effect/landmark/start/depsec/supply,
/turf/open/floor/iron,
/area/security/checkpoint/supply)
"aHP" = (
Expand Down Expand Up @@ -9310,6 +9312,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/depsec/supply,
/turf/open/floor/iron,
/area/security/checkpoint/supply)
"aJo" = (
Expand All @@ -9318,6 +9321,7 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/effect/landmark/start/depsec/supply,
/turf/open/floor/iron,
/area/security/checkpoint/supply)
"aJy" = (
Expand Down Expand Up @@ -9638,13 +9642,15 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/depsec/supply,
/turf/open/floor/iron,
/area/security/checkpoint/supply)
"aKM" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/effect/landmark/start/depsec/supply,
/turf/open/floor/iron,
/area/security/checkpoint/supply)
"aKN" = (
Expand Down Expand Up @@ -20336,13 +20342,15 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"bQe" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"bQf" = (
Expand All @@ -20354,6 +20362,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"bQg" = (
Expand Down Expand Up @@ -21426,6 +21435,7 @@
dir = 4
},
/obj/machinery/power/apc/auto_name/north,
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"bUg" = (
Expand All @@ -21438,6 +21448,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 4
},
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"bUh" = (
Expand All @@ -21451,6 +21462,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"bUi" = (
Expand Down Expand Up @@ -22342,6 +22354,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"bWw" = (
Expand All @@ -22357,6 +22370,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"bWx" = (
Expand All @@ -22371,6 +22385,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"bWy" = (
Expand Down Expand Up @@ -34582,6 +34597,7 @@
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science/research)
"cSn" = (
Expand All @@ -34595,6 +34611,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science/research)
"cSo" = (
Expand Down Expand Up @@ -35424,6 +35441,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 10
},
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science/research)
"cUb" = (
Expand All @@ -35441,6 +35459,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science/research)
"cUc" = (
Expand Down Expand Up @@ -35842,6 +35861,7 @@
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron,
/area/security/checkpoint/medical)
"cUM" = (
Expand Down Expand Up @@ -36396,6 +36416,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science/research)
"cVY" = (
Expand All @@ -36411,6 +36432,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science/research)
"cVZ" = (
Expand Down Expand Up @@ -36572,6 +36594,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron,
/area/security/checkpoint/medical)
"cWr" = (
Expand All @@ -36580,6 +36603,7 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron,
/area/security/checkpoint/medical)
"cWu" = (
Expand Down Expand Up @@ -37030,6 +37054,7 @@
dir = 1
},
/obj/machinery/power/apc/auto_name/west,
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science/research)
"cXp" = (
Expand All @@ -37038,6 +37063,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science/research)
"cXq" = (
Expand Down Expand Up @@ -37293,13 +37319,15 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron,
/area/security/checkpoint/medical)
"cXU" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron,
/area/security/checkpoint/medical)
"cXY" = (
Expand Down Expand Up @@ -38014,6 +38042,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
dir = 8
},
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron,
/area/security/checkpoint/medical)
"cZE" = (
Expand All @@ -38030,6 +38059,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 8
},
/obj/effect/landmark/start/depsec/medical,
/obj/structure/extinguisher_cabinet{
pixel_x = 26;
pixel_y = -32
Expand Down Expand Up @@ -38450,6 +38480,7 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science/research)
"daI" = (
Expand Down Expand Up @@ -39291,6 +39322,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science/research)
"dcx" = (
Expand Down
10 changes: 10 additions & 0 deletions _maps/map_files/IceBoxStation/IceBoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13020,6 +13020,7 @@
/area/medical/morgue)
"bhs" = (
/obj/structure/cable,
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron,
/area/security/checkpoint/medical)
"bht" = (
Expand Down Expand Up @@ -13680,6 +13681,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 10
},
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron,
/area/security/checkpoint/medical)
"bjN" = (
Expand Down Expand Up @@ -14197,6 +14199,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
/obj/effect/landmark/start/depsec/medical,
/turf/open/floor/iron,
/area/security/checkpoint/medical)
"blq" = (
Expand Down Expand Up @@ -16190,6 +16193,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/obj/effect/landmark/start/depsec/supply,
/turf/open/floor/iron,
/area/security/checkpoint/supply)
"bsW" = (
Expand Down Expand Up @@ -17227,6 +17231,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science)
"bwO" = (
Expand Down Expand Up @@ -18138,6 +18143,7 @@
/area/icemoon/surface/outdoors)
"bAG" = (
/obj/structure/cable,
/obj/effect/landmark/start/depsec/science,
/turf/open/floor/iron,
/area/security/checkpoint/science)
"bAH" = (
Expand Down Expand Up @@ -26518,6 +26524,7 @@
"cBI" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"cBK" = (
Expand Down Expand Up @@ -39520,6 +39527,7 @@
},
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/effect/landmark/start/depsec/engineering,
/turf/open/floor/iron,
/area/security/checkpoint/engineering)
"lNw" = (
Expand Down Expand Up @@ -47720,6 +47728,7 @@
dir = 8
},
/obj/structure/cable,
/obj/effect/landmark/start/depsec/supply,
/turf/open/floor/iron,
/area/security/checkpoint/supply)
"rAo" = (
Expand Down Expand Up @@ -54642,6 +54651,7 @@
dir = 4
},
/obj/structure/cable,
/obj/effect/landmark/start/depsec/supply,
/turf/open/floor/iron,
/area/security/checkpoint/supply)
"wlA" = (
Expand Down