cyberpresidentvanellope/GS13-Citadel
1
0
Fork 0
mirror of https://github.com/evilew/GS13-Citadel.git synced 2026-08-26 14:48:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Khaira-Hol:master' into RDs-wiser-cow

Browse Source
This commit is contained in:
Phantastic-Swan
2025-06-25 13:56:52 +02:00
committed by GitHub
parent fc0b6403ee 87438fbb49
commit 12cbe7ed6b
6 changed files with 362 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+1 -1
View File
@@ -3354,7 +3354,7 @@
"bnJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/open/floor/plasteel/cafeteria,/area/service/kitchen)
"bnK" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/landmark/start/cook,/turf/open/floor/plasteel/cafeteria,/area/service/kitchen)
"bnL" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/obj/structure/disposalpipe/segment{dir = 5},/obj/machinery/light,/obj/machinery/light_switch{pixel_y = -25},/turf/open/floor/plasteel/cafeteria,/area/service/kitchen)
"bnM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/quantumpad{map_pad_id = "station"; map_pad_link_id = "xenoarch"; mapped_quantum_pads = list("station","xenoarch"); pixel_y = 7},/obj/effect/turf_decal/stripes/box,/obj/structure/sign/warning/xeno_mining{pixel_y = 32},/turf/open/floor/plasteel,/area/hallway/primary/starboard)
"bnM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/quantumpad{map_pad_id = "station"; map_pad_link_id = "xenoarch"; mapped_quantum_pads = list("station","xenoarch"); pixel_y = 7; name = "TO XENOARCH"},/obj/effect/turf_decal/stripes/box,/obj/structure/sign/warning/xeno_mining{pixel_y = 32; name = "TO XENOARCH"},/turf/open/floor/plasteel,/area/hallway/primary/starboard)
"bnN" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/obj/machinery/airalarm{pixel_y = 25},/turf/open/floor/plasteel,/area/hallway/primary/starboard)
"bnO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/landmark/event_spawn,/turf/open/floor/plasteel,/area/hallway/secondary/exit)
"bnP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/hallway/secondary/exit)
_maps/map_files/Snaxi/Snaxi.dmm
+307 -154
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/generic/CentCom.dmm
+51 -13
View File
@@ -1748,6 +1748,14 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
"buG" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/item/book/manual/gato_spacelaw,
/turf/open/floor/plasteel,
/area/centcom/supply)
"buU" = (
/obj/structure/closet/secure_closet/freezer/kitchen,
/turf/open/floor/plasteel/cafeteria,
@@ -2609,6 +2617,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/book/manual/gato_spacelaw,
/turf/open/floor/plasteel/dark,
/area/centcom/control)
"ccO" = (
@@ -4194,6 +4203,10 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/book/manual/gato_spacelaw{
pixel_x = -15;
pixel_y = 0
},
/turf/open/floor/plasteel/dark,
/area/tdome/tdomeadmin)
"dnI" = (
@@ -4224,8 +4237,6 @@
/obj/item/clothing/head/HoS/beret/gato,
/obj/item/clothing/suit/armor/vest/capcarapace/gato,
/obj/item/clothing/suit/armor/vest/capcarapace/cc,
/obj/item/clothing/under/centcomdress,
/obj/item/clothing/under/centcomdressvk,
/turf/open/floor/plasteel/grimy,
/area/centcom/ferry)
"dog" = (
@@ -13857,6 +13868,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/book/manual/gato_spacelaw,
/turf/open/floor/plasteel/dark,
/area/centcom/control)
"kxp" = (
@@ -16540,11 +16552,14 @@
"myX" = (
/obj/structure/table/reinforced,
/obj/item/taperecorder,
/obj/item/book/manual/wiki/security_space_law,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/item/book/manual/gato_spacelaw{
pixel_x = -16;
pixel_y = 0
},
/turf/open/floor/plasteel/dark,
/area/centcom/evac)
"mzj" = (
@@ -21825,7 +21840,6 @@
"qlf" = (
/obj/structure/table/wood,
/obj/item/folder/red,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash/handheld,
/obj/machinery/airalarm{
@@ -21842,6 +21856,10 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/book/manual/gato_spacelaw{
pixel_x = 15;
pixel_y = 2
},
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
"qlM" = (
@@ -23126,6 +23144,21 @@
"rlj" = (
/turf/open/floor/plasteel/white,
/area/fatlab)
"rly" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/book/manual/gato_spacelaw,
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
"rmk" = (
/obj/machinery/vending/autodrobe,
/turf/open/indestructible/hotelwood,
@@ -24205,7 +24238,6 @@
/area/tdome/tdomeobserve)
"scm" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/taperecorder,
/obj/machinery/firealarm{
dir = 4;
@@ -24221,6 +24253,10 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/book/manual/gato_spacelaw{
pixel_x = 6;
pixel_y = -16
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
"sdx" = (
@@ -24617,8 +24653,6 @@
/obj/item/clothing/suit/armor/vest/capcarapace/gato,
/obj/item/clothing/suit/armor/vest/capcarapace/paradepurple,
/obj/item/clothing/suit/armor/vest/capcarapace/paradeblack,
/obj/item/clothing/under/centcomdress,
/obj/item/clothing/under/centcomdressvk,
/turf/open/floor/plasteel/dark/side{
dir = 9
},
@@ -25039,7 +25073,6 @@
/turf/open/floor/plasteel,
/area/centcom/supply)
"sHh" = (
/obj/item/book/manual/wiki/security_space_law,
/obj/item/taperecorder,
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/neutral{
@@ -25052,6 +25085,10 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/book/manual/gato_spacelaw{
pixel_x = 12;
pixel_y = 0
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
"sHj" = (
@@ -26776,7 +26813,6 @@
"tYz" = (
/obj/structure/table/wood,
/obj/item/folder/red,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/tile/neutral{
@@ -29330,6 +29366,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/book/manual/gato_spacelaw,
/turf/open/floor/plasteel/dark,
/area/centcom/control)
"vTe" = (
@@ -30626,6 +30663,7 @@
/area/centcom/control)
"wMd" = (
/obj/structure/table/wood,
/obj/item/book/manual/gato_spacelaw,
/turf/open/floor/plasteel/grimy,
/area/centcom/control)
"wMh" = (
@@ -30956,6 +30994,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/item/book/manual/gato_spacelaw,
/turf/open/floor/plasteel,
/area/centcom/control)
"xaH" = (
@@ -31448,7 +31487,6 @@
"xwF" = (
/obj/structure/table/wood,
/obj/item/folder/red,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/restraints/handcuffs,
/obj/item/assembly/flash/handheld,
/obj/effect/turf_decal/tile/neutral{
@@ -32364,7 +32402,6 @@
/turf/open/floor/plating/abductor,
/area/abductor_ship)
"yao" = (
/obj/item/book/manual/wiki/security_space_law,
/obj/structure/table/wood,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -32376,6 +32413,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/book/manual/gato_spacelaw,
/turf/open/floor/plasteel/dark,
/area/centcom/control)
"yaq" = (
@@ -76044,7 +76082,7 @@ hkT
xLN
lyK
aJd
jLL
rly
pVI
nWv
jAM
@@ -79628,7 +79666,7 @@ lfI
qDa
lUv
frb
sGK
buG
kwA
iyc
kwA
code/modules/jobs/job_types/head_of_security.dm
+1 -1
View File
@@ -41,7 +41,7 @@
threat = 3
family_heirlooms = list(
/obj/item/book/manual/wiki/security_space_law
/obj/item/book/manual/gato_spacelaw, //gs13 - gato law book
)
/datum/outfit/job/hos
code/modules/jobs/job_types/security_officer.dm
+1 -1
View File
@@ -31,7 +31,7 @@
threat = 2
family_heirlooms = list(
/obj/item/book/manual/gato_spacelaw,
/obj/item/book/manual/gato_spacelaw, //gs13 - gato law book
/obj/item/clothing/head/beret/sec
)
code/modules/jobs/job_types/warden.dm
+1 -1
View File
@@ -32,7 +32,7 @@
threat = 2
family_heirlooms = list(
/obj/item/book/manual/wiki/security_space_law
/obj/item/book/manual/gato_spacelaw //gs13 - gato law book
)
mail_goodies = list(