Merge remote-tracking branch 'upstream/master' into Dispencer-UI-change
This commit is contained in:
Fermi
@@ -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" = (
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -11030,18 +11030,12 @@
|
||||
/obj/structure/closet/crate/coffin,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port/fore)
|
||||
"axo" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore)
|
||||
"axp" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore)
|
||||
/area/maintenance/port/fore)
|
||||
"axq" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
@@ -11440,10 +11434,6 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore)
|
||||
"ayC" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/closed/wall,
|
||||
/area/maintenance/fore)
|
||||
"ayD" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
@@ -14255,10 +14245,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore)
|
||||
"aGh" = (
|
||||
/obj/effect/landmark/event_spawn,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore)
|
||||
"aGi" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
|
||||
/turf/open/floor/plasteel/dark,
|
||||
@@ -45279,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" = (
|
||||
@@ -53350,7 +53336,7 @@
|
||||
},
|
||||
/obj/structure/reagent_dispensers/fueltank,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore)
|
||||
/area/maintenance/port/fore)
|
||||
"ddM" = (
|
||||
/obj/structure/sign/poster/official/the_owl{
|
||||
pixel_x = 32
|
||||
@@ -53734,7 +53720,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/turf/open/floor/wood/wood_diagonal,
|
||||
/area/maintenance/fore)
|
||||
/area/maintenance/port/fore)
|
||||
"edA" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
@@ -54930,7 +54916,7 @@
|
||||
"gKG" = (
|
||||
/obj/structure/bedsheetbin/towel,
|
||||
/turf/open/floor/wood/wood_diagonal,
|
||||
/area/maintenance/fore)
|
||||
/area/maintenance/port/fore)
|
||||
"gLz" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
@@ -56208,7 +56194,7 @@
|
||||
},
|
||||
/obj/effect/decal/cleanable/dirt/dust,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore)
|
||||
/area/maintenance/port/fore)
|
||||
"jJF" = (
|
||||
/obj/machinery/door/airlock/maintenance,
|
||||
/obj/structure/cable{
|
||||
@@ -56998,7 +56984,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/closed/wall,
|
||||
/area/maintenance/fore)
|
||||
/area/maintenance/port/fore)
|
||||
"lzt" = (
|
||||
/obj/machinery/portable_atmospherics/pump,
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
@@ -57590,7 +57576,7 @@
|
||||
},
|
||||
/obj/structure/reagent_dispensers/watertank,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore)
|
||||
/area/maintenance/port/fore)
|
||||
"nbT" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-8"
|
||||
@@ -59057,7 +59043,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/wood/wood_diagonal,
|
||||
/area/maintenance/fore)
|
||||
/area/maintenance/port/fore)
|
||||
"qIw" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
@@ -59648,12 +59634,6 @@
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/medical/paramedic)
|
||||
"rWw" = (
|
||||
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/wood/wood_diagonal,
|
||||
/area/maintenance/fore)
|
||||
"rXl" = (
|
||||
/obj/structure/chair/office/light,
|
||||
/obj/machinery/firealarm{
|
||||
@@ -59773,7 +59753,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/wood/wood_diagonal,
|
||||
/area/maintenance/fore)
|
||||
/area/maintenance/port/fore)
|
||||
"sqg" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/clothing/under/misc/pj/red,
|
||||
@@ -60210,7 +60190,7 @@
|
||||
dir = 8
|
||||
},
|
||||
/turf/open/floor/wood/wood_diagonal,
|
||||
/area/maintenance/fore)
|
||||
/area/maintenance/port/fore)
|
||||
"trb" = (
|
||||
/obj/machinery/light{
|
||||
dir = 4
|
||||
@@ -60628,7 +60608,7 @@
|
||||
/obj/structure/girder,
|
||||
/obj/structure/grille,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/fore)
|
||||
/area/maintenance/port/fore)
|
||||
"ugu" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-4"
|
||||
@@ -82433,7 +82413,7 @@ lZN
|
||||
amC
|
||||
jIW
|
||||
ddI
|
||||
arP
|
||||
alU
|
||||
fgG
|
||||
rqW
|
||||
aGD
|
||||
@@ -82684,13 +82664,13 @@ amC
|
||||
htu
|
||||
alU
|
||||
edj
|
||||
rWw
|
||||
ygb
|
||||
gKG
|
||||
arP
|
||||
aqR
|
||||
awb
|
||||
alU
|
||||
amC
|
||||
ntt
|
||||
ugq
|
||||
arP
|
||||
alU
|
||||
rPU
|
||||
fne
|
||||
aGr
|
||||
@@ -82943,11 +82923,11 @@ alU
|
||||
tqG
|
||||
spR
|
||||
qGw
|
||||
arP
|
||||
aGh
|
||||
awb
|
||||
axo
|
||||
arP
|
||||
alU
|
||||
aFJ
|
||||
ntt
|
||||
aAY
|
||||
alU
|
||||
aCh
|
||||
pIf
|
||||
kCo
|
||||
@@ -83197,14 +83177,14 @@ ali
|
||||
ali
|
||||
ali
|
||||
alU
|
||||
arP
|
||||
alU
|
||||
lzk
|
||||
arP
|
||||
arP
|
||||
arP
|
||||
avZ
|
||||
alU
|
||||
alU
|
||||
alU
|
||||
atO
|
||||
axp
|
||||
ayC
|
||||
aue
|
||||
azH
|
||||
eEe
|
||||
aGv
|
||||
|
||||
@@ -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
|
||||
},
|
||||
@@ -25068,15 +25068,15 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/ai_monitored/turret_protected/ai_upload_foyer)
|
||||
"bcZ" = (
|
||||
/obj/machinery/power/terminal{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/machinery/power/smes{
|
||||
charge = 5e+006
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/ai_monitored/turret_protected/ai_upload_foyer)
|
||||
"bda" = (
|
||||
@@ -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" = (
|
||||
@@ -26858,9 +26858,6 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/crew_quarters/heads/hor)
|
||||
"bgY" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/status_display,
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/hallway/primary/central)
|
||||
@@ -27034,11 +27031,12 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/secure_construction)
|
||||
"bht" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/cable,
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-4"
|
||||
},
|
||||
/obj/machinery/power/terminal,
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/spawner,
|
||||
/turf/open/floor/plating,
|
||||
/area/ai_monitored/turret_protected/ai)
|
||||
@@ -27655,6 +27653,9 @@
|
||||
/area/quartermaster/office)
|
||||
"biK" = (
|
||||
/obj/structure/closet/firecloset,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/mixing)
|
||||
"biL" = (
|
||||
@@ -29611,13 +29612,14 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hallway/primary/central)
|
||||
"bmM" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-8"
|
||||
},
|
||||
/obj/machinery/power/terminal,
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/spawner,
|
||||
/turf/open/floor/plating,
|
||||
/area/ai_monitored/turret_protected/ai)
|
||||
@@ -30651,8 +30653,11 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/quartermaster/miningoffice)
|
||||
"boL" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
|
||||
/turf/open/floor/plasteel,
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/science/mixing)
|
||||
"boM" = (
|
||||
/obj/machinery/mineral/ore_redemption{
|
||||
@@ -33792,7 +33797,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
|
||||
@@ -35665,7 +35670,9 @@
|
||||
name = "Toxins Launch Room";
|
||||
req_access_txt = "7;8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/mixing)
|
||||
"bzY" = (
|
||||
@@ -35799,7 +35806,6 @@
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/mixing)
|
||||
"bAm" = (
|
||||
@@ -36040,7 +36046,6 @@
|
||||
/obj/effect/turf_decal/tile/red{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/mixing)
|
||||
"bAH" = (
|
||||
@@ -36130,6 +36135,9 @@
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/mixing)
|
||||
"bAQ" = (
|
||||
@@ -36157,10 +36165,16 @@
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 6
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/mixing)
|
||||
"bAV" = (
|
||||
/obj/machinery/atmospherics/components/unary/portables_connector/visible,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/mixing)
|
||||
"bAW" = (
|
||||
@@ -37369,10 +37383,11 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/hallway/secondary/service)
|
||||
"bDL" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 4
|
||||
dir = 10
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/mixing)
|
||||
"bDM" = (
|
||||
/obj/structure/table/reinforced,
|
||||
@@ -38184,12 +38199,7 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/xenobiology)
|
||||
"bFp" = (
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/mixing)
|
||||
"bFq" = (
|
||||
@@ -38785,7 +38795,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" = (
|
||||
@@ -40138,9 +40148,6 @@
|
||||
/area/space/nearstation)
|
||||
"bJw" = (
|
||||
/obj/machinery/holopad,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/mixing)
|
||||
"bJx" = (
|
||||
@@ -40342,9 +40349,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/disposal)
|
||||
"bJT" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 10
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/mixing)
|
||||
"bJU" = (
|
||||
@@ -40994,7 +40999,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;
|
||||
@@ -42660,9 +42665,6 @@
|
||||
light_color = "#e8eaff"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/mixing)
|
||||
"bOF" = (
|
||||
@@ -43319,9 +43321,6 @@
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 1
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/machinery/camera/motion{
|
||||
c_tag = "AI Foyer";
|
||||
network = list("minisat");
|
||||
@@ -43339,7 +43338,7 @@
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/ai_monitored/turret_protected/ai)
|
||||
/area/ai_monitored/turret_protected/ai_upload_foyer)
|
||||
"bQc" = (
|
||||
/obj/structure/bodycontainer/morgue{
|
||||
dir = 8
|
||||
@@ -43402,9 +43401,6 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/supplymain/hidden,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/ai_monitored/turret_protected/ai_upload_foyer)
|
||||
@@ -43775,9 +43771,7 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/router)
|
||||
"bQX" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/mixing)
|
||||
"bQY" = (
|
||||
@@ -44273,9 +44267,6 @@
|
||||
/area/science/robotics/lab)
|
||||
"bRW" = (
|
||||
/obj/effect/turf_decal/bot,
|
||||
/obj/structure/cable{
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/obj/machinery/status_display/ai{
|
||||
pixel_y = 32
|
||||
},
|
||||
@@ -44403,9 +44394,6 @@
|
||||
/area/science/xenobiology)
|
||||
"bSk" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
|
||||
dir = 4
|
||||
},
|
||||
@@ -44492,9 +44480,6 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/quartermaster/storage)
|
||||
"bSr" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/light,
|
||||
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
|
||||
dir = 4
|
||||
@@ -44502,18 +44487,12 @@
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/ai_monitored/turret_protected/ai_upload_foyer)
|
||||
"bSs" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/mineral/titanium/blue,
|
||||
/area/ai_monitored/turret_protected/ai_upload_foyer)
|
||||
"bSt" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
@@ -44715,9 +44694,6 @@
|
||||
/area/science/lab)
|
||||
"bSO" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
|
||||
dir = 8
|
||||
},
|
||||
@@ -45238,9 +45214,6 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/status_display/ai{
|
||||
pixel_y = 32
|
||||
},
|
||||
@@ -45338,9 +45311,6 @@
|
||||
/obj/machinery/light_switch{
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
|
||||
dir = 4
|
||||
},
|
||||
@@ -46113,9 +46083,6 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"bVF" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-4"
|
||||
},
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
@@ -46465,9 +46432,6 @@
|
||||
/area/science/mixing)
|
||||
"bWm" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/door/airlock/engineering{
|
||||
name = "AI SMES Access";
|
||||
req_one_access_txt = "10;24"
|
||||
@@ -46569,9 +46533,6 @@
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/mixing)
|
||||
"bWv" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
|
||||
dir = 8
|
||||
},
|
||||
@@ -48803,7 +48764,7 @@
|
||||
/turf/open/floor/engine,
|
||||
/area/science/storage)
|
||||
"cbh" = (
|
||||
/obj/machinery/rnd/experimentor,
|
||||
/obj/effect/landmark/event_spawn,
|
||||
/turf/open/floor/engine,
|
||||
/area/science/explab)
|
||||
"cbi" = (
|
||||
@@ -49156,6 +49117,9 @@
|
||||
/obj/effect/turf_decal/stripes/line{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/mixing)
|
||||
"cbQ" = (
|
||||
@@ -49647,13 +49611,11 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hallway/secondary/exit/departure_lounge)
|
||||
"ccL" = (
|
||||
/obj/effect/landmark/event_spawn,
|
||||
/obj/machinery/light{
|
||||
dir = 8;
|
||||
light_color = "#e8eaff"
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/machinery/computer/rdconsole/experiment{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/rnd/bepis,
|
||||
/turf/open/floor/engine,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/explab)
|
||||
"ccM" = (
|
||||
/obj/structure/disposalpipe/segment{
|
||||
@@ -51484,8 +51446,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)
|
||||
@@ -51567,7 +51529,6 @@
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 10
|
||||
},
|
||||
/obj/structure/cable,
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
@@ -51960,9 +51921,6 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"chy" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "2-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
|
||||
dir = 10
|
||||
},
|
||||
@@ -52070,24 +52028,16 @@
|
||||
/obj/structure/cable{
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"chM" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"chN" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/teg/hotloop)
|
||||
@@ -55052,6 +55002,9 @@
|
||||
/obj/item/target/alien,
|
||||
/obj/item/target,
|
||||
/obj/item/target/clown,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/mixing)
|
||||
"cnM" = (
|
||||
@@ -55095,9 +55048,6 @@
|
||||
/turf/open/space/basic,
|
||||
/area/quartermaster/warehouse)
|
||||
"cnR" = (
|
||||
/obj/structure/cable{
|
||||
icon_state = "1-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
|
||||
dir = 4
|
||||
},
|
||||
@@ -55122,7 +55072,8 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/solars/starboard/aft)
|
||||
"cnT" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden,
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/mixing)
|
||||
"cnU" = (
|
||||
@@ -56737,9 +56688,6 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hallway/primary/aft)
|
||||
"cqS" = (
|
||||
/obj/machinery/computer/rdconsole/experiment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/obj/machinery/requests_console{
|
||||
department = "Science";
|
||||
@@ -56748,6 +56696,8 @@
|
||||
pixel_x = -30;
|
||||
receive_ore_updates = 1
|
||||
},
|
||||
/obj/structure/table,
|
||||
/obj/item/book/manual/wiki/experimentor,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/science/explab)
|
||||
"cqT" = (
|
||||
@@ -61876,7 +61826,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
|
||||
},
|
||||
@@ -62975,7 +62925,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"
|
||||
@@ -67118,8 +67068,8 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/gravity_generator)
|
||||
"cJH" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/orange/visible{
|
||||
dir = 9
|
||||
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
@@ -67724,11 +67674,6 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/green/visible,
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/atmos)
|
||||
"cLc" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/atmos)
|
||||
"cLd" = (
|
||||
/obj/effect/turf_decal/tile/green{
|
||||
dir = 4
|
||||
@@ -68149,14 +68094,14 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/storage)
|
||||
"cMa" = (
|
||||
/obj/machinery/light/small{
|
||||
dir = 1;
|
||||
light_color = "#ffc1c1"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/orange/visible,
|
||||
/obj/machinery/atmospherics/components/binary/pump/on{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/airlock_sensor/incinerator_atmos{
|
||||
pixel_x = -8;
|
||||
pixel_y = 24
|
||||
},
|
||||
/turf/open/floor/engine/vacuum,
|
||||
/area/engine/atmos)
|
||||
"cMb" = (
|
||||
@@ -68296,17 +68241,22 @@
|
||||
pixel_x = -40;
|
||||
pixel_y = 8
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
|
||||
/obj/machinery/atmospherics/pipe/simple/dark/visible{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/button/ignition/incinerator/atmos{
|
||||
pixel_x = -24;
|
||||
pixel_y = -9
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"cMw" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/orange/visible,
|
||||
/obj/machinery/atmospherics/pipe/simple/dark/visible{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/components/binary/valve/digital{
|
||||
name = "Waste Release"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"cMx" = (
|
||||
@@ -68424,10 +68374,13 @@
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/engine/atmos)
|
||||
"cMI" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
|
||||
dir = 9
|
||||
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
|
||||
dir = 4
|
||||
},
|
||||
/turf/closed/wall/r_wall,
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
pixel_x = 27
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"cMJ" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
|
||||
@@ -68465,10 +68418,8 @@
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/atmos)
|
||||
"cMO" = (
|
||||
/obj/machinery/atmospherics/pipe/layer_manifold,
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/atmos)
|
||||
"cMP" = (
|
||||
@@ -70819,6 +70770,13 @@
|
||||
/obj/effect/landmark/start/atmospheric_technician,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"dnN" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"dpO" = (
|
||||
/obj/machinery/atmospherics/components/unary/thermomachine/heater/on{
|
||||
dir = 4
|
||||
@@ -70838,6 +70796,14 @@
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/router)
|
||||
"dSZ" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/layer_manifold,
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/atmos)
|
||||
"dVR" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/violet/visible,
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -70849,13 +70815,19 @@
|
||||
},
|
||||
/turf/open/floor/engine,
|
||||
/area/science/storage)
|
||||
"ebG" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden,
|
||||
/turf/open/floor/plating,
|
||||
/area/science/mixing)
|
||||
"eCy" = (
|
||||
/obj/structure/extinguisher_cabinet{
|
||||
pixel_x = -27
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/general/visible{
|
||||
dir = 9
|
||||
},
|
||||
/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{
|
||||
pixel_x = -25;
|
||||
pixel_y = 7
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"eIh" = (
|
||||
@@ -70873,6 +70845,10 @@
|
||||
dir = 1
|
||||
},
|
||||
/area/engine/atmos)
|
||||
"eJy" = (
|
||||
/obj/machinery/rnd/experimentor,
|
||||
/turf/open/floor/engine,
|
||||
/area/science/explab)
|
||||
"eKM" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/supplymain/visible,
|
||||
/turf/open/floor/plasteel,
|
||||
@@ -71033,6 +71009,13 @@
|
||||
/obj/machinery/atmospherics/pipe/manifold/orange/visible,
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"iCa" = (
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
|
||||
dir = 5
|
||||
},
|
||||
/turf/open/floor/plating,
|
||||
/area/science/mixing)
|
||||
"iQY" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/yellow/visible{
|
||||
dir = 4
|
||||
@@ -71058,6 +71041,13 @@
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"jAv" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"kzb" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
|
||||
dir = 4
|
||||
@@ -71094,6 +71084,10 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"mqE" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/cyan/visible,
|
||||
/turf/closed/wall/r_wall,
|
||||
/area/engine/atmos)
|
||||
"mxW" = (
|
||||
/obj/structure/lattice,
|
||||
/obj/machinery/atmospherics/pipe/simple/supplymain/visible{
|
||||
@@ -71101,6 +71095,13 @@
|
||||
},
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"mDW" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
|
||||
dir = 10
|
||||
},
|
||||
/obj/effect/spawner/structure/window/reinforced,
|
||||
/turf/open/floor/plating,
|
||||
/area/engine/atmos)
|
||||
"mEa" = (
|
||||
/obj/machinery/atmospherics/components/binary/pump/on{
|
||||
dir = 8;
|
||||
@@ -71243,8 +71244,8 @@
|
||||
/turf/open/space/basic,
|
||||
/area/space/nearstation)
|
||||
"rUl" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
|
||||
dir = 8
|
||||
/obj/machinery/atmospherics/pipe/simple/orange/visible{
|
||||
dir = 6
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
@@ -71272,6 +71273,10 @@
|
||||
/obj/machinery/portable_atmospherics/canister,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"sSg" = (
|
||||
/obj/machinery/rnd/bepis,
|
||||
/turf/open/floor/engine,
|
||||
/area/science/explab)
|
||||
"sVC" = (
|
||||
/obj/structure/lattice/catwalk,
|
||||
/obj/structure/cable{
|
||||
@@ -71320,8 +71325,8 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"tZC" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/orange/visible{
|
||||
dir = 1
|
||||
/obj/machinery/atmospherics/pipe/simple/orange/visible{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
@@ -71347,6 +71352,14 @@
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/engine/atmos)
|
||||
"uYy" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/cable{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/orange/hidden,
|
||||
/turf/open/floor/plating/airless,
|
||||
/area/space/nearstation)
|
||||
"vcb" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/brown/visible,
|
||||
/obj/machinery/atmospherics/pipe/simple/green/visible{
|
||||
@@ -90851,10 +90864,10 @@ bOv
|
||||
bfo
|
||||
blI
|
||||
bfo
|
||||
bWS
|
||||
bcw
|
||||
bcw
|
||||
bcw
|
||||
bXg
|
||||
ebG
|
||||
ebG
|
||||
iCa
|
||||
bcy
|
||||
cbu
|
||||
csR
|
||||
@@ -91363,9 +91376,9 @@ boJ
|
||||
fuR
|
||||
bzX
|
||||
bAl
|
||||
boL
|
||||
bdf
|
||||
bAG
|
||||
cnT
|
||||
bdf
|
||||
boQ
|
||||
cKJ
|
||||
bAP
|
||||
@@ -91618,11 +91631,11 @@ bcy
|
||||
bcy
|
||||
bcy
|
||||
bcy
|
||||
bcy
|
||||
bWS
|
||||
bgC
|
||||
bdf
|
||||
boR
|
||||
bDL
|
||||
bdf
|
||||
boQ
|
||||
cKJ
|
||||
bAP
|
||||
@@ -91875,11 +91888,11 @@ bQe
|
||||
aaU
|
||||
aaU
|
||||
aaU
|
||||
bcw
|
||||
boL
|
||||
bdf
|
||||
bdf
|
||||
bpM
|
||||
bFp
|
||||
bvj
|
||||
bvj
|
||||
cKK
|
||||
bAU
|
||||
@@ -92132,7 +92145,7 @@ aye
|
||||
aaU
|
||||
aaU
|
||||
aaU
|
||||
bcw
|
||||
bDL
|
||||
cnL
|
||||
bdf
|
||||
bpR
|
||||
@@ -92158,7 +92171,7 @@ cHj
|
||||
cqS
|
||||
cav
|
||||
cav
|
||||
ccL
|
||||
ctb
|
||||
caX
|
||||
caX
|
||||
caX
|
||||
@@ -92391,8 +92404,8 @@ abp
|
||||
abp
|
||||
bcy
|
||||
biK
|
||||
bdf
|
||||
bpR
|
||||
bFp
|
||||
cnT
|
||||
bJT
|
||||
bLl
|
||||
cKM
|
||||
@@ -92412,13 +92425,13 @@ aVF
|
||||
caw
|
||||
caA
|
||||
cHk
|
||||
caP
|
||||
ccL
|
||||
caT
|
||||
caX
|
||||
caX
|
||||
eJy
|
||||
caX
|
||||
cbh
|
||||
caX
|
||||
sSg
|
||||
caX
|
||||
cbx
|
||||
cav
|
||||
@@ -105741,7 +105754,7 @@ cgD
|
||||
cdV
|
||||
chy
|
||||
chN
|
||||
bWQ
|
||||
uYy
|
||||
bWQ
|
||||
cdo
|
||||
aPg
|
||||
@@ -118842,7 +118855,7 @@ bNE
|
||||
cww
|
||||
cpO
|
||||
bYP
|
||||
cRg
|
||||
cMI
|
||||
cMH
|
||||
cww
|
||||
cMb
|
||||
@@ -119619,7 +119632,7 @@ chn
|
||||
eCy
|
||||
chL
|
||||
cMv
|
||||
cMI
|
||||
cMJ
|
||||
anr
|
||||
aaa
|
||||
aaa
|
||||
@@ -119876,7 +119889,7 @@ chp
|
||||
chx
|
||||
chM
|
||||
gDY
|
||||
jiZ
|
||||
mqE
|
||||
anr
|
||||
aaa
|
||||
aaa
|
||||
@@ -120130,7 +120143,7 @@ uVD
|
||||
mqB
|
||||
dpO
|
||||
tZC
|
||||
qWY
|
||||
cwB
|
||||
rUl
|
||||
cMw
|
||||
cfs
|
||||
@@ -120644,8 +120657,8 @@ sRD
|
||||
nAF
|
||||
cgz
|
||||
cJH
|
||||
cwB
|
||||
cMl
|
||||
qWY
|
||||
cJH
|
||||
cMx
|
||||
cMJ
|
||||
cxc
|
||||
@@ -121408,7 +121421,7 @@ bSb
|
||||
cKS
|
||||
cKY
|
||||
bQO
|
||||
cLc
|
||||
cMO
|
||||
eIh
|
||||
bYd
|
||||
tXV
|
||||
@@ -121418,7 +121431,7 @@ cwB
|
||||
cMc
|
||||
cMm
|
||||
cMy
|
||||
cML
|
||||
dSZ
|
||||
cLa
|
||||
cKY
|
||||
cLu
|
||||
@@ -122436,7 +122449,7 @@ bTH
|
||||
cKU
|
||||
cKY
|
||||
cLa
|
||||
cLc
|
||||
cMO
|
||||
fgS
|
||||
car
|
||||
cwB
|
||||
@@ -122446,7 +122459,7 @@ cwB
|
||||
cMg
|
||||
cMq
|
||||
cMB
|
||||
cML
|
||||
dSZ
|
||||
cMQ
|
||||
cKY
|
||||
cLw
|
||||
@@ -123217,8 +123230,8 @@ cLs
|
||||
cLs
|
||||
cMs
|
||||
cME
|
||||
cMN
|
||||
aaU
|
||||
mDW
|
||||
dnN
|
||||
bZR
|
||||
caJ
|
||||
bpq
|
||||
@@ -123464,7 +123477,7 @@ bTK
|
||||
cKW
|
||||
cKY
|
||||
bQV
|
||||
cLc
|
||||
cMO
|
||||
cLk
|
||||
ctk
|
||||
prx
|
||||
@@ -123475,7 +123488,7 @@ prx
|
||||
iQY
|
||||
cMF
|
||||
cMO
|
||||
cMS
|
||||
jAv
|
||||
cMT
|
||||
cLy
|
||||
blM
|
||||
|
||||
@@ -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{
|
||||
|
||||
@@ -12681,7 +12681,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
|
||||
},
|
||||
@@ -55716,7 +55716,6 @@
|
||||
icon_state = "4-8"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
|
||||
/obj/effect/turf_decal/stripes/line,
|
||||
/turf/open/floor/plating,
|
||||
/area/maintenance/port/aft)
|
||||
"cgM" = (
|
||||
@@ -56437,6 +56436,7 @@
|
||||
/obj/structure/curtain{
|
||||
icon_state = "closed"
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/medical/surgery)
|
||||
"cie" = (
|
||||
@@ -57088,15 +57088,15 @@
|
||||
/area/maintenance/port/aft)
|
||||
"cjw" = (
|
||||
/obj/structure/table,
|
||||
/obj/machinery/firealarm{
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/item/storage/backpack/duffelbag/med/surgery{
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/machinery/light_switch{
|
||||
pixel_x = -26
|
||||
},
|
||||
/obj/machinery/vending/wallmed{
|
||||
pixel_y = 29
|
||||
},
|
||||
/turf/open/floor/plasteel/white/corner,
|
||||
/area/medical/surgery)
|
||||
"cjz" = (
|
||||
@@ -57114,8 +57114,8 @@
|
||||
"cjB" = (
|
||||
/obj/machinery/iv_drip,
|
||||
/obj/machinery/atmospherics/components/unary/vent_pump/on,
|
||||
/obj/machinery/vending/wallmed{
|
||||
pixel_y = 29
|
||||
/obj/machinery/firealarm{
|
||||
pixel_y = 28
|
||||
},
|
||||
/turf/open/floor/plasteel/white/side,
|
||||
/area/medical/surgery)
|
||||
@@ -57134,15 +57134,15 @@
|
||||
/area/medical/surgery)
|
||||
"cjD" = (
|
||||
/obj/structure/table,
|
||||
/obj/machinery/firealarm{
|
||||
pixel_y = 24
|
||||
},
|
||||
/obj/item/storage/backpack/duffelbag/med/surgery{
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/machinery/light_switch{
|
||||
pixel_x = 28
|
||||
},
|
||||
/obj/machinery/vending/wallmed{
|
||||
pixel_y = 29
|
||||
},
|
||||
/turf/open/floor/plasteel/white/corner{
|
||||
dir = 8
|
||||
},
|
||||
@@ -57799,9 +57799,6 @@
|
||||
dir = 4;
|
||||
pixel_x = 11
|
||||
},
|
||||
/obj/structure/mirror{
|
||||
pixel_x = 28
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 10
|
||||
},
|
||||
@@ -57823,9 +57820,6 @@
|
||||
pixel_x = -12;
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/structure/mirror{
|
||||
pixel_x = -28
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 6
|
||||
},
|
||||
@@ -58913,11 +58907,11 @@
|
||||
/area/medical/surgery)
|
||||
"cnp" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/machinery/door/airlock/medical{
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/airlock/medical/glass{
|
||||
name = "Operating Theatre";
|
||||
req_access_txt = "45"
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/medical/surgery)
|
||||
"cnq" = (
|
||||
@@ -59597,10 +59591,6 @@
|
||||
/obj/structure/chair{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/firealarm{
|
||||
dir = 4;
|
||||
pixel_x = -24
|
||||
},
|
||||
/turf/open/floor/plasteel/dark,
|
||||
/area/medical/surgery)
|
||||
"coz" = (
|
||||
@@ -60457,9 +60447,6 @@
|
||||
/area/medical/surgery)
|
||||
"cqb" = (
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/door/airlock/medical/glass{
|
||||
name = "Surgery Observation"
|
||||
},
|
||||
/obj/effect/turf_decal/tile/blue{
|
||||
dir = 8
|
||||
},
|
||||
@@ -60473,6 +60460,9 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/airlock/medical{
|
||||
name = "Surgery Observation"
|
||||
},
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/medical/surgery)
|
||||
"cqc" = (
|
||||
@@ -64937,6 +64927,10 @@
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/item/radio/intercom{
|
||||
name = "Station Intercom (General)";
|
||||
pixel_x = -26
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/hallway/primary/aft)
|
||||
"cyo" = (
|
||||
@@ -65302,20 +65296,12 @@
|
||||
/turf/open/floor/plasteel,
|
||||
/area/medical/genetics)
|
||||
"czd" = (
|
||||
/obj/machinery/light_switch{
|
||||
pixel_x = 23
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/medical/genetics)
|
||||
"cze" = (
|
||||
/obj/machinery/door/airlock/research{
|
||||
id_tag = "AuxGenetics";
|
||||
name = "Genetics Access";
|
||||
req_access_txt = "9"
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
|
||||
dir = 8
|
||||
@@ -65323,13 +65309,14 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/door/airlock/research{
|
||||
id_tag = "AuxGenetics";
|
||||
name = "Genetics Access";
|
||||
req_access_txt = "9"
|
||||
},
|
||||
/turf/open/floor/plasteel,
|
||||
/area/medical/genetics)
|
||||
"czf" = (
|
||||
/obj/item/radio/intercom{
|
||||
name = "Station Intercom (General)";
|
||||
pixel_x = -26
|
||||
},
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 8
|
||||
},
|
||||
@@ -81809,12 +81796,12 @@
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/science/circuit)
|
||||
"kgN" = (
|
||||
/obj/machinery/door/airlock/medical{
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/obj/machinery/door/airlock/medical/glass{
|
||||
name = "Operating Theatre";
|
||||
req_access_txt = "45"
|
||||
},
|
||||
/obj/machinery/door/firedoor,
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/open/floor/plasteel/white,
|
||||
/area/medical/surgery)
|
||||
"krD" = (
|
||||
@@ -82865,6 +82852,10 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/crew_quarters/fitness/recreation)
|
||||
"sos" = (
|
||||
/obj/structure/mirror,
|
||||
/turf/closed/wall,
|
||||
/area/medical/surgery)
|
||||
"sqe" = (
|
||||
/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
|
||||
/turf/open/space/basic,
|
||||
@@ -102981,7 +102972,7 @@ cdl
|
||||
dwb
|
||||
cia
|
||||
cnm
|
||||
cia
|
||||
sos
|
||||
cid
|
||||
cnq
|
||||
coC
|
||||
|
||||
@@ -24603,7 +24603,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" = (
|
||||
|
||||
@@ -275,7 +275,7 @@ GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt"))
|
||||
|
||||
//LANGUAGE CHARACTER CUSTOMIZATION
|
||||
GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles"))
|
||||
GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc))
|
||||
GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien))
|
||||
|
||||
//SPECIES BODYPART LISTS
|
||||
//locked parts are those that your picked species requires to have
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
name = "gas sensor"
|
||||
icon = 'icons/obj/stationobjs.dmi'
|
||||
icon_state = "gsensor1"
|
||||
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 0)
|
||||
|
||||
var/on = TRUE
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
var/boom_sizes = list(0, 0, 3)
|
||||
var/can_attach_mob = FALSE
|
||||
var/full_damage_on_mobs = FALSE
|
||||
var/can_gib_mobs = FALSE
|
||||
|
||||
/obj/item/grenade/plastic/Initialize()
|
||||
. = ..()
|
||||
@@ -72,7 +73,7 @@
|
||||
explosion(get_step(T, aim_dir), boom_sizes[1], boom_sizes[2], boom_sizes[3])
|
||||
else
|
||||
explosion(location, boom_sizes[1], boom_sizes[2], boom_sizes[3])
|
||||
if(ismob(target))
|
||||
if(ismob(target) && can_gib_mobs)
|
||||
var/mob/M = target
|
||||
M.gib()
|
||||
qdel(src)
|
||||
|
||||
@@ -1,17 +1,3 @@
|
||||
/obj/item/caution
|
||||
desc = "Caution! Wet Floor!"
|
||||
name = "wet floor sign"
|
||||
icon = 'icons/obj/janitor.dmi'
|
||||
icon_state = "caution"
|
||||
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
|
||||
force = 1
|
||||
throwforce = 3
|
||||
throw_speed = 2
|
||||
throw_range = 5
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
attack_verb = list("warned", "cautioned", "smashed")
|
||||
|
||||
/obj/item/choice_beacon
|
||||
name = "choice beacon"
|
||||
desc = "Hey, why are you viewing this?!! Please let Centcom know about this odd occurance."
|
||||
|
||||
@@ -392,6 +392,7 @@
|
||||
created_name = new_name
|
||||
else
|
||||
created_name = ""
|
||||
log_game("[key_name(usr)] renamed [src] ([REF(src)]) to [created_name].")
|
||||
|
||||
else if(href_list["Master"])
|
||||
forced_ai = select_active_ai(usr)
|
||||
|
||||
@@ -793,7 +793,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
|
||||
new /datum/stack_recipe("shower curtain", /obj/structure/curtain, 10, time = 10, one_per_turf = 1, on_floor = 1), \
|
||||
new /datum/stack_recipe("duct", /obj/item/stack/ducts,1), \
|
||||
new /datum/stack_recipe("laser pointer case", /obj/item/glasswork/glass_base/laserpointer_shell, 30), \
|
||||
new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2)))
|
||||
new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2)))
|
||||
|
||||
/obj/item/stack/sheet/plastic
|
||||
name = "plastic"
|
||||
|
||||
@@ -103,6 +103,39 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
|
||||
/obj/item/storage/toolbox/mechanical/old/heirloom/PopulateContents()
|
||||
return
|
||||
|
||||
/obj/item/storage/toolbox/mechanical/old/clean // the assistant traitor toolbox, damage scales with TC inside
|
||||
name = "toolbox"
|
||||
desc = "An old, blue toolbox. It menaces with a sickening miasma of robust energies. You sure about this, Brain?"
|
||||
icon_state = "toolbox_blue_clean"
|
||||
force = 19
|
||||
throwforce = 22
|
||||
wound_bonus = 0
|
||||
bare_wound_bonus = 10
|
||||
|
||||
/obj/item/storage/toolbox/mechanical/old/clean/proc/calc_damage()
|
||||
var/power = 0
|
||||
for (var/obj/item/stack/telecrystal/TC in GetAllContents())
|
||||
power += TC.amount
|
||||
force = 19 + power
|
||||
throwforce = 22 + power
|
||||
|
||||
/obj/item/storage/toolbox/mechanical/old/clean/attack(mob/target, mob/living/user)
|
||||
calc_damage() // one damage for one telecrystal equals about thirty seven(?) damage if you pour ALL your tc
|
||||
..()
|
||||
|
||||
/obj/item/storage/toolbox/mechanical/old/clean/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
|
||||
calc_damage()
|
||||
..()
|
||||
|
||||
/obj/item/storage/toolbox/mechanical/old/clean/PopulateContents()
|
||||
new /obj/item/screwdriver(src)
|
||||
new /obj/item/wrench(src)
|
||||
new /obj/item/weldingtool(src)
|
||||
new /obj/item/crowbar(src)
|
||||
new /obj/item/wirecutters(src)
|
||||
new /obj/item/multitool(src)
|
||||
new /obj/item/clothing/gloves/color/yellow(src)
|
||||
|
||||
/obj/item/storage/toolbox/electrical
|
||||
name = "electrical toolbox"
|
||||
icon_state = "yellow"
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
new /obj/item/melee/flyswatter(src)
|
||||
new /obj/item/flashlight(src)
|
||||
for(var/i in 1 to 3)
|
||||
new /obj/item/caution(src)
|
||||
new /obj/item/clothing/suit/caution(src)
|
||||
new /obj/item/holosign_creator(src)
|
||||
new /obj/item/lightreplacer(src)
|
||||
new /obj/item/soap(src)
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
l.janicart_insert(user,src)
|
||||
else
|
||||
to_chat(user, fail_msg)
|
||||
else if(istype(I, /obj/item/caution))
|
||||
else if(istype(I, /obj/item/clothing/suit/caution))
|
||||
if(signs < max_signs)
|
||||
put_in_cart(I, user)
|
||||
signs++
|
||||
@@ -104,7 +104,7 @@
|
||||
items += list("Spray bottle" = image(icon = myspray.icon, icon_state = myspray.icon_state))
|
||||
if(myreplacer)
|
||||
items += list("Light replacer" = image(icon = myreplacer.icon, icon_state = myreplacer.icon_state))
|
||||
var/obj/item/caution/sign = locate() in src
|
||||
var/obj/item/clothing/suit/caution/sign = locate() in src
|
||||
if(sign)
|
||||
items += list("Sign" = image(icon = sign.icon, icon_state = sign.icon_state))
|
||||
|
||||
|
||||
@@ -48,6 +48,8 @@
|
||||
if(C.prefs.toggles & SOUND_PRAYERS)
|
||||
if(usr.job == "Chaplain")
|
||||
SEND_SOUND(C, sound('sound/effects/pray.ogg'))
|
||||
else
|
||||
SEND_SOUND(C, sound('sound/effects/ding.ogg'))
|
||||
to_chat(usr, "<span class='info'>You pray to the gods: \"[msg_tmp]\"</span>")
|
||||
|
||||
SSblackbox.record_feedback("tally", "admin_verb", 1, "Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||
|
||||
@@ -261,9 +261,9 @@
|
||||
/obj/item/reagent_containers/glass/bucket,
|
||||
/obj/item/reagent_containers/glass/bucket,
|
||||
/obj/item/mop,
|
||||
/obj/item/caution,
|
||||
/obj/item/caution,
|
||||
/obj/item/caution,
|
||||
/obj/item/clothing/suit/caution,
|
||||
/obj/item/clothing/suit/caution,
|
||||
/obj/item/clothing/suit/caution,
|
||||
/obj/item/storage/bag/trash,
|
||||
/obj/item/reagent_containers/spray/cleaner,
|
||||
/obj/item/reagent_containers/rag,
|
||||
|
||||
@@ -541,6 +541,21 @@
|
||||
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
|
||||
allowed = list(/obj/item/clothing/mask/facehugger/toy)
|
||||
|
||||
/obj/item/clothing/suit/caution
|
||||
name = "wet floor sign"
|
||||
desc = "Caution! Wet Floor!"
|
||||
icon_state = "caution"
|
||||
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
|
||||
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
|
||||
force = 1
|
||||
throwforce = 3
|
||||
throw_speed = 2
|
||||
throw_range = 5
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
body_parts_covered = CHEST|GROIN
|
||||
attack_verb = list("warned", "cautioned", "smashed")
|
||||
armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
|
||||
|
||||
// WINTER COATS
|
||||
|
||||
/obj/item/clothing/suit/hooded/wintercoat
|
||||
|
||||
@@ -244,35 +244,33 @@
|
||||
/obj/item/clothing/under/proc/rolldown()
|
||||
if(!can_use(usr))
|
||||
return
|
||||
if(!can_adjust)
|
||||
to_chat(usr, "<span class='warning'>You cannot wear this suit any differently!</span>")
|
||||
return
|
||||
if(toggle_jumpsuit_adjust())
|
||||
to_chat(usr, "<span class='notice'>You adjust the suit to wear it more casually.</span>")
|
||||
else
|
||||
to_chat(usr, "<span class='notice'>You adjust the suit back to normal.</span>")
|
||||
if(ishuman(usr))
|
||||
if(toggle_jumpsuit_adjust() && ishuman(usr))
|
||||
var/mob/living/carbon/human/H = usr
|
||||
H.update_inv_w_uniform()
|
||||
H.update_body()
|
||||
|
||||
/obj/item/clothing/under/proc/toggle_jumpsuit_adjust()
|
||||
if(!can_adjust)
|
||||
to_chat(usr, "<span class='warning'>You cannot wear this suit any differently!</span>")
|
||||
return FALSE
|
||||
adjusted = !adjusted
|
||||
|
||||
if(adjusted)
|
||||
to_chat(usr, "<span class='notice'>You adjust the suit to wear it more casually.</span>")
|
||||
if(fitted != FEMALE_UNIFORM_TOP)
|
||||
fitted = NO_FEMALE_UNIFORM
|
||||
if(!alt_covers_chest) // for the special snowflake suits that expose the chest when adjusted
|
||||
body_parts_covered &= ~CHEST
|
||||
mutantrace_variation &= ~USE_TAUR_CLIP_MASK //How are we supposed to see the uniform otherwise?
|
||||
else
|
||||
to_chat(usr, "<span class='notice'>You adjust the suit back to normal.</span>")
|
||||
fitted = initial(fitted)
|
||||
if(!alt_covers_chest)
|
||||
body_parts_covered |= CHEST
|
||||
if(initial(mutantrace_variation) & USE_TAUR_CLIP_MASK)
|
||||
mutantrace_variation |= USE_TAUR_CLIP_MASK
|
||||
|
||||
return adjusted
|
||||
return TRUE
|
||||
|
||||
/obj/item/clothing/under/rank
|
||||
dying_key = DYE_REGISTRY_UNDER
|
||||
|
||||
@@ -172,11 +172,13 @@
|
||||
body_parts_covered = CHEST|GROIN
|
||||
|
||||
/obj/item/clothing/under/misc/gear_harness/toggle_jumpsuit_adjust()
|
||||
adjusted = !adjusted
|
||||
if(adjusted)
|
||||
body_parts_covered = NONE
|
||||
else
|
||||
if(!body_parts_covered)
|
||||
to_chat(usr, "<span class='notice'>Your gear harness is now covering your chest and groin.</span>")
|
||||
body_parts_covered = CHEST|GROIN
|
||||
else
|
||||
to_chat(usr, "<span class='notice'>Your gear harness is no longer covering anything.</span>")
|
||||
body_parts_covered = NONE
|
||||
return TRUE
|
||||
|
||||
/obj/item/clothing/under/misc/durathread
|
||||
name = "durathread jumpsuit"
|
||||
|
||||
@@ -138,6 +138,18 @@
|
||||
name = "White Fly"
|
||||
icon_state = "whitefly"
|
||||
|
||||
/datum/sprite_accessory/deco_wings/oakworm
|
||||
name = "Oak Worm"
|
||||
icon_state = "oakworm"
|
||||
|
||||
/datum/sprite_accessory/deco_wings/witchwing
|
||||
name = "Witch Wing"
|
||||
icon_state = "witchwing"
|
||||
|
||||
/datum/sprite_accessory/deco_wings/jungle
|
||||
name = "Jungle"
|
||||
icon_state = "jungle"
|
||||
|
||||
//INSECT WINGS
|
||||
|
||||
/datum/sprite_accessory/insect_wings
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
say_mod = "hisses"
|
||||
default_color = "00FF00"
|
||||
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,CAN_SCAR)
|
||||
mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade")
|
||||
mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade","deco_wings"= "None")
|
||||
attack_verb = "slash"
|
||||
attack_sound = 'sound/weapons/slash.ogg'
|
||||
miss_sound = 'sound/weapons/slashmiss.ogg'
|
||||
|
||||
@@ -17,6 +17,9 @@
|
||||
/mob/living/proc/initiate_parry_sequence()
|
||||
if(parrying)
|
||||
return // already parrying
|
||||
if(!(mobility_flags & MOBILITY_USE))
|
||||
to_chat(src, "<span class='warning'>You can't move your arms!</span>")
|
||||
return
|
||||
if(!(combat_flags & COMBAT_FLAG_PARRY_CAPABLE))
|
||||
to_chat(src, "<span class='warning'>You are not something that can parry attacks.</span>")
|
||||
return
|
||||
|
||||
@@ -182,8 +182,9 @@
|
||||
if(..())
|
||||
if(reagents.total_volume)
|
||||
if(M.reagents)
|
||||
log_combat(user, M, "injected with sleepypen", src, reagents.log_list())
|
||||
reagents.reaction(M, INJECT)
|
||||
reagents.trans_to(M, reagents.total_volume)
|
||||
reagents.trans_to(M, reagents.total_volume, log = "sleepypen inject")
|
||||
|
||||
|
||||
/obj/item/pen/sleepy/Initialize()
|
||||
|
||||
@@ -142,6 +142,14 @@
|
||||
cost = 4 // Has syndie tools + gloves + a robust weapon
|
||||
restricted_roles = list("Assistant", "Curator") //Curator due to this being made of gold - It fits the theme
|
||||
|
||||
/datum/uplink_item/role_restricted/oldtoolboxclean // this is the fourth item relating to toolboxes to be placed into this godforsaken bloated uplink
|
||||
name = "Ancient Toolbox"
|
||||
desc = "An iconic toolbox design notorious with Assistants everywhere, this design was especially made to become more robust the more telecrystals it has inside it! Tools and insulated gloves included."
|
||||
item = /obj/item/storage/toolbox/mechanical/old/clean
|
||||
cost = 2 // with eighteen telecrystals you are still weaker than a desword and without any of its defenses -- the scary part comes from collaborating with allies for a fifty eight force toolbox oh fuck
|
||||
restricted_roles = list("Assistant")
|
||||
surplus = 0
|
||||
|
||||
/datum/uplink_item/role_restricted/mimery
|
||||
name = "Guide to Advanced Mimery Series"
|
||||
desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisible walls, and shoot bullets out of their fingers. \
|
||||
|
||||
@@ -375,7 +375,7 @@
|
||||
/obj/item/paint/paint_remover = 2,
|
||||
/obj/item/melee/flyswatter = 2,
|
||||
/obj/item/flashlight = 2,
|
||||
/obj/item/caution = 8,
|
||||
/obj/item/clothing/suit/caution = 8,
|
||||
/obj/item/holosign_creator = 2,
|
||||
/obj/item/lightreplacer = 2,
|
||||
/obj/item/soap = 2,
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
author: "zeroisthebiggay"
|
||||
delete-after: True
|
||||
changes:
|
||||
- rscadd: "Traitor assistants can now purchase the patented POGBox! Put TC into it for even higher damage!"
|
||||
@@ -0,0 +1,5 @@
|
||||
author: "Putnam3145"
|
||||
delete-after: True
|
||||
changes:
|
||||
- bugfix: "gear harness alt-click is now sane"
|
||||
- code_imp: "rolldown() and toggle_jumpsuit_adjust() now no longer mix behavior-that-should-be-overridden and behavior-that-shouldn't-be-overridden in ways that make no sense."
|
||||
@@ -0,0 +1,6 @@
|
||||
author: "MrJWhit"
|
||||
delete-after: True
|
||||
changes:
|
||||
- tweak: "Removed the wires connecting the AI from the rest of the station on cogstation."
|
||||
- tweak: "Fixes experimenter on cogstation."
|
||||
- tweak: "Less pipes in the overall area in toxins on cogstation"
|
||||
@@ -0,0 +1,4 @@
|
||||
author: "Arturlang"
|
||||
delete-after: True
|
||||
changes:
|
||||
- tweak: "Prayers to admins now do a wee ding sound for all prayers, instead of just chaplains"
|
||||
@@ -0,0 +1,8 @@
|
||||
author: "TripleShades"
|
||||
delete-after: True
|
||||
changes:
|
||||
- rscadd: "Firelock to Surgery Bay drapes
|
||||
change: Swapped Nanomed and Fire Alarm button locations in both Surgery Bays
|
||||
change: Removes the double mirror in both Surgery Bays to be a singular mirror
|
||||
change: Moved an intercom to not be doorstuck below Paramedical Office
|
||||
remove: One Surgery Observation Fire Alarm button"
|
||||
@@ -0,0 +1,4 @@
|
||||
author: "MrJWhit"
|
||||
delete-after: True
|
||||
changes:
|
||||
- tweak: "Fixes maint area in boxstation"
|
||||
@@ -0,0 +1,4 @@
|
||||
author: "silicons"
|
||||
delete-after: True
|
||||
changes:
|
||||
- balance: "c4 can no longer gib mobs"
|
||||
@@ -0,0 +1,4 @@
|
||||
author: "MrJWhit"
|
||||
delete-after: True
|
||||
changes:
|
||||
- rscadd: "Makes gas sensors fireproof."
|
||||
@@ -0,0 +1,6 @@
|
||||
author: "shellspeed1"
|
||||
delete-after: True
|
||||
changes:
|
||||
- rscadd: "Xenomorph hybrids can now select wings
|
||||
~~add: Xenomorph hybrids can now speak xenomorph~~"
|
||||
- rscadd: "Xenomorph tongues are available for customization."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 444 KiB After Width: | Height: | Size: 457 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 159 KiB After Width: | Height: | Size: 162 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 73 KiB |
Binary file not shown.
@@ -3,7 +3,7 @@
|
||||
"name": "tgui-dev-server",
|
||||
"version": "4.2.0",
|
||||
"dependencies": {
|
||||
"axios": "^0.19.2",
|
||||
"axios": "^0.21.1",
|
||||
"common": "workspace:*",
|
||||
"esm": "^3.2.25",
|
||||
"glob": "^7.1.4",
|
||||
|
||||
@@ -57,7 +57,6 @@ const Toner = (props, context) => {
|
||||
title="Toner"
|
||||
buttons={
|
||||
<Button
|
||||
disabled={!current_toner}
|
||||
onClick={() => act('remove_toner')}
|
||||
icon="eject">
|
||||
Eject
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user