This commit is contained in:
Putnam
2021-01-19 17:52:40 -08:00
519 changed files with 7449 additions and 3295 deletions
+1 -1
View File
@@ -2372,7 +2372,7 @@
},
/area/awaymission/BMPship/Midship)
"hh" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/turf/open/floor/plating/airless,
/area/awaymission/BMPship/Midship)
"hi" = (
+2 -6
View File
@@ -2729,9 +2729,7 @@
/turf/open/floor/carpet,
/area/ruin/space/has_grav/skelter/admin)
"gx" = (
/obj/machinery/door/firedoor{
pixel_x = 0
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
@@ -2742,9 +2740,7 @@
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/shields)
"gy" = (
/obj/machinery/door/firedoor{
pixel_x = 0
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/engineering{
name = "Shields"
@@ -3170,7 +3170,9 @@
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"VY" = (
/obj/structure/closet/emcloset,
/obj/structure/closet/emcloset{
anchored = 1
},
/obj/effect/turf_decal/tile/purple{
dir = 1
},
+1 -1
View File
@@ -2710,7 +2710,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 4
@@ -312,7 +312,7 @@
/obj/structure/janitorialcart,
/obj/item/mop,
/obj/item/reagent_containers/glass/bucket,
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/awaymission/cabin)
+1 -1
View File
@@ -13,7 +13,7 @@
#include "map_files\BoxStation\BoxStation.dmm"
#include "map_files\LambdaStation\lambda.dmm"
#ifdef TRAVISBUILDING
#ifdef CIBUILDING
#include "templates.dm"
#endif
#endif
+13 -4
View File
@@ -29620,10 +29620,10 @@
/turf/open/floor/plasteel/white,
/area/science/robotics/lab)
"bsU" = (
/mob/living/simple_animal/hostile/retaliate/ghost,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/mob/living/simple_animal/hostile/retaliate/ghost,
/turf/open/floor/wood,
/area/maintenance/port/fore)
"bsV" = (
@@ -45265,7 +45265,7 @@
/area/maintenance/aft)
"cfq" = (
/obj/structure/mopbucket,
/obj/item/caution,
/obj/item/clothing/suit/caution,
/turf/open/floor/plating,
/area/maintenance/aft)
"cfr" = (
@@ -53488,6 +53488,10 @@
},
/turf/closed/wall,
/area/science/circuit)
"dxF" = (
/obj/machinery/gear_painter,
/turf/open/floor/wood,
/area/maintenance/bar)
"dyE" = (
/obj/structure/cable{
icon_state = "0-4"
@@ -56505,6 +56509,10 @@
},
/turf/open/floor/wood/wood_diagonal,
/area/maintenance/port/fore)
"kqy" = (
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"kqI" = (
/obj/structure/window,
/turf/open/floor/wood,
@@ -58551,6 +58559,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"pqR" = (
@@ -86334,7 +86343,7 @@ oKh
oKh
iiW
iiW
iiW
dxF
izv
nfm
bCq
@@ -98349,7 +98358,7 @@ awB
att
azh
fHG
fHG
kqy
kxf
ufD
alP
+28 -20
View File
@@ -3643,7 +3643,7 @@
lootcount = 2;
name = "2maintenance loot spawner"
},
/obj/item/caution,
/obj/item/clothing/suit/caution,
/turf/open/floor/plating,
/area/construction)
"ajb" = (
@@ -4579,7 +4579,7 @@
/turf/open/floor/plasteel,
/area/security/processing)
"alk" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/turf/open/floor/plating,
/area/construction/secondary)
"all" = (
@@ -23340,19 +23340,19 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/item/caution{
/obj/item/clothing/suit/caution{
pixel_x = 6;
pixel_y = 3
},
/obj/item/caution{
/obj/item/clothing/suit/caution{
pixel_x = 6;
pixel_y = 3
},
/obj/item/caution{
/obj/item/clothing/suit/caution{
pixel_x = 6;
pixel_y = 3
},
/obj/item/caution{
/obj/item/clothing/suit/caution{
pixel_x = 6;
pixel_y = 3
},
@@ -26810,7 +26810,7 @@
/area/quartermaster/sorting)
"bgP" = (
/obj/item/analyzer,
/obj/item/caution,
/obj/item/clothing/suit/caution,
/turf/open/floor/plating,
/area/maintenance/disposal)
"bgQ" = (
@@ -33604,6 +33604,10 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
/obj/item/kirbyplants{
icon_state = "plant-20";
pixel_y = 3
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bvu" = (
@@ -33797,7 +33801,7 @@
/turf/open/floor/plasteel/dark,
/area/chapel/office)
"bvU" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/warning/biohazard{
pixel_x = -32
@@ -38795,7 +38799,7 @@
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"bGv" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/turf/open/floor/plasteel,
/area/science/server/compcore)
"bGw" = (
@@ -38936,10 +38940,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/item/kirbyplants{
icon_state = "plant-20";
pixel_y = 3
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"bGN" = (
@@ -40999,7 +41000,7 @@
dir = 1;
pixel_y = -26
},
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/item/shovel,
/obj/item/stack/tile/plasteel{
pixel_x = 10;
@@ -51446,8 +51447,8 @@
/area/quartermaster/warehouse)
"cgt" = (
/obj/structure/rack,
/obj/item/caution,
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/item/clothing/suit/caution,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/quartermaster/warehouse)
@@ -52867,7 +52868,7 @@
dir = 4;
pixel_x = -28
},
/obj/item/kirbyplants/random,
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"cjB" = (
@@ -61826,7 +61827,7 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4
},
@@ -62925,7 +62926,7 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/machinery/atmospherics/pipe/manifold4w/orange/hidden,
/obj/structure/cable{
icon_state = "4-8"
@@ -71256,6 +71257,13 @@
},
/turf/open/floor/plating/airless,
/area/router/aux)
"stP" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/item/kirbyplants/random,
/turf/open/floor/plasteel,
/area/quartermaster/office)
"sAm" = (
/obj/structure/plasticflaps,
/obj/machinery/door/poddoor{
@@ -114255,7 +114263,7 @@ ckq
bgf
beB
cxC
bgq
stP
cjA
biy
bjN
@@ -3535,9 +3535,7 @@
dir = 4
},
/obj/effect/turf_decal/delivery,
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"ajL" = (
@@ -3823,6 +3821,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/entry)
"akn" = (
@@ -79384,6 +79385,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
+30 -27
View File
@@ -48007,8 +48007,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/structure/closet/wardrobe/mixed,
/obj/machinery/light/small,
/obj/effect/turf_decal/delivery,
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/locker)
"bzo" = (
@@ -48767,7 +48768,6 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"bAA" = (
/obj/structure/table,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -48777,11 +48777,6 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/storage/backpack{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/backpack,
/obj/machinery/firealarm{
dir = 8;
pixel_x = 26
@@ -49398,6 +49393,7 @@
dir = 1;
name = "recreation camera"
},
/obj/structure/closet/wardrobe/mixed,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"bBy" = (
@@ -54797,11 +54793,6 @@
/area/hallway/secondary/exit/departure_lounge)
"bKn" = (
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/effect/turf_decal/tile/neutral{
dir = 8
@@ -54810,6 +54801,11 @@
/obj/machinery/airalarm{
pixel_y = 22
},
/obj/item/storage/backpack{
pixel_x = 4;
pixel_y = 4
},
/obj/item/storage/backpack,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
"bKo" = (
@@ -55425,6 +55421,12 @@
pixel_x = 28;
pixel_y = 22
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"bLd" = (
@@ -60844,6 +60846,11 @@
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/structure/table,
/obj/item/toy/figure/assistant{
pixel_x = 8;
pixel_y = 6
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bTD" = (
@@ -61021,6 +61028,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 10
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"bTO" = (
@@ -61259,19 +61272,8 @@
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -4;
pixel_y = 4
},
/obj/item/pen,
/obj/item/toy/figure/assistant{
pixel_x = 8;
pixel_y = 6
},
/obj/effect/turf_decal/loading_area{
dir = 1
},
/obj/effect/turf_decal/delivery,
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/entry)
"bUi" = (
@@ -71325,15 +71327,16 @@
icon_gib = "magicarp_gib";
icon_living = "magicarp";
icon_state = "magicarp";
maxHealth = 200;
max_co2 = 5;
max_tox = 2;
maxHealth = 200;
melee_damage_lower = 15;
melee_damage_upper = 20;
min_oxy = 5;
name = "Lia";
real_name = "Lia";
response_help = "pets";
response_help_continuous = "pets";
response_help_simple = "pet";
turns_per_move = 10
},
/turf/open/floor/plasteel/dark,
+3 -2
View File
@@ -10679,7 +10679,7 @@
light_color = "#e8eaff"
},
/obj/machinery/vending/wardrobe/jani_wardrobe{
products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
products = list(/obj/item/clothing/under/rank/civilian/janitor = 2, /obj/item/cartridge/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, /obj/item/flashlight = 2, /obj/item/clothing/suit/caution = 10, /obj/item/holosign_creator = 2, /obj/item/lightreplacer = 2, /obj/item/soap/nanotrasen = 2, /obj/item/storage/bag/trash = 2, /obj/item/clothing/shoes/galoshes = 2, /obj/item/watertank/janitor = 2, /obj/item/storage/belt/janitor = 2)
},
/turf/open/floor/plating,
/area/janitor)
@@ -13637,7 +13637,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"IX" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
@@ -13764,6 +13764,7 @@
/obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"Jp" = (
+33 -21
View File
@@ -4826,6 +4826,7 @@
/obj/machinery/light{
dir = 4
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/entry)
"aiU" = (
@@ -12681,7 +12682,7 @@
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"axL" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -23177,6 +23178,9 @@
},
/obj/machinery/light,
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/newscaster{
pixel_y = -32
},
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTy" = (
@@ -23190,17 +23194,6 @@
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTz" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/light,
/obj/machinery/newscaster{
pixel_y = -32
},
/obj/effect/turf_decal/tile/neutral,
/turf/open/floor/plasteel,
/area/crew_quarters/locker)
"aTA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
@@ -39921,9 +39914,6 @@
/turf/open/floor/plasteel/dark,
/area/bridge)
"bzU" = (
/obj/structure/chair/comfy/teal{
dir = 4
},
/obj/structure/chair/comfy/black{
dir = 4
},
@@ -65296,9 +65286,6 @@
/turf/open/floor/plasteel,
/area/medical/genetics)
"czd" = (
/obj/machinery/light_switch{
pixel_x = 23
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
@@ -81354,6 +81341,21 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
/area/engine/engineering)
"foN" = (
/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/machinery/light,
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/locker)
"fpa" = (
/obj/structure/extinguisher_cabinet{
pixel_y = -30
@@ -81980,6 +81982,16 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/cryopod)
"lFR" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/machinery/light{
dir = 4
},
/obj/machinery/vending/clothing,
/turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/entry)
"lGS" = (
/obj/docking_port/stationary/public_mining_dock,
/turf/open/floor/plating,
@@ -97549,7 +97561,7 @@ blU
aiT
bEs
bHJ
aiT
lFR
iSt
mcS
alK
@@ -118607,8 +118619,8 @@ aOD
aPK
aQV
aOu
aTz
aUM
aTt
foN
aUM
aYe
dnh
@@ -15268,6 +15268,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms)
"axG" = (
@@ -19618,9 +19621,6 @@
/turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms)
"aEL" = (
/obj/item/kirbyplants{
icon_state = "plant-21"
},
/obj/machinery/status_display{
pixel_y = -32
},
@@ -19635,6 +19635,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms)
"aEM" = (
+148 -89
View File
@@ -511,10 +511,10 @@
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"abi" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 8
/obj/structure/disposalpipe/segment{
dir = 10
},
/obj/machinery/gear_painter,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"abj" = (
@@ -2337,9 +2337,12 @@
/turf/open/floor/plasteel/dark,
/area/security/prison)
"afJ" = (
/obj/effect/landmark/carpspawn,
/turf/open/space/basic,
/area/space/nearstation)
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"afK" = (
/obj/machinery/atmospherics/components/unary/tank/air{
dir = 1
@@ -20027,9 +20030,7 @@
/obj/structure/cable{
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/bar)
"aUQ" = (
@@ -20044,6 +20045,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
/turf/open/floor/plasteel/dark,
/area/hydroponics)
"aUR" = (
@@ -20485,8 +20489,16 @@
/turf/closed/wall,
/area/janitor)
"aVT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/obj/machinery/door/firedoor,
/obj/machinery/door/poddoor/shutters{
id = "jangarage";
name = "Custodial Closet Shutters"
},
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/janitor)
"aVU" = (
/obj/machinery/door/window/eastright{
@@ -20510,6 +20522,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/janitor)
"aVV" = (
@@ -20892,9 +20905,6 @@
/obj/machinery/camera{
c_tag = "Custodial Quarters"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
/obj/machinery/light/small{
dir = 1
},
@@ -20915,6 +20925,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/janitor)
"aWO" = (
@@ -20934,6 +20947,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/turf/open/floor/plasteel/dark,
/area/janitor)
"aWP" = (
@@ -23004,9 +23020,6 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baW" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/obj/machinery/button/door{
id = "jangarage";
name = "Custodial Closet Shutters Control";
@@ -23014,14 +23027,12 @@
req_access_txt = "26"
},
/obj/effect/turf_decal/tile/neutral,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"baX" = (
/obj/vehicle/ridden/janicart,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/light{
dir = 8
},
@@ -23034,6 +23045,9 @@
/obj/structure/cable{
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/turf/open/floor/plasteel,
/area/janitor)
"baY" = (
@@ -23398,6 +23412,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/turf/open/floor/plasteel,
/area/janitor)
"bbY" = (
@@ -24603,7 +24620,7 @@
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"beS" = (
/obj/item/caution,
/obj/item/clothing/suit/caution,
/turf/open/floor/plating,
/area/maintenance/department/cargo)
"beU" = (
@@ -31173,17 +31190,26 @@
"bup" = (
/obj/machinery/rnd/destructive_analyzer,
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/lab)
"buq" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/lab)
"bur" = (
/obj/effect/turf_decal/delivery,
/obj/machinery/rnd/production/protolathe/department/science,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/lab)
"bus" = (
@@ -31202,6 +31228,9 @@
/obj/machinery/light{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/turf/open/floor/plasteel/white,
/area/science/lab)
"but" = (
@@ -31664,6 +31693,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/science/lab)
"bvA" = (
@@ -32372,6 +32402,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/science/lab)
"bxh" = (
@@ -33056,12 +33087,6 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"byD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/obj/structure/cable{
icon_state = "2-4"
},
/obj/machinery/door/airlock/research{
name = "R&D Lab";
req_one_access_txt = "7;29;30"
@@ -33070,6 +33095,12 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/lab)
"byE" = (
@@ -33091,7 +33122,6 @@
/turf/open/floor/plasteel/white,
/area/science/lab)
"byG" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -33919,10 +33949,6 @@
/area/hallway/primary/aft)
"bAm" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/hallway/primary/aft)
"bAo" = (
@@ -33952,7 +33978,6 @@
/obj/structure/cable{
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/purple{
dir = 1
},
@@ -34404,17 +34429,14 @@
name = "RD Office APC";
pixel_x = -25
},
/obj/structure/cable{
icon_state = "0-4"
},
/obj/effect/turf_decal/tile/purple{
dir = 1
},
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hor)
@@ -34425,8 +34447,8 @@
/obj/structure/disposalpipe/segment{
dir = 5
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hor)
@@ -34434,6 +34456,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hor)
"bBt" = (
@@ -34441,6 +34466,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hor)
"bBu" = (
@@ -34478,6 +34506,9 @@
/obj/effect/turf_decal/tile/purple{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hor)
"bBw" = (
@@ -35240,6 +35271,7 @@
/obj/structure/cable{
icon_state = "0-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/crew_quarters/heads/hor)
"bCK" = (
@@ -44248,9 +44280,11 @@
/turf/open/floor/engine/co2,
/area/engine/atmos)
"bWh" = (
/obj/effect/turf_decal/sand,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/turf/open/floor/plasteel,
/area/chapel/office)
/area/hallway/primary/aft)
"bWi" = (
/obj/structure/flora/ausbushes/leafybush,
/obj/structure/flora/ausbushes/reedbush,
@@ -52824,6 +52858,9 @@
/turf/closed/wall/r_wall,
/area/science/lab)
"cCt" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
/turf/open/floor/plasteel/white,
/area/science/lab)
"cCB" = (
@@ -53058,6 +53095,9 @@
freq = 1400;
location = "Research Division"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/science/lab)
"cXW" = (
@@ -53151,10 +53191,6 @@
/area/maintenance/department/security/brig)
"dhz" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/chair{
dir = 8;
name = "Defense"
@@ -53163,9 +53199,6 @@
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"dir" = (
@@ -53960,11 +53993,11 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
dir = 4
},
/obj/structure/cable{
icon_state = "1-8"
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
@@ -55488,6 +55521,12 @@
/obj/effect/turf_decal/tile/purple{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/obj/structure/cable{
icon_state = "2-4"
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"ioj" = (
@@ -55591,6 +55630,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"iyg" = (
@@ -56345,9 +56387,13 @@
/turf/open/floor/plasteel/white,
/area/science/mixing)
"koz" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"kpK" = (
@@ -56634,10 +56680,14 @@
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"kSb" = (
/obj/structure/lattice,
/obj/structure/grille,
/turf/open/space/basic,
/area/space)
/obj/structure/chair/office/light{
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/turf/open/floor/plasteel/white,
/area/science/lab)
"kSF" = (
/obj/structure/cable{
icon_state = "1-4"
@@ -56711,6 +56761,10 @@
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"lcU" = (
@@ -57121,6 +57175,7 @@
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/science/lab)
"meF" = (
@@ -57128,8 +57183,9 @@
/turf/closed/wall/r_wall,
/area/engine/supermatter)
"mfC" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
@@ -59138,6 +59194,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"qAx" = (
/obj/structure/disposalpipe/trunk{
dir = 1
},
/obj/machinery/disposal/bin,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"qAM" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/item/cigbutt,
@@ -59336,6 +59399,7 @@
/area/hallway/secondary/exit/departure_lounge)
"qVk" = (
/obj/machinery/door/poddoor/incinerator_atmos_aux,
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/maintenance/disposal/incinerator)
"qVP" = (
@@ -60486,6 +60550,9 @@
id = "research_shutters_2";
name = "research shutters"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/science/lab)
"tLP" = (
@@ -60808,12 +60875,6 @@
/obj/structure/disposalpipe/segment{
dir = 9
},
/obj/structure/cable{
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/obj/structure/chair{
dir = 8;
name = "Defense"
@@ -60933,6 +60994,10 @@
/obj/effect/turf_decal/plaque,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"uNA" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
"uQR" = (
/obj/item/ammo_casing/shotgun/beanbag,
/turf/open/floor/plating,
@@ -61489,12 +61554,6 @@
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
"wfG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/closed/wall/r_wall,
/area/crew_quarters/heads/hor)
"wfO" = (
/mob/living/simple_animal/hostile/retaliate/poison/snake,
/turf/open/floor/plating,
@@ -76958,7 +77017,7 @@ aaa
bOv
bNs
bNs
bWh
bQg
bQg
bQg
bQg
@@ -84165,7 +84224,7 @@ bIZ
cbb
bDi
ccO
bIZ
bva
cjm
cjm
xgh
@@ -84425,8 +84484,8 @@ bva
bva
aht
aht
kSb
kSb
fon
fon
aht
aht
mau
@@ -86680,7 +86739,7 @@ aXL
aYL
aZN
baW
aKI
afJ
aKI
beb
aKI
@@ -86936,8 +86995,8 @@ aVS
aXM
aVS
aVS
aXM
bbW
aVS
aVT
bbW
aVS
aVS
@@ -87138,7 +87197,7 @@ aaa
aaa
aaa
aaa
afJ
cFB
aby
aaa
agQ
@@ -87445,7 +87504,7 @@ aRJ
aSz
aSz
aUP
aVT
aVS
aWN
aXO
aYM
@@ -89457,7 +89516,7 @@ aaa
aaa
aaa
aaa
afJ
cFB
aaa
aaa
abI
@@ -94921,12 +94980,12 @@ jcT
xje
tTl
tTl
tTl
bWh
gkS
tTl
tTl
tTl
koz
tTl
dgg
phJ
phJ
@@ -95178,7 +95237,7 @@ bjm
mhn
cqi
cqi
cqi
koz
cqi
cqi
imE
@@ -95697,7 +95756,7 @@ duF
bxa
byE
bBp
wfG
bBp
bBp
bBp
bBp
@@ -95950,7 +96009,7 @@ cCl
brq
byF
cCt
byF
kSb
bxc
nIU
bAo
@@ -104126,8 +104185,8 @@ aaY
awB
abe
abi
axw
axw
uNA
qAx
axw
axw
aBX
+5 -1
View File
@@ -10524,6 +10524,10 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
"yl" = (
/obj/machinery/gear_painter,
/turf/open/indestructible/hotelwood,
/area/centcom/holding)
"yn" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/sign/warning/vacuum,
@@ -43992,7 +43996,7 @@ NS
Nd
ZL
NS
NS
yl
Nd
CU
NS
+14 -12
View File
@@ -33,8 +33,8 @@
"bg" = (
/obj/structure/table/reinforced,
/obj/item/storage/toolbox/mechanical{
pixel_y = 8;
pixel_x = -2
pixel_x = -2;
pixel_y = 8
},
/obj/item/storage/toolbox/electrical,
/obj/effect/turf_decal/stripes/line,
@@ -43,8 +43,8 @@
"bS" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/lights/mixed{
pixel_y = 9;
pixel_x = -5
pixel_x = -5;
pixel_y = 9
},
/obj/item/storage/box/matches{
pixel_y = 5
@@ -413,8 +413,8 @@
pixel_y = 4
},
/obj/item/reagent_containers/food/drinks/soda_cans/monkey_energy{
pixel_y = 5;
pixel_x = 6
pixel_x = 6;
pixel_y = 5
},
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
@@ -494,8 +494,8 @@
/area/shuttle/escape)
"rg" = (
/obj/item/clothing/glasses/welding{
pixel_y = 8;
pixel_x = 3
pixel_x = 3;
pixel_y = 8
},
/obj/item/weldingtool/largetank{
pixel_x = -3
@@ -882,8 +882,8 @@
},
/obj/structure/table/glass,
/obj/item/storage/box/monkeycubes{
pixel_y = 10;
pixel_x = 5
pixel_x = 5;
pixel_y = 10
},
/obj/item/reagent_containers/food/snacks/cube/monkey{
pixel_x = 5
@@ -1156,8 +1156,8 @@
},
/obj/structure/table/glass,
/obj/item/clothing/suit/monkeysuit{
pixel_y = 4;
pixel_x = -2
pixel_x = -2;
pixel_y = 4
},
/obj/item/clothing/mask/gas/monkeymask{
pixel_x = 5;
@@ -1169,6 +1169,7 @@
/obj/machinery/door/airlock/titanium{
name = "Emergency Shuttle Airlock"
},
/obj/structure/fans/tiny,
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"ST" = (
@@ -1319,6 +1320,7 @@
name = "Emergency Shuttle Airlock"
},
/obj/docking_port/mobile/emergency,
/obj/structure/fans/tiny,
/turf/open/floor/plasteel/white,
/area/shuttle/escape)
"Yu" = (