diff --git a/.github/guides/ISSUE_MANAGER.md b/.github/guides/ISSUE_MANAGER.md
index 3ecab32a7f523..9e5745d77315f 100644
--- a/.github/guides/ISSUE_MANAGER.md
+++ b/.github/guides/ISSUE_MANAGER.md
@@ -28,8 +28,8 @@ If an issue reports a runtime, it must have the actual runtime call stack provid
- usr.loc: the floor (150,25,4) (/turf/open/floor/circuit)
- call stack:
- Camera Net (/datum/cameranet): visibility(/list (/list), null, /list (/list), 1)
- - AI (/mob/living/silicon/ai): camera visibility(Inactive AI Eye (/mob/eye/ai_eye))
- - Inactive AI Eye (/mob/eye/ai_eye): setLoc(the floor (150,25,4) (/turf/open/floor/circuit), 0)
+ - AI (/mob/living/silicon/ai): camera visibility(Inactive AI Eye (/mob/eye/camera/ai))
+ - Inactive AI Eye (/mob/eye/camera/ai): setLoc(the floor (150,25,4) (/turf/open/floor/circuit), 0)
- AI (/mob/living/silicon/ai): create eye()
- AI (/mob/living/silicon/ai): Initialize(0, null, TagGamerGame2 (/mob/dead/new_player))
- Atoms (/datum/controller/subsystem/atoms): InitAtom(AI (/mob/living/silicon/ai), 0, /list (/list))
diff --git a/_maps/_basemap.dm b/_maps/_basemap.dm
index c2c7b24788d7c..42a23d57808db 100644
--- a/_maps/_basemap.dm
+++ b/_maps/_basemap.dm
@@ -11,7 +11,6 @@
#include "map_files\IceBoxStation\IceBoxStation.dmm"
#include "map_files\MetaStation\MetaStation.dmm"
#include "map_files\Mining\Lavaland.dmm"
- #include "map_files\NorthStar\north_star.dmm"
#include "map_files\tramstation\tramstation.dmm"
#include "map_files\NebulaStation\NebulaStation.dmm"
#include "map_files\wawastation\wawastation.dmm"
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
index 77ec96a4fe8e8..f18d092fd15a4 100644
--- a/_maps/map_files/Birdshot/birdshot.dmm
+++ b/_maps/map_files/Birdshot/birdshot.dmm
@@ -50755,7 +50755,8 @@
"rqt" = (
/obj/machinery/airalarm/directional/north,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/aquarium/lawyer,
+/obj/item/fish_tank/lawyer,
+/obj/structure/table/wood,
/turf/open/floor/iron/dark,
/area/station/service/lawoffice)
"rqw" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 13c2c019fdb31..08d3aa51e9bfb 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -44890,7 +44890,8 @@
/area/station/hallway/primary/fore)
"lhp" = (
/obj/structure/sign/poster/official/report_crimes/directional/south,
-/obj/structure/aquarium/lawyer,
+/obj/item/fish_tank/lawyer,
+/obj/structure/table/wood,
/turf/open/floor/wood,
/area/station/service/lawoffice)
"lhC" = (
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 3a895cc7b5351..498bba9c2e803 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -7969,7 +7969,8 @@
/turf/open/floor/iron/dark,
/area/station/service/hydroponics/garden)
"cgB" = (
-/obj/structure/aquarium/lawyer,
+/obj/item/fish_tank/lawyer,
+/obj/structure/table/wood,
/turf/open/floor/wood,
/area/station/service/lawoffice)
"cgC" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 839edbd432730..1bc583699ef54 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -59697,7 +59697,8 @@
name = "Lawyer Requests Console"
},
/obj/machinery/newscaster/directional/west,
-/obj/structure/aquarium/lawyer,
+/obj/item/fish_tank/lawyer,
+/obj/structure/table/wood,
/turf/open/floor/wood,
/area/station/service/lawoffice)
"uZP" = (
diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm
index fc9b1b99823b4..f4e7bbd43cc51 100644
--- a/_maps/map_files/NebulaStation/NebulaStation.dmm
+++ b/_maps/map_files/NebulaStation/NebulaStation.dmm
@@ -770,6 +770,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/railing/corner/end/flip,
/turf/open/floor/iron/dark/small,
/area/station/maintenance/central)
"afN" = (
@@ -11757,8 +11758,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/trimline/dark/warning,
/obj/effect/turf_decal/trimline/dark/warning{
dir = 1
},
@@ -11769,6 +11768,9 @@
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/obj/machinery/camera/autoname/directional/west,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"bMP" = (
@@ -12152,6 +12154,19 @@
},
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"bPJ" = (
+/obj/structure/table/glass,
+/obj/item/reagent_containers/cup/glass/mug/britcup{
+ pixel_x = -7;
+ pixel_y = 9
+ },
+/obj/item/reagent_containers/cup/glass/coffee{
+ pixel_y = 5;
+ pixel_x = 7
+ },
+/obj/machinery/digital_clock/directional/south,
+/turf/open/floor/iron/dark/small,
+/area/station/hallway/secondary/entry)
"bPN" = (
/obj/effect/turf_decal/siding/dark{
dir = 8
@@ -14491,6 +14506,7 @@
name = "Auxillary Base Shutters";
dir = 8
},
+/obj/effect/turf_decal/box,
/turf/open/floor/iron/dark/textured_half{
dir = 1
},
@@ -27279,13 +27295,6 @@
/turf/open/floor/engine/hull/reinforced,
/area/space/nearstation)
"eaQ" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/structure/sign/warning/secure_area/directional/west,
-/obj/effect/turf_decal/trimline/dark/corner{
- dir = 1
- },
/obj/effect/turf_decal/siding/thinplating_new/corner{
dir = 1
},
@@ -42490,6 +42499,12 @@
},
/turf/open/floor/iron/dark,
/area/station/command/gateway)
+"gnG" = (
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 4
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"gnK" = (
/obj/machinery/airalarm/directional/south,
/obj/structure/railing{
@@ -56439,6 +56454,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment,
+/obj/structure/railing/corner/end/flip{
+ dir = 1
+ },
/turf/open/floor/iron/dark/small,
/area/station/maintenance/central)
"isi" = (
@@ -63090,18 +63108,15 @@
/area/station/engineering/supermatter/room/upper)
"jsw" = (
/obj/effect/decal/cleanable/dirt,
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/dark/warning{
- dir = 4
- },
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 4
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 4
+ },
/turf/open/floor/iron/dark/small,
/area/station/maintenance/central)
"jsz" = (
@@ -68958,9 +68973,6 @@
/turf/open/floor/plating/airless,
/area/station/science/ordnance/bomb)
"kki" = (
-/obj/structure/railing{
- dir = 4
- },
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 4
},
@@ -72845,6 +72857,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/security/brig)
+"kJJ" = (
+/obj/structure/rack,
+/obj/effect/decal/cleanable/oil,
+/obj/effect/turf_decal/bot_white,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/maintenance/central)
"kJO" = (
/obj/effect/turf_decal/tile/red/anticorner/contrasted{
dir = 8
@@ -75522,9 +75546,6 @@
/obj/structure/railing{
dir = 8
},
-/obj/effect/turf_decal/trimline/dark/warning{
- dir = 8
- },
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 8
},
@@ -75532,6 +75553,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark/small,
/area/station/maintenance/central)
"lhV" = (
@@ -78619,6 +78643,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark,
/area/station/medical/virology)
+"lFB" = (
+/obj/structure/chair/sofa/bench/solo{
+ dir = 4
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/hallway/secondary/entry)
"lFM" = (
/obj/effect/turf_decal/tile/purple,
/obj/structure/railing/corner/end/flip,
@@ -78763,6 +78793,11 @@
/obj/structure/cable,
/turf/open/floor/iron/dark,
/area/station/science/xenobiology)
+"lGG" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark,
+/obj/effect/turf_decal/trimline/dark/line,
+/turf/open/floor/iron/dark/small,
+/area/station/maintenance/central)
"lGR" = (
/obj/effect/turf_decal/siding/dark{
dir = 9
@@ -83903,28 +83938,22 @@
/turf/open/floor/iron/dark,
/area/station/engineering/atmos)
"mxU" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/obj/effect/turf_decal/trimline/dark/corner{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark/corner{
- dir = 8
- },
/obj/effect/turf_decal/siding/thinplating_new/corner{
dir = 8
},
/obj/effect/turf_decal/siding/thinplating_new/corner{
dir = 1
},
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
/obj/structure/cable,
+/obj/structure/railing/corner/end/flip{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"mxV" = (
@@ -84189,6 +84218,12 @@
},
/turf/open/floor/wood/large,
/area/station/service/theater)
+"mAd" = (
+/obj/effect/turf_decal/siding/thinplating_new{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/station/hallway/primary/central)
"mAi" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
@@ -85767,6 +85802,15 @@
/obj/machinery/light_switch/directional/south,
/turf/open/floor/iron/dark,
/area/station/engineering/lobby)
+"mMv" = (
+/obj/structure/table/glass,
+/obj/item/newspaper{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/machinery/digital_clock/directional/north,
+/turf/open/floor/iron/dark/small,
+/area/station/hallway/secondary/entry)
"mMD" = (
/obj/effect/turf_decal/trimline/blue/line{
dir = 6
@@ -93247,20 +93291,12 @@
/area/station/service/chapel/office)
"nTb" = (
/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
/obj/effect/turf_decal/trimline/dark/corner,
-/obj/effect/turf_decal/trimline/dark/corner{
- dir = 4
- },
/obj/effect/turf_decal/siding/thinplating_new/corner,
/obj/effect/turf_decal/siding/thinplating_new/corner{
dir = 4
},
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
+/obj/structure/railing/corner/end/flip,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
"nTe" = (
@@ -93392,12 +93428,6 @@
"nUi" = (
/obj/machinery/light/directional/east,
/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/dark/warning{
- dir = 1
- },
/obj/effect/turf_decal/trimline/dark/warning,
/obj/effect/turf_decal/siding/thinplating_new,
/obj/effect/turf_decal/siding/thinplating_new{
@@ -93405,6 +93435,7 @@
},
/obj/structure/sign/poster/official/random/directional/east,
/obj/machinery/camera/autoname/directional/east,
+/obj/machinery/door/firedoor/border_only,
/turf/open/floor/iron,
/area/station/hallway/secondary/entry)
"nUp" = (
@@ -102226,6 +102257,21 @@
},
/turf/open/floor/iron/white/herringbone,
/area/station/commons/toilet/restrooms)
+"pfI" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+ dir = 1
+ },
+/obj/effect/turf_decal/trimline/dark/warning{
+ dir = 1
+ },
+/obj/structure/sign/directions/arrival/directional/west{
+ dir = 10
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/maintenance/central)
"pfY" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 10
@@ -121577,9 +121623,6 @@
/turf/open/floor/wood/large,
/area/station/service/chapel/office)
"rZU" = (
-/obj/structure/railing{
- dir = 8
- },
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 8
},
@@ -121592,6 +121635,9 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/machinery/camera/autoname/directional/west,
+/obj/structure/railing/corner{
+ dir = 8
+ },
/turf/open/floor/iron/dark/small,
/area/station/maintenance/central)
"rZV" = (
@@ -122546,7 +122592,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/mapping_helpers/airlock/access/all/engineering/aux_base,
+/obj/effect/mapping_helpers/airlock/access/all/supply/general,
/turf/open/floor/iron/dark,
/area/station/construction/mining/aux_base)
"shs" = (
@@ -123039,6 +123085,9 @@
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/siding/thinplating_new/dark,
/obj/effect/turf_decal/trimline/dark/warning,
+/obj/structure/sign/directions/arrival/directional/east{
+ dir = 5
+ },
/turf/open/floor/iron/dark/small,
/area/station/maintenance/central)
"sms" = (
@@ -123389,6 +123438,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
/turf/open/floor/iron/dark/corner,
/area/station/commons/dorms)
"spf" = (
@@ -129792,6 +129842,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron/dark/textured,
/area/station/commons/fitness/recreation/lasertag)
+"toI" = (
+/obj/structure/chair/sofa/bench/solo{
+ dir = 8
+ },
+/turf/open/floor/iron/dark/small,
+/area/station/hallway/secondary/entry)
"toJ" = (
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 9
@@ -146917,12 +146973,6 @@
/turf/open/floor/plating/airless,
/area/station/solars/starboard/fore)
"vQl" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/dark/warning{
- dir = 8
- },
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 8
},
@@ -146930,6 +146980,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/disposalpipe/segment,
+/obj/effect/turf_decal/trimline/dark/line{
+ dir = 8
+ },
/turf/open/floor/iron/dark/small,
/area/station/maintenance/central)
"vQw" = (
@@ -146942,7 +146995,7 @@
/obj/machinery/button/door/directional/north{
id = "aux_base_shutters";
name = "Public Shutters Control";
- req_access = list("aux_base")
+ req_access = list("cargo")
},
/obj/machinery/light/small/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -149558,13 +149611,10 @@
/turf/open/floor/grass,
/area/station/hallway/secondary/entry)
"wkR" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 1
},
-/obj/effect/turf_decal/trimline/dark/warning{
+/obj/effect/turf_decal/trimline/dark/line{
dir = 1
},
/turf/open/floor/iron/dark/small,
@@ -149741,6 +149791,14 @@
},
/turf/open/floor/iron/white,
/area/station/science/lab)
+"wmi" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/emergency,
+/obj/effect/decal/cleanable/oil,
+/obj/item/screwdriver,
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/iron/dark/textured_large,
+/area/station/maintenance/central)
"wmj" = (
/obj/effect/turf_decal/siding/wideplating_new/dark/corner{
dir = 1
@@ -150837,10 +150895,6 @@
/turf/open/floor/iron/dark,
/area/station/medical/virology)
"wvW" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/structure/sign/warning/secure_area/directional/east,
-/obj/structure/railing/corner,
-/obj/effect/turf_decal/trimline/dark/corner,
/obj/effect/turf_decal/siding/thinplating_new/corner,
/turf/open/floor/iron,
/area/station/hallway/primary/central)
@@ -155497,7 +155551,6 @@
},
/area/station/maintenance/department/science)
"xiv" = (
-/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
},
@@ -193502,11 +193555,11 @@ pmV
qFS
tUf
dOv
-smp
-fCR
+lGG
+wmi
pmV
qwd
-wkR
+pfI
ntL
lND
yhH
@@ -199159,7 +199212,7 @@ rLH
smp
fCR
pmV
-qwd
+kJJ
wkR
aBc
ooG
@@ -258781,8 +258834,8 @@ bna
ijB
czt
wvW
-jBA
-jBA
+gnG
+gnG
nTb
jBA
jBA
@@ -259038,8 +259091,8 @@ fub
ijB
eev
kJl
-cIJ
-cIJ
+mMv
+toI
nUi
cIJ
cIJ
@@ -264695,8 +264748,8 @@ kJl
cIJ
cIJ
bMx
-cIJ
-cIJ
+lFB
+bPJ
kJl
eev
ijB
@@ -264952,8 +265005,8 @@ psN
xCp
xCp
mxU
-xCp
-xCp
+mAd
+mAd
eaQ
ijB
ijB
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
deleted file mode 100644
index aaa34d20351d4..0000000000000
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ /dev/null
@@ -1,356444 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aah" = (
-/obj/machinery/rnd/experimentor,
-/turf/open/floor/engine,
-/area/station/science/explab)
-"aak" = (
-/obj/structure/displaycase/labcage,
-/turf/open/floor/engine,
-/area/station/command/heads_quarters/rd)
-"aal" = (
-/turf/closed/wall,
-/area/station/maintenance/floor2/port)
-"aap" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 8
- },
-/obj/structure/sign/poster/official/random/directional/west,
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
-"aat" = (
-/obj/effect/mapping_helpers/broken_floor,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/textured_large,
-/area/station/cargo/storage)
-"aaw" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/starboard)
-"aax" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/chair/comfy,
-/turf/open/floor/iron/dark,
-/area/station/science/breakroom)
-"aaC" = (
-/obj/structure/grille/broken,
-/obj/effect/decal/cleanable/glass,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/structure/barricade/wooden,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
-"aaI" = (
-/obj/effect/landmark/start/quartermaster,
-/obj/structure/bed/double/pod,
-/obj/item/bedsheet/qm/double,
-/obj/machinery/requests_console/directional/north{
- department = "Quartermaster's Desk";
- name = "Quartermaster's Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/announcement,
-/obj/effect/mapping_helpers/requests_console/supplies,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/carpet/orange,
-/area/station/command/heads_quarters/qm)
-"aaM" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/commons/toilet)
-"aaN" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
-"aaO" = (
-/obj/machinery/computer/atmos_alert{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/status_display/evac/directional/west,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/port/fore)
-"aaP" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 1
- },
-/turf/open/floor/iron/smooth,
-/area/station/cargo/sorting)
-"aaU" = (
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
-"aaV" = (
-/obj/structure/curtain,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/white/small,
-/area/station/commons/fitness/recreation)
-"abk" = (
-/obj/machinery/camera/directional/east{
- c_tag = "Genetics Desk"
- },
-/obj/effect/turf_decal/siding/purple{
- dir = 4
- },
-/obj/structure/table,
-/obj/machinery/airalarm/directional/east,
-/obj/item/storage/box/gloves{
- pixel_x = 5;
- pixel_y = 1
- },
-/turf/open/floor/iron/showroomfloor{
- name = "lab floor"
- },
-/area/station/science/genetics)
-"abl" = (
-/obj/effect/mapping_helpers/airlock/access/all/science/rd,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/science{
- name = "Bedroom"
- },
-/turf/open/floor/iron/white/textured_half,
-/area/station/command/heads_quarters/rd)
-"abm" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/explab)
-"abs" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/half,
-/area/station/engineering/atmos/hfr_room)
-"abu" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/trash/garbage{
- spawn_loot_count = 3;
- spawn_scatter_radius = 1
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/aft)
-"abx" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/directional,
-/turf/open/floor/plating,
-/area/station/science/xenobiology/hallway)
-"abA" = (
-/obj/machinery/door/airlock/external{
- name = "Atmospherics External Access"
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "HFR"
- },
-/turf/open/floor/plating,
-/area/station/engineering/atmos/project)
-"abP" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/duct,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor4/starboard/fore)
-"abS" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/heavy,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor4/fore)
-"abU" = (
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"acj" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/holopad,
-/obj/effect/landmark/navigate_destination/dockarrival,
-/turf/open/floor/iron/textured_large,
-/area/station/hallway/secondary/entry)
-"acl" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/space/openspace,
-/area/space/nearstation)
-"acp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/security/holding_cell)
-"acq" = (
-/obj/structure/closet/emcloset,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 5
- },
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron,
-/area/station/hallway/floor2/aft)
-"act" = (
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron/white/textured_large,
-/area/station/service/chapel)
-"acu" = (
-/obj/effect/spawner/random/structure/closet_maintenance,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard/aft)
-"acv" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor/iron,
-/area/station/cargo/storage)
-"acC" = (
-/obj/effect/turf_decal/trimline/white/filled/line{
- color = "#065C93";
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/command/bridge)
-"acE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/structure/barricade,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/aft)
-"acF" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/structure/chair/office/light{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/explab)
-"acJ" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/chair/comfy{
- dir = 1
- },
-/obj/item/radio/intercom/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/science/breakroom)
-"acK" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard/fore)
-"acL" = (
-/obj/structure/table/wood,
-/obj/item/cigarette/cigar/cohiba,
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/blue/line,
-/turf/open/floor/carpet/blue,
-/area/station/command/meeting_room)
-"adq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/floor2/port)
-"adB" = (
-/obj/structure/closet/crate/bin{
- name = "biowaste bin"
- },
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/iron/white,
-/area/station/medical/surgery/aft)
-"adD" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/siding/yellow{
- dir = 9
- },
-/obj/item/flashlight/flare/candle,
-/turf/open/floor/carpet/orange,
-/area/station/service/chapel/office)
-"adL" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/engineering/tank,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/starboard/fore)
-"adT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red/half{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/security/brig)
-"aea" = (
-/obj/structure/railing{
- dir = 10
- },
-/obj/structure/ladder,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard)
-"aeb" = (
-/obj/effect/spawner/random/structure/grille,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard/aft)
-"aeg" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/green/full,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/service/bar)
-"aeu" = (
-/obj/machinery/power/terminal{
- dir = 1
- },
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/hollow/reinforced/directional{
- dir = 1
- },
-/obj/structure/girder,
-/turf/open/floor/plating,
-/area/station/maintenance/solars/port/aft)
-"aex" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/floor4/starboard)
-"aeF" = (
-/obj/machinery/conveyor_switch/oneway{
- id = "coffinbelt";
- name = "Coffin Dispenser";
- pixel_x = 8;
- pixel_y = 8
- },
-/turf/open/floor/carpet/orange,
-/area/station/service/chapel/funeral)
-"aeL" = (
-/obj/effect/spawner/random/trash/botanical_waste,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/port)
-"aeS" = (
-/obj/machinery/newscaster/directional/north,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
-/obj/structure/table/reinforced/rglass,
-/obj/item/storage/box/bodybags,
-/turf/open/floor/iron/dark,
-/area/station/medical/morgue)
-"aeW" = (
-/obj/structure/table/reinforced,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/clothing/kittyears_or_rabbitears,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/floor2/starboard/aft)
-"aeX" = (
-/obj/machinery/computer/robotics,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/siding{
- dir = 6
- },
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/rd)
-"afa" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/grille/broken,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/aft)
-"afb" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/science/auxlab)
-"afe" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 5
- },
-/turf/open/floor/plating,
-/area/station/construction)
-"afg" = (
-/obj/effect/turf_decal/trimline/yellow/corner{
- dir = 4
- },
-/obj/item/stack/sheet/iron/five{
- pixel_x = -6
- },
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/structure/frame/machine,
-/obj/item/stack/sheet/glass{
- amount = 12
- },
-/obj/item/stack/cable_coil/five,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/corner{
- dir = 4
- },
-/area/station/engineering/lobby)
-"afs" = (
-/obj/machinery/portable_atmospherics/canister/plasma,
-/obj/effect/turf_decal/trimline/purple,
-/turf/open/floor/engine/plasma,
-/area/station/engineering/atmos)
-"afv" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port)
-"afz" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 8
- },
-/obj/machinery/computer/rdconsole,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
-"afD" = (
-/obj/machinery/door/window/brigdoor/security/cell/left/directional/south{
- id = "cell-2";
- name = "2nd Floor Prisoner Tube"
- },
-/obj/machinery/disposal/delivery_chute{
- name = "prisoner transport"
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/security/checkpoint/second)
-"afE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/light/small/red/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/port)
-"agi" = (
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/aft)
-"agl" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/siding{
- dir = 6
- },
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/rd)
-"agn" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
-"agp" = (
-/obj/structure/disposalpipe/segment{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"ags" = (
-/obj/effect/spawner/random/engineering/tool,
-/turf/open/floor/plating/foam,
-/area/station/maintenance/floor1/port/aft)
-"agt" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/port/fore)
-"agK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/junction,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor4/fore)
-"agU" = (
-/obj/structure/chair/pew/left{
- dir = 4
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard)
-"agV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/structure/table_or_rack,
-/obj/effect/spawner/random/maintenance/two,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port)
-"ahd" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/obj/machinery/duct,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/starboard)
-"aho" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 9
- },
-/turf/open/space/basic,
-/area/space/nearstation)
-"aht" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
-"ahG" = (
-/obj/machinery/modular_computer/preset/research{
- dir = 4
- },
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/rd)
-"ahO" = (
-/obj/machinery/vending/clothing,
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/service/library/lounge)
-"ahS" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/structure/window/hollow/reinforced/directional,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard)
-"ahT" = (
-/obj/machinery/camera/directional/west,
-/turf/open/floor/wood,
-/area/station/service/kitchen/diner)
-"ahU" = (
-/obj/machinery/door/airlock/hatch{
- name = "Escape Pods"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor3/port/aft)
-"aib" = (
-/obj/machinery/firealarm/directional/east,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"aic" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/middle,
-/obj/structure/girder,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/starboard/fore)
-"aih" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison)
-"aik" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer4,
-/obj/machinery/meter/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"aim" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/structure/chair/comfy/black{
- dir = 1
- },
-/obj/structure/sign/departments/restroom/directional/east,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/hallway/floor3/fore)
-"aip" = (
-/obj/effect/turf_decal/siding/wideplating_new{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/purple/corner{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/cytology)
-"air" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/holopad,
-/obj/effect/turf_decal/trimline/green/end{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/aft)
-"ait" = (
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/item/pillow,
-/obj/effect/turf_decal/box,
-/obj/machinery/flasher/directional/west{
- id = "drunktank"
- },
-/turf/open/floor/iron/dark,
-/area/station/security/holding_cell)
-"aiw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/light/red/dim/directional/west,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port/aft)
-"aiF" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/white/arrow_ccw{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/entry)
-"aiL" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/service/chapel/funeral)
-"aiN" = (
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/circuitboard/aicore,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/siding{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/rd)
-"aiO" = (
-/obj/machinery/door/airlock/medical{
- name = "Operating Room X"
- },
-/obj/effect/mapping_helpers/airlock/access/any/medical/surgery,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/maintenance/floor3/starboard/aft)
-"aiR" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/hallway/floor2/fore)
-"aiS" = (
-/obj/structure/bed/double,
-/obj/machinery/light_switch/directional/north,
-/obj/effect/landmark/start/assistant,
-/obj/item/bedsheet/black/double,
-/obj/structure/sign/poster/random/directional/east,
-/turf/open/floor/carpet/neon/simple/white,
-/area/station/commons/dorms/room3)
-"ajb" = (
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"aje" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor2/aft)
-"ajg" = (
-/obj/item/stack/sheet/iron/five,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/engineering/supermatter/room)
-"ajp" = (
-/obj/item/rack_parts,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/aft)
-"ajs" = (
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/port)
-"ajt" = (
-/obj/item/stack/rods/fifty,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/delivery,
-/obj/structure/table,
-/turf/open/floor/iron/dark,
-/area/station/commons/storage/primary)
-"ajB" = (
-/obj/effect/spawner/random/trash/mopbucket,
-/obj/effect/spawner/random/trash/soap,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/fore)
-"ajE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/sink/directional/west,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/starboard)
-"ajX" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/green/line{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/aft)
-"akh" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"aki" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/port)
-"akk" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/disposaloutlet{
- dir = 1
- },
-/obj/structure/disposalpipe/trunk,
-/turf/open/space/basic,
-/area/space/nearstation)
-"akr" = (
-/obj/machinery/button/door/directional/south{
- id = "captain_privacy";
- name = "Privacy Shutters"
- },
-/obj/machinery/keycard_auth/wall_mounted/directional/east,
-/obj/structure/table/wood,
-/obj/item/book/manual/wiki/security_space_law,
-/obj/item/hand_tele,
-/turf/open/floor/wood/tile,
-/area/station/command/heads_quarters/captain/private)
-"akt" = (
-/obj/effect/turf_decal/tile/red/diagonal_edge,
-/obj/structure/closet/secure_closet/brig{
- name = "Prisoner Locker"
- },
-/turf/open/floor/iron/dark,
-/area/station/security/prison/visit)
-"akD" = (
-/obj/effect/turf_decal/trimline/green/filled/line,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
-"akI" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/wood,
-/area/station/commons/dorms/apartment2)
-"akU" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/vending/cola/pwr_game,
-/obj/structure/sign/poster/contraband/pwr_game/directional/north,
-/turf/open/floor/iron/white,
-/area/station/medical/break_room)
-"ala" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/starboard/fore)
-"alf" = (
-/obj/effect/turf_decal/tile/green/anticorner{
- dir = 1
- },
-/obj/machinery/vending/sovietsoda,
-/turf/open/floor/iron/dark/side{
- dir = 9
- },
-/area/station/hallway/secondary/exit/escape_pod)
-"alj" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 4
- },
-/obj/structure/sign/poster/official/random/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/engineering/storage/tech)
-"aln" = (
-/obj/effect/turf_decal/trimline/white/arrow_ccw,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/station/hallway/secondary/entry)
-"alr" = (
-/obj/effect/turf_decal/trimline/purple/filled/corner{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/fore)
-"alu" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/directional{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/science/xenobiology)
-"alK" = (
-/obj/machinery/modular_computer/preset/id{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/rd)
-"alL" = (
-/obj/machinery/light/floor,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/hallway/floor2/fore)
-"amg" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/camera/autoname/directional/south,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron/corner{
- dir = 1
- },
-/area/station/maintenance/solars/starboard/fore)
-"ami" = (
-/obj/effect/turf_decal/trimline/brown/arrow_ccw{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/cargo/lobby)
-"amm" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/brig)
-"ams" = (
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/machinery/atmospherics/components/binary/pump/on{
- name = "N2 to Airmix"
- },
-/obj/machinery/atmospherics/components/binary/pump/layer2,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"amt" = (
-/turf/closed/wall,
-/area/station/service/library/lounge)
-"amK" = (
-/obj/machinery/door/poddoor/shutters{
- id = "aux_base_shutters";
- name = "Auxiliary Base Shutters"
- },
-/turf/open/floor/plating,
-/area/station/construction/mining/aux_base)
-"amM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/blue,
-/obj/machinery/medical_kiosk,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
-"anb" = (
-/obj/machinery/vending/wardrobe/hydro_wardrobe,
-/obj/effect/turf_decal/tile/green/full,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
-"anf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/carpet/blue,
-/area/station/cargo/miningdock)
-"anj" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/warden)
-"ann" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/stairs{
- dir = 8
- },
-/area/station/cargo/storage)
-"ano" = (
-/obj/item/shard/plasma,
-/obj/structure/foamedmetal,
-/turf/open/floor/engine,
-/area/station/maintenance/floor1/port/aft)
-"anq" = (
-/obj/effect/turf_decal/tile/blue/half,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/visible/layer4,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/turf/open/floor/iron/edge,
-/area/station/engineering/atmos)
-"anr" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/circuits)
-"anA" = (
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/flashlight/lamp,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/siding,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/rd)
-"anF" = (
-/obj/structure/bed,
-/obj/item/bedsheet/cult,
-/obj/structure/sign/painting{
- pixel_y = 32
- },
-/obj/machinery/light_switch/directional/south,
-/obj/effect/landmark/start/librarian,
-/turf/open/floor/engine/cult,
-/area/station/service/library/private)
-"anH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark/corner{
- dir = 1
- },
-/area/station/hallway/secondary/exit/escape_pod)
-"anK" = (
-/obj/machinery/atmospherics/components/trinary/mixer/flipped{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/storage)
-"anN" = (
-/obj/structure/chair/office{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
-"anO" = (
-/obj/effect/spawner/random/contraband/landmine,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/turf/open/floor/iron,
-/area/station/maintenance/floor1/port/aft)
-"anU" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/floor,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"anW" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"aof" = (
-/obj/machinery/suit_storage_unit/radsuit,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/engineering/atmos/pumproom)
-"aog" = (
-/obj/effect/turf_decal/tile/yellow,
-/turf/open/floor/iron/white/side{
- dir = 4
- },
-/area/station/medical/pharmacy)
-"aoh" = (
-/obj/structure/chair/plastic,
-/turf/open/floor/iron/dark,
-/area/station/security/holding_cell)
-"aom" = (
-/obj/structure/railing,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/starboard/fore)
-"aoo" = (
-/obj/structure/closet/emcloset/anchored,
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/port/aft)
-"aoq" = (
-/obj/effect/mapping_helpers/burnt_floor,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos/project)
-"aos" = (
-/obj/effect/turf_decal/box/white{
- color = "#9FED58"
- },
-/turf/open/floor/engine,
-/area/station/engineering/atmos/hfr_room)
-"aow" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/landmark/start/scientist,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/lobby)
-"aoG" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/chair/office/light{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
-"aoM" = (
-/obj/structure/grille,
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/port)
-"aoW" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 8
- },
-/obj/structure/hedge,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
-"ape" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 8
- },
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
-"apg" = (
-/obj/structure/closet/secure_closet/security/sec,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/lockers)
-"apk" = (
-/obj/structure/sign/poster/contraband/random/directional/east,
-/obj/structure/chair/stool/bar/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/secondary/exit)
-"apl" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/carpet/orange,
-/area/station/service/chapel/funeral)
-"apm" = (
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/effect/turf_decal/trimline/red/arrow_cw{
- dir = 1
- },
-/turf/open/floor/mineral/plastitanium{
- desc = "cushioned to protect from rough landings";
- name = "boxing ring"
- },
-/area/station/commons/fitness)
-"apq" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Detective's Office"
- },
-/obj/machinery/airalarm/directional/west,
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/security/detectives_office)
-"apt" = (
-/obj/structure/table/reinforced,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"apw" = (
-/obj/effect/turf_decal/stripes,
-/obj/structure/sign/departments/psychology/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/medical/psychology)
-"apy" = (
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
-/area/station/hallway/secondary/entry)
-"apC" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/middle,
-/turf/open/floor/plating,
-/area/station/cargo/sorting)
-"apM" = (
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"apR" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/duct,
-/turf/open/floor/iron/dark,
-/area/station/security/brig)
-"apS" = (
-/obj/structure/mirror/directional/east,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/structure/sink/directional/west,
-/turf/open/floor/iron,
-/area/station/commons/dorms/room1)
-"apT" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 9
- },
-/turf/open/floor/carpet/blue,
-/area/station/command/meeting_room)
-"apX" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port)
-"aqd" = (
-/obj/structure/spider/stickyweb,
-/obj/structure/table,
-/obj/item/clothing/mask/facehugger/toy,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard)
-"aqm" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/railing,
-/obj/effect/turf_decal/box/red,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
-"aqu" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor4/fore)
-"aqx" = (
-/obj/effect/spawner/structure/window/hollow/end{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/port)
-"aqz" = (
-/obj/structure/table,
-/obj/item/storage/box/beakers{
- pixel_x = 2;
- pixel_y = 2
- },
-/obj/item/storage/box/syringes,
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics)
-"aqP" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron/textured_half{
- dir = 1
- },
-/area/station/cargo/sorting)
-"aqQ" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/science/robotics/lab)
-"aqR" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/railing/corner{
- dir = 1
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port/aft)
-"aqW" = (
-/obj/effect/turf_decal/trimline/green/filled/arrow_cw{
- dir = 1
- },
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/virology/isolation)
-"arq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sink/kitchen/directional/east,
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/security/prison)
-"art" = (
-/obj/effect/turf_decal/siding/thinplating_new,
-/obj/machinery/door/poddoor{
- id = "Secure Storage";
- name = "Secure Storage"
- },
-/turf/open/floor/plating,
-/area/station/engineering/lobby)
-"arE" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white/small,
-/area/station/commons/fitness/recreation)
-"arG" = (
-/obj/machinery/light/floor,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/hallway/floor1/fore)
-"arI" = (
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/engine,
-/area/station/engineering/atmos/hfr_room)
-"arM" = (
-/obj/effect/landmark/start/ai/secondary,
-/obj/item/radio/intercom/directional/north{
- freerange = 1;
- listening = 0;
- name = "Custom Channel";
- pixel_x = 8
- },
-/obj/item/radio/intercom/directional/east{
- freerange = 1;
- listening = 0;
- name = "Common Channel"
- },
-/obj/item/radio/intercom/directional/south{
- freerange = 1;
- frequency = 1447;
- listening = 0;
- name = "Private Channel";
- pixel_x = 8
- },
-/turf/open/floor/circuit/green,
-/area/station/ai_monitored/turret_protected/ai)
-"asb" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/structure/mirror/directional/north,
-/obj/effect/landmark/generic_maintenance_landmark,
-/obj/structure/sink/directional/south,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/captain/private)
-"asf" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/port)
-"ask" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/camera/directional/north{
- c_tag = "Medbay - Treatment Center";
- name = "medbay camera";
- network = list("ss13","medbay")
- },
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white/textured,
-/area/station/medical/treatment_center)
-"asl" = (
-/obj/machinery/door/window/left/directional/west{
- name = "Cargo Conveyor Access";
- req_access = list("cargo")
- },
-/obj/effect/turf_decal/siding/thinplating_new,
-/turf/open/floor/iron/smooth,
-/area/station/cargo/sorting)
-"ast" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/secondary/exit)
-"asw" = (
-/obj/machinery/telecomms/server/presets/science,
-/turf/open/floor/circuit/telecomms,
-/area/station/tcommsat/server)
-"asF" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor1/fore)
-"asL" = (
-/turf/closed/wall/r_wall,
-/area/station/construction)
-"asS" = (
-/turf/open/floor/bamboo/tatami/black,
-/area/station/commons/storage/art)
-"asU" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/port)
-"asV" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor/heavy,
-/obj/effect/mapping_helpers/airlock/access/any/service/kitchen,
-/obj/structure/cable,
-/obj/machinery/door/airlock/silver/glass{
- name = "Kitchen"
- },
-/turf/open/floor/iron/dark,
-/area/station/service/kitchen)
-"asZ" = (
-/obj/effect/turf_decal/trimline/green/line,
-/obj/effect/turf_decal/trimline/green/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/aft)
-"ata" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/starboard/aft)
-"ate" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/purple/corner{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/fore)
-"ati" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/door/airlock/science/glass{
- name = "Science East"
- },
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
-"ato" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/rack_parts,
-/obj/item/stack/cable_coil,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/fore)
-"atv" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/wood/large,
-/area/station/service/library/lounge)
-"atA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port)
-"atB" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/sign/warning/vacuum/external,
-/turf/open/floor/plating,
-/area/station/hallway/floor3/fore)
-"atK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 8
- },
-/area/station/maintenance/floor1/starboard/aft)
-"atL" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/structure/extinguisher_cabinet/directional/east,
-/turf/open/floor/wood/large,
-/area/station/service/library/artgallery)
-"atP" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "brig-entrance-aft"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
- id_tag = "outerbrig";
- name = "Brig Aft Entrance"
- },
-/obj/machinery/door/poddoor/preopen{
- id = "briglockdown";
- name = "Brig Lockdown"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/obj/machinery/scanner_gate/preset_guns,
-/turf/open/floor/iron/dark,
-/area/station/security/brig)
-"atT" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/flora/bush/flowers_br/style_random,
-/obj/structure/flora/bush/sparsegrass/style_random,
-/turf/open/floor/grass,
-/area/station/commons/storage/primary)
-"atU" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/floor2/fore)
-"atX" = (
-/obj/effect/spawner/random/trash/moisture_trap,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"aua" = (
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/brown/line{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
-"auc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/blue/filled/warning{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/medical/psychology)
-"aug" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/directional{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/cargo/miningdock)
-"aut" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/delivery/red,
-/turf/open/floor/iron/smooth,
-/area/station/construction)
-"auv" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/stripes{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- initialize_directions = 8;
- volume_rate = 200
- },
-/turf/open/floor/engine,
-/area/station/science/cytology)
-"aux" = (
-/obj/structure/lattice/catwalk,
-/turf/open/space/basic,
-/area/space/nearstation)
-"auD" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/airlock/public/glass{
- name = "Public Airlock"
- },
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/station/hallway/floor3/aft)
-"auF" = (
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/machinery/fax{
- fax_name = "Research Division";
- name = "Research Division Fax Machine";
- pixel_x = 1
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/lobby)
-"auJ" = (
-/obj/item/radio/intercom/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/security/checkpoint)
-"auK" = (
-/obj/item/kirbyplants/random,
-/turf/open/floor/wood,
-/area/station/command/meeting_room)
-"auN" = (
-/obj/machinery/door/airlock{
- id_tag = "dorms_4_bolts";
- name = "Standard Dorm 4"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/commons/dorms/room4)
-"auO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
-"auQ" = (
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 6
- },
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron,
-/area/station/hallway/floor2/fore)
-"auU" = (
-/obj/structure/hedge,
-/turf/open/floor/wood/tile,
-/area/station/science/lobby)
-"avf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/aft)
-"avg" = (
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer1{
- dir = 4
- },
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"avi" = (
-/obj/structure/hedge,
-/turf/open/floor/iron/white/corner{
- dir = 8
- },
-/area/station/science/lobby)
-"avk" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/chair/office{
- dir = 1
- },
-/obj/machinery/button/door/directional/west{
- id = "library2";
- name = "Library Shutters"
- },
-/turf/open/floor/carpet/red,
-/area/station/service/library)
-"avl" = (
-/obj/structure/chair/sofa/bench,
-/turf/open/floor/grass,
-/area/station/service/library/garden)
-"avm" = (
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/hallway/floor1/aft)
-"avp" = (
-/obj/machinery/atmospherics/components/binary/pump/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer1{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"avt" = (
-/obj/structure/chair/comfy/brown{
- dir = 4
- },
-/obj/item/toy/plush/moth{
- color = "#8e2e87";
- desc = "A strange moth plushie named Edict, it's dyed purple.";
- name = "Edict"
- },
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/wood,
-/area/station/medical/psychology)
-"avH" = (
-/obj/structure/table/glass,
-/obj/item/experi_scanner,
-/turf/open/floor/iron/white,
-/area/station/science/lower)
-"avM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/port/fore)
-"avP" = (
-/obj/effect/spawner/random/vending/colavend,
-/turf/open/floor/iron,
-/area/station/commons/fitness)
-"avX" = (
-/obj/machinery/camera/autoname/directional/north,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
-/obj/structure/table/reinforced/rglass,
-/obj/item/surgery_tray/full/morgue,
-/obj/machinery/digital_clock/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/medical/morgue)
-"awb" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
-/turf/open/floor/plating,
-/area/station/engineering/atmos)
-"awf" = (
-/obj/structure/girder,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"awn" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 4
- },
-/obj/machinery/camera/autoname/directional/east,
-/obj/machinery/status_display/ai/directional/east,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"awo" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
-/area/station/medical/abandoned)
-"awt" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/service/kitchen/diner)
-"awA" = (
-/obj/structure/table/reinforced,
-/obj/item/screwdriver,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"awD" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/floor,
-/turf/open/floor/iron,
-/area/station/engineering/atmos/office)
-"awH" = (
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/fore)
-"awR" = (
-/obj/structure/flora/bush/flowers_br/style_random,
-/obj/machinery/light/directional/west,
-/turf/open/floor/grass,
-/area/station/security/courtroom)
-"awU" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor3/port/aft)
-"awV" = (
-/obj/structure/sink/kitchen/directional/east,
-/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
-/area/station/service/kitchen/coldroom)
-"axe" = (
-/obj/machinery/firealarm/directional/west,
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/dark/side{
- dir = 9
- },
-/area/station/hallway/floor1/fore)
-"axf" = (
-/obj/effect/turf_decal/trimline/green/warning{
- dir = 1
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"axF" = (
-/obj/machinery/gateway/centerstation,
-/turf/open/floor/iron/large,
-/area/station/command/gateway)
-"axG" = (
-/obj/structure/chair/office{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"axK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/hatch{
- name = "Emergency Ladder Access"
- },
-/turf/open/floor/catwalk_floor,
-/area/station/hallway/floor2/fore)
-"axP" = (
-/obj/structure/closet/crate/large,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood,
-/area/station/maintenance/floor3/starboard/aft)
-"axQ" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/chair/comfy/brown{
- dir = 4
- },
-/obj/effect/landmark/start/psychologist,
-/obj/structure/sign/poster/official/random/directional/west,
-/turf/open/floor/carpet,
-/area/station/medical/psychology)
-"axR" = (
-/obj/structure/chair/stool/bar/directional/north,
-/obj/effect/landmark/start/scientist,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/lobby)
-"axS" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard)
-"axX" = (
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/tile/red/opposingcorners{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/office)
-"axY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/plate_press,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/machinery/camera/directional/east{
- c_tag = "Prison Workshop";
- network = list("ss13","prison")
- },
-/turf/open/floor/iron,
-/area/station/security/prison/work)
-"ayc" = (
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
-"ayi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/hop)
-"ayl" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/service/chapel)
-"ayv" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/turf_decal/arrows{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"ayB" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/smart/simple/green/visible,
-/turf/open/space/basic,
-/area/space/nearstation)
-"ayJ" = (
-/obj/structure/sign/warning/docking,
-/turf/closed/wall/r_wall,
-/area/station/security/execution/transfer)
-"ayU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/red/dim/directional/east,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/port)
-"ayW" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/red/corner,
-/obj/effect/turf_decal/stripes/red/corner{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/red/corner{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/red/corner{
- dir = 1
- },
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"aze" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port/fore)
-"azu" = (
-/obj/structure/table/wood,
-/obj/item/gun/ballistic/shotgun/doublebarrel,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/machinery/newscaster/directional/north,
-/obj/item/ammo_casing/shotgun/dart,
-/turf/open/floor/iron/checker,
-/area/station/service/bar)
-"azI" = (
-/obj/machinery/camera/autoname/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron/dark/side,
-/area/station/commons/storage/primary)
-"azK" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/structure/cable,
-/turf/open/floor/carpet/orange,
-/area/station/service/chapel/funeral)
-"azW" = (
-/obj/structure/bookcase/random/religion,
-/turf/open/floor/iron/white/textured_large,
-/area/station/service/chapel)
-"aAj" = (
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/floor3/aft)
-"aAx" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/camera/autoname/directional/north,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"aAB" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 10
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"aAE" = (
-/obj/structure/flora/bush/sparsegrass/style_random,
-/mob/living/basic/cow,
-/turf/open/floor/grass,
-/area/station/science/cytology)
-"aAK" = (
-/obj/structure/closet/firecloset,
-/obj/effect/turf_decal/trimline/purple/warning,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port)
-"aAM" = (
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/unres,
-/obj/effect/mapping_helpers/airlock/access/any/medical/morgue,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port)
-"aAZ" = (
-/obj/effect/turf_decal/siding/thinplating_new,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/smooth,
-/area/station/cargo/sorting)
-"aBa" = (
-/obj/effect/spawner/structure/window/hollow/middle{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/port/fore)
-"aBd" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/station/hallway/floor1/aft)
-"aBh" = (
-/obj/machinery/computer/atmos_control/nocontrol/incinerator{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/camera{
- c_tag = "Incinerator Camera North";
- network = list("ss13","engine")
- },
-/turf/open/floor/iron/dark,
-/area/station/maintenance/disposal/incinerator)
-"aBo" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port/fore)
-"aBK" = (
-/turf/closed/wall/r_wall,
-/area/station/medical/virology)
-"aBR" = (
-/obj/item/wrench,
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/aft)
-"aBS" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/white/smooth_edge{
- dir = 8
- },
-/area/station/science/robotics/lab)
-"aBV" = (
-/obj/effect/turf_decal/trimline/blue/end,
-/obj/effect/mapping_helpers/airlock/access/any/command/general,
-/obj/effect/mapping_helpers/airlock/unres,
-/obj/machinery/door/airlock/command/glass{
- name = "Queue Access"
- },
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "hopline";
- name = "Queue Shutters"
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor4/fore)
-"aCd" = (
-/obj/effect/turf_decal/siding/white,
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/cytology)
-"aCl" = (
-/obj/structure/table/reinforced,
-/obj/item/book/manual/wiki/chemistry,
-/obj/item/hand_labeler,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/pharmacy)
-"aCq" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/station/service/bar/atrium)
-"aCu" = (
-/obj/effect/spawner/random/trash/janitor_supplies,
-/obj/structure/rack,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/port/fore)
-"aCw" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/medical/office)
-"aCx" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/hallway/floor3/fore)
-"aCz" = (
-/obj/machinery/atmospherics/pipe/layer_manifold/orange/visible,
-/obj/effect/turf_decal/tile/yellow/half,
-/turf/open/floor/iron/edge,
-/area/station/engineering/atmos)
-"aCB" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "brig-entrance-aft"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/preopen{
- id = "briglockdown";
- name = "Brig Lockdown"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/airlock/security/glass{
- id_tag = "outerbrig";
- name = "Brig Aft Entrance"
- },
-/obj/effect/mapping_helpers/airlock/access/all/security/entrance,
-/turf/open/floor/iron,
-/area/station/security/brig)
-"aCG" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
-"aDf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
-"aDi" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/carpet/orange,
-/area/station/service/chapel/funeral)
-"aDk" = (
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard/fore)
-"aDl" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/exit/departure_lounge)
-"aDn" = (
-/obj/machinery/door/airlock/external{
- name = "External Airlock"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/external,
-/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/turf/open/floor/iron,
-/area/station/maintenance/floor4/starboard/fore)
-"aDp" = (
-/obj/structure/chair/comfy/black,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/cmo)
-"aDq" = (
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/floor4/port/aft)
-"aDx" = (
-/turf/open/floor/iron,
-/area/station/engineering/atmos/hfr_room)
-"aDC" = (
-/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible/layer2,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"aDD" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/visit)
-"aDE" = (
-/obj/structure/table/reinforced,
-/obj/item/radio{
- pixel_x = 5;
- pixel_y = 5
- },
-/obj/item/radio{
- pixel_x = -5;
- pixel_y = 5
- },
-/obj/item/radio,
-/turf/open/floor/iron/dark,
-/area/station/security/lockers)
-"aDM" = (
-/obj/item/bot_assembly/medbot,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"aDN" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood,
-/area/station/service/abandoned_gambling_den)
-"aDQ" = (
-/obj/structure/rack,
-/obj/item/wrench,
-/turf/open/floor/pod,
-/area/station/maintenance/floor4/port/fore)
-"aEh" = (
-/obj/effect/turf_decal/tile/red/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/office)
-"aEj" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor1/fore)
-"aEm" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/security/detectives_office)
-"aEq" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/machinery/camera/directional/east{
- c_tag = "Security - Interrogation Monitoring"
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/security/interrogation)
-"aEH" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/machinery/door/airlock/external{
- name = "External Airlock"
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/exit)
-"aEJ" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/red/arrow_ccw{
- dir = 8
- },
-/turf/open/floor/mineral/plastitanium{
- desc = "cushioned to protect from rough landings";
- name = "boxing ring"
- },
-/area/station/commons/fitness)
-"aEP" = (
-/obj/structure/chair/sofa/corp/left,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/captain)
-"aES" = (
-/obj/structure/table/wood,
-/obj/effect/spawner/random/food_or_drink/seed,
-/obj/effect/spawner/random/food_or_drink/seed,
-/turf/open/floor/grass,
-/area/station/service/library/garden)
-"aEW" = (
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/aft)
-"aFg" = (
-/obj/structure/cable/multilayer/multiz,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/starboard/fore)
-"aFh" = (
-/obj/item/radio/intercom/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"aFj" = (
-/turf/closed/wall/r_wall,
-/area/station/ai_monitored/turret_protected/aisat/service)
-"aFm" = (
-/obj/effect/turf_decal/tile/yellow/opposingcorners,
-/obj/machinery/airalarm/directional/south,
-/obj/structure/table/reinforced,
-/obj/item/gun/syringe,
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
-"aFs" = (
-/obj/structure/filingcabinet/chestdrawer,
-/turf/open/floor/iron/large,
-/area/station/science/robotics/lab)
-"aFB" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/science/lab)
-"aFJ" = (
-/obj/machinery/button/door/directional/north{
- id = "sm_bolt";
- name = "SM Chamber Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/turf/open/floor/engine,
-/area/station/engineering/supermatter)
-"aFM" = (
-/obj/machinery/light/directional/east,
-/obj/machinery/disposal/bin/tagger,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/security/office)
-"aFQ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/effect/turf_decal/delivery,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/maintenance/floor2/port/aft)
-"aFY" = (
-/obj/effect/spawner/random/trash/garbage{
- spawn_scatter_radius = 1
- },
-/turf/open/floor/pod,
-/area/station/maintenance/floor4/port/fore)
-"aGm" = (
-/obj/structure/chair/comfy/black{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 8
- },
-/turf/open/floor/carpet/blue,
-/area/station/command/meeting_room)
-"aGr" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/structure/table/reinforced/rglass,
-/obj/item/clothing/glasses/hud/health,
-/obj/item/clothing/glasses/hud/health{
- pixel_y = 3
- },
-/obj/item/clothing/glasses/hud/health{
- pixel_y = 6
- },
-/turf/open/floor/iron/white/textured,
-/area/station/medical/treatment_center)
-"aGw" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/security/office)
-"aGz" = (
-/obj/structure/table/wood,
-/obj/item/clipboard,
-/obj/item/toy/figure/qm,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/qm)
-"aGE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port/aft)
-"aGH" = (
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/starboard/fore)
-"aGI" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port/aft)
-"aGJ" = (
-/obj/structure/table,
-/obj/item/stack/sheet/iron/twenty,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/fore)
-"aGK" = (
-/obj/structure/railing{
- dir = 9
- },
-/obj/structure/chair/comfy/brown,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"aGQ" = (
-/turf/open/openspace,
-/area/station/maintenance/floor3/port)
-"aGW" = (
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Hatch"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 1
- },
-/obj/structure/barricade/wooden/crude,
-/turf/open/floor/iron,
-/area/station/maintenance/floor1/port/aft)
-"aHa" = (
-/obj/structure/chair/stool/bar/directional/north,
-/turf/open/floor/eighties,
-/area/station/commons/fitness/recreation/entertainment)
-"aHb" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"aHk" = (
-/turf/closed/wall,
-/area/station/medical/medbay/lobby)
-"aHn" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/construction)
-"aHo" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/security/office)
-"aHs" = (
-/obj/structure/table,
-/obj/item/storage/belt/utility/full,
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/turf/open/floor/iron,
-/area/station/science/auxlab)
-"aHt" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/aft)
-"aHA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light/small/red/directional/west,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/starboard/fore)
-"aHC" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/directional{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/prison/work)
-"aHK" = (
-/obj/machinery/light/directional/east,
-/obj/structure/closet/secure_closet/medical2,
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
-"aHM" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/spawner/random/structure/closet_empty/crate,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"aHP" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/brigdoor/right/directional/north{
- name = "Security Desk";
- req_access = list("security")
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/fore)
-"aHR" = (
-/obj/effect/landmark/start/depsec/science,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
-"aHV" = (
-/obj/structure/chair/stool/bar/directional/west,
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/science/auxlab)
-"aHW" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/port)
-"aHX" = (
-/obj/machinery/light/red/dim/directional/north,
-/turf/open/water/beach{
- desc = "Refreshing!";
- name = "treated water"
- },
-/area/station/maintenance/floor1/port/aft)
-"aHY" = (
-/obj/effect/turf_decal/tile/yellow/opposingcorners,
-/obj/structure/cable,
-/obj/machinery/vending/wardrobe/chem_wardrobe,
-/obj/structure/sign/poster/official/plasma_effects/directional/west,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
-"aId" = (
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/command/teleporter)
-"aIe" = (
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/openspace,
-/area/station/medical/pharmacy)
-"aIs" = (
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/aft)
-"aIB" = (
-/obj/structure/window/reinforced/plasma/spawner/directional/south,
-/obj/machinery/power/energy_accumulator/grounding_rod/anchored,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible/layer4,
-/turf/open/floor/plating,
-/area/station/engineering/supermatter)
-"aII" = (
-/obj/machinery/firealarm/directional/east,
-/obj/structure/bodycontainer/morgue{
- dir = 8
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/morgue)
-"aIJ" = (
-/obj/machinery/light/floor,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/hallway/floor2/aft)
-"aIU" = (
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/port)
-"aIV" = (
-/obj/structure/grille,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port)
-"aIY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/duct,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/turf/open/floor/iron/checker{
- dir = 1
- },
-/area/station/science/genetics)
-"aJb" = (
-/obj/effect/mapping_helpers/mail_sorting/service/chapel,
-/obj/effect/mapping_helpers/mail_sorting/service/dormitories,
-/obj/effect/mapping_helpers/mail_sorting/service/hop_office,
-/obj/effect/mapping_helpers/mail_sorting/service/hydroponics,
-/obj/effect/mapping_helpers/mail_sorting/service/janitor_closet,
-/obj/effect/mapping_helpers/mail_sorting/service/kitchen,
-/obj/effect/mapping_helpers/mail_sorting/service/law_office,
-/obj/effect/mapping_helpers/mail_sorting/service/library,
-/obj/effect/mapping_helpers/mail_sorting/service/theater,
-/obj/structure/disposalpipe/sorting/mail{
- dir = 4
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor3/fore)
-"aJk" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/fore)
-"aJD" = (
-/turf/open/floor/engine/xenobio,
-/area/station/science/xenobiology)
-"aJE" = (
-/obj/effect/turf_decal/delivery,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/textured_large,
-/area/station/cargo/storage)
-"aJT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/floor1/fore)
-"aJX" = (
-/obj/machinery/light/red/dim/directional/west,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/port/fore)
-"aJZ" = (
-/obj/item/instrument/banjo,
-/turf/open/floor/plating,
-/area/station/medical/abandoned)
-"aKc" = (
-/obj/effect/turf_decal/trimline/green/arrow_ccw{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/white/small,
-/area/station/commons/fitness/recreation)
-"aKi" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/station/maintenance/disposal/incinerator)
-"aKq" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/flora/bush/sparsegrass/style_random,
-/turf/open/floor/grass,
-/area/station/commons/storage/primary)
-"aKr" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port)
-"aKt" = (
-/obj/effect/spawner/random/structure/crate_abandoned,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"aKx" = (
-/turf/closed/wall/r_wall,
-/area/station/maintenance/floor3/starboard/aft)
-"aKA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron/white,
-/area/station/medical/office)
-"aKC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/hallway/floor2/fore)
-"aKF" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/medical/morgue)
-"aKQ" = (
-/turf/open/floor/iron/textured_half,
-/area/station/cargo/sorting)
-"aKZ" = (
-/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
- dir = 4
- },
-/obj/machinery/computer/atmos_control/plasma_tank,
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/obj/structure/window/reinforced/spawner/directional/north,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"aLb" = (
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Hatch"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/fore)
-"aLe" = (
-/obj/item/kirbyplants/random,
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/white/textured_large,
-/area/station/service/chapel)
-"aLh" = (
-/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer4,
-/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer2{
- dir = 9
- },
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/pumproom)
-"aLv" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/tile/green/full,
-/obj/structure/table/reinforced,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/service/bar)
-"aLz" = (
-/obj/effect/turf_decal/trimline/green/corner{
- dir = 4
- },
-/obj/structure/closet/secure_closet/personal,
-/turf/open/floor/iron/white/small,
-/area/station/commons/fitness/recreation)
-"aLA" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/camera/directional/north{
- c_tag = "Jim Norton's Quebecois Coffee"
- },
-/obj/structure/noticeboard/directional/north,
-/obj/item/reagent_containers/condiment/sugar{
- pixel_y = 4
- },
-/obj/item/storage/pill_bottle/happinesspsych{
- pixel_x = -4;
- pixel_y = -1
- },
-/obj/item/storage/box/coffeepack,
-/obj/item/storage/box/coffeepack/robusta,
-/obj/item/reagent_containers/condiment/soymilk,
-/obj/item/reagent_containers/condiment/milk,
-/obj/structure/closet/secure_closet/freezer/empty/open,
-/obj/item/storage/box/coffeepack,
-/obj/item/storage/box/coffeepack,
-/turf/open/floor/wood,
-/area/station/hallway/secondary/entry)
-"aLC" = (
-/obj/machinery/light/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron/showroomfloor,
-/area/station/commons/toilet)
-"aLO" = (
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron/smooth,
-/area/station/hallway/floor2/fore)
-"aLP" = (
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Hatch"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/port/fore)
-"aLU" = (
-/obj/machinery/disposal/bin,
-/obj/structure/railing{
- dir = 6
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/station/service/bar/atrium)
-"aLZ" = (
-/obj/structure/disposalpipe/junction{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/floor3/aft)
-"aMo" = (
-/obj/machinery/door/window/right/directional/south{
- name = "Gateway Access";
- req_access = list("gateway")
- },
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/white/corner,
-/obj/effect/turf_decal/stripes/white/corner{
- dir = 8
- },
-/obj/effect/turf_decal/arrows/white{
- dir = 1
- },
-/turf/open/floor/iron/large,
-/area/station/command/gateway)
-"aMA" = (
-/obj/effect/decal/cleanable/ash,
-/turf/open/floor/engine,
-/area/station/maintenance/floor1/port/aft)
-"aMJ" = (
-/obj/effect/spawner/structure/window/hollow/directional{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/port/aft)
-"aNm" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/green/filled/line,
-/turf/open/floor/iron/dark/textured,
-/area/station/hallway/floor2/aft)
-"aNs" = (
-/turf/closed/wall/r_wall,
-/area/station/maintenance/floor4/starboard/fore)
-"aNz" = (
-/obj/machinery/light_switch/directional/west,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/wood/large,
-/area/station/service/library/artgallery)
-"aNQ" = (
-/obj/structure/transit_tube/station/dispenser{
- dir = 4
- },
-/obj/structure/cable,
-/obj/structure/cable/layer3,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat)
-"aNV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 10
- },
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port)
-"aOa" = (
-/obj/structure/chair/comfy/shuttle,
-/turf/open/floor/mineral/plastitanium,
-/area/station/maintenance/floor2/starboard/aft)
-"aOp" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor2/aft)
-"aOt" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 1
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/commons/fitness)
-"aOw" = (
-/obj/machinery/light/small/directional/north,
-/mob/living/basic/bot/cleanbot,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat_interior)
-"aOx" = (
-/obj/machinery/griddle,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen)
-"aOD" = (
-/obj/effect/turf_decal/stripes{
- dir = 5
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/cargo/miningoffice)
-"aOI" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
- dir = 4
- },
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/structure/railing,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/hallway/floor1/aft)
-"aOJ" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/middle,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/aft)
-"aOV" = (
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/hallway/floor1/aft)
-"aPc" = (
-/obj/structure/stairs/north,
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/wood/tile,
-/area/station/service/library/lounge)
-"aPd" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/structure/cable,
-/turf/open/floor/circuit/green,
-/area/station/science/robotics/mechbay)
-"aPf" = (
-/obj/effect/turf_decal/siding/white,
-/obj/effect/turf_decal/trimline/purple/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/cytology)
-"aPg" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/commons/storage/primary)
-"aPh" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/structure/sign/poster/official/random/directional/east,
-/obj/machinery/camera/directional/east{
- c_tag = "Interrogation room";
- network = list("interrogation")
- },
-/turf/open/floor/iron/dark,
-/area/station/security/interrogation)
-"aPu" = (
-/obj/effect/turf_decal/stripes/end,
-/turf/open/floor/plating/reinforced{
- initial_gas_mix = "TEMP=2.7"
- },
-/area/station/science/ordnance/bomb)
-"aPA" = (
-/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/n2{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"aPE" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
-/obj/structure/disposalpipe/junction/yjunction{
- dir = 1
- },
-/obj/machinery/duct,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/central)
-"aPH" = (
-/obj/structure/flora/bush/sparsegrass/style_random,
-/turf/open/floor/grass,
-/area/station/service/hydroponics)
-"aPM" = (
-/obj/effect/turf_decal/tile/green/half{
- dir = 8
- },
-/turf/open/floor/iron/smooth_half{
- dir = 1
- },
-/area/station/hallway/secondary/entry)
-"aQk" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/table/wood,
-/turf/open/floor/carpet/red,
-/area/station/service/library/lounge)
-"aQt" = (
-/obj/structure/chair/sofa/bench/left{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 5
- },
-/obj/machinery/light/small/directional/west,
-/obj/machinery/camera/autoname/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/hallway/floor2/fore)
-"aQA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible,
-/obj/effect/turf_decal/trimline/yellow/line,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/telecomms,
-/area/station/tcommsat/server)
-"aQC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/wood/large,
-/area/station/service/library/lounge)
-"aQJ" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/black,
-/obj/item/clothing/gloves/color/black,
-/obj/item/clothing/glasses/meson/engine/tray,
-/obj/item/clothing/glasses/meson/engine/tray,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"aQK" = (
-/turf/closed/wall,
-/area/station/cargo/drone_bay)
-"aQL" = (
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/corner{
- dir = 4
- },
-/area/station/security/brig)
-"aQM" = (
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/obj/structure/table/reinforced,
-/obj/machinery/recharger,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/security/checkpoint/second)
-"aQR" = (
-/obj/effect/turf_decal/trimline/yellow/line,
-/obj/structure/railing,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"aQS" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/machinery/computer/records/security{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/office)
-"aQU" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/fore)
-"aQV" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/effect/spawner/random/structure/chair_maintenance{
- dir = 1
- },
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple{
- dir = 1
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/starboard)
-"aQW" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/siding/yellow{
- dir = 1
- },
-/obj/item/flashlight/lamp,
-/turf/open/floor/carpet/orange,
-/area/station/service/chapel/office)
-"aQZ" = (
-/obj/machinery/telecomms/server/presets/command,
-/turf/open/floor/circuit/telecomms,
-/area/station/tcommsat/server)
-"aRd" = (
-/obj/effect/turf_decal/box/corners{
- dir = 1
- },
-/turf/open/floor/engine/xenobio,
-/area/station/science/xenobiology)
-"aRz" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 1
- },
-/obj/effect/turf_decal/bot_white{
- color = "#74b2d3"
- },
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
-"aRF" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/tank/plasma,
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/disposal/incinerator)
-"aRI" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark/textured,
-/area/station/command/heads_quarters/ce)
-"aRK" = (
-/obj/machinery/modular_computer/preset/civilian{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
-"aRM" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/commons/dorms/apartment2)
-"aRP" = (
-/obj/machinery/power/turbine/core_rotor,
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/station/maintenance/disposal/incinerator)
-"aRS" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit)
-"aRU" = (
-/turf/closed/wall,
-/area/station/security/mechbay)
-"aRX" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/wood/end{
- dir = 4
- },
-/turf/open/floor/carpet/red,
-/area/station/service/library/artgallery)
-"aRY" = (
-/obj/structure/cable,
-/obj/machinery/power/solar,
-/turf/open/floor/iron/solarpanel/airless,
-/area/station/solars/port/aft)
-"aSb" = (
-/obj/structure/chair/stool/bar/directional/north,
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
-"aSg" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron,
-/area/station/maintenance/disposal/incinerator)
-"aSj" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/turf/open/water/no_planet_atmos{
- desc = "Filthy.";
- name = "untreated water"
- },
-/area/station/maintenance/floor1/port/aft)
-"aSq" = (
-/obj/machinery/rnd/production/protolathe/department/science,
-/obj/effect/turf_decal/bot,
-/obj/machinery/newscaster/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/science/lab)
-"aSs" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port)
-"aSu" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"aSB" = (
-/obj/effect/spawner/random/trash/cigbutt,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"aSI" = (
-/obj/machinery/shower/directional/west,
-/obj/structure/fluff/shower_drain,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron/white/small,
-/area/station/commons/fitness/recreation)
-"aSK" = (
-/obj/effect/spawner/random/structure/crate,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard/aft)
-"aSL" = (
-/obj/effect/turf_decal/bot,
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/smooth,
-/area/station/cargo/warehouse)
-"aSQ" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron,
-/area/station/commons/toilet)
-"aSU" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor4/starboard/fore)
-"aSX" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/closed/wall/r_wall,
-/area/station/science/ordnance/burnchamber)
-"aTc" = (
-/obj/effect/turf_decal/siding/white,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/paramedic)
-"aTh" = (
-/obj/structure/chair/office{
- dir = 8
- },
-/obj/effect/landmark/start/roboticist,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"aTi" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/decoration/carpet,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard)
-"aTj" = (
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/structure/barricade/wooden{
- name = "wooden barricade (KEEP OUT)"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/footprints{
- dir = 8
- },
-/turf/open/floor/wood,
-/area/station/service/abandoned_gambling_den)
-"aTl" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/structure/crate,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/fore)
-"aTJ" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/science/robotics/lab)
-"aTO" = (
-/obj/machinery/power/shuttle_engine/propulsion/burst{
- dir = 4
- },
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"aTU" = (
-/obj/effect/turf_decal/trimline/purple/line,
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/fore)
-"aUb" = (
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron,
-/area/station/hallway/floor1/aft)
-"aUe" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/green/warning{
- dir = 1
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"aUh" = (
-/turf/open/floor/grass,
-/area/station/science/genetics)
-"aUj" = (
-/obj/effect/turf_decal/siding/wideplating_new/end{
- dir = 4
- },
-/turf/open/floor/engine/airless,
-/area/station/solars/port/aft)
-"aUl" = (
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/obj/effect/mapping_helpers/airlock/unres,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/effect/mapping_helpers/airlock/access/any/medical/psychology,
-/turf/open/floor/catwalk_floor,
-/area/station/hallway/floor2/fore)
-"aUG" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/structure/table_or_rack,
-/obj/item/reagent_containers/pill/maintenance,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/aft)
-"aUH" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/bot,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/pod,
-/area/station/maintenance/floor4/starboard/aft)
-"aUJ" = (
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 1
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"aUR" = (
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor4/aft)
-"aUT" = (
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/random/structure/crate_abandoned,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
-"aUV" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/medical/morgue)
-"aVc" = (
-/obj/effect/spawner/random/structure/crate,
-/obj/machinery/light/directional/south,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/aft)
-"aVk" = (
-/obj/machinery/door/airlock/freezer{
- name = "Rec Room Showers"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white/small,
-/area/station/commons/fitness/recreation)
-"aVq" = (
-/obj/effect/turf_decal/tile/blue/half/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat/hallway)
-"aVr" = (
-/obj/structure/cable,
-/obj/machinery/power/solar_control{
- dir = 1;
- id = "portbowsolar";
- name = "Port Bow Solar Control"
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/solars/port/aft)
-"aVs" = (
-/turf/open/openspace,
-/area/station/maintenance/floor3/starboard)
-"aVD" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood/large,
-/area/station/medical/virology/isolation)
-"aVM" = (
-/obj/machinery/door/poddoor/shutters/radiation/preopen{
- id = "radshutsouth"
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/red/line,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/engineering/supermatter)
-"aVX" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/station/medical/surgery/aft)
-"aWa" = (
-/obj/item/kirbyplants/random,
-/obj/structure/sign/directions/evac/directional/east,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"aWc" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor2/aft)
-"aWd" = (
-/obj/effect/landmark/event_spawn,
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/commons/fitness)
-"aWe" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/starboard/fore)
-"aWf" = (
-/obj/item/experi_scanner,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/starboard/fore)
-"aWg" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood/large,
-/area/station/security/prison/safe)
-"aWj" = (
-/obj/structure/table/wood,
-/obj/machinery/chem_dispenser/drinks/beer{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood,
-/area/station/service/abandoned_gambling_den)
-"aWq" = (
-/obj/structure/table/optable,
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/security/prison/safe)
-"aWr" = (
-/obj/effect/turf_decal/trimline/yellow/warning,
-/turf/open/floor/pod/dark,
-/area/station/cargo/miningdock)
-"aWv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/turf/open/floor/iron,
-/area/station/security/prison)
-"aWw" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 10
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
-"aWy" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer4{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/maintenance/disposal/incinerator)
-"aWB" = (
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 6
- },
-/turf/open/floor/engine/hull,
-/area/space/nearstation)
-"aWE" = (
-/obj/structure/railing{
- dir = 1
- },
-/turf/open/misc/beach/sand,
-/area/station/hallway/floor2/fore)
-"aWH" = (
-/obj/machinery/door/airlock/grunge{
- name = "Mech Bay"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/science/robotics,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/smooth,
-/area/station/science/robotics/mechbay)
-"aWJ" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/science/cytology)
-"aWO" = (
-/obj/effect/turf_decal/trimline/green/filled/arrow_cw{
- dir = 9
- },
-/obj/structure/railing/corner,
-/obj/structure/sign/poster/official/random/directional/west,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/virology/isolation)
-"aWR" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/recharge_station,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/robotics/mechbay)
-"aWV" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/food_or_drink/condiment,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard)
-"aWZ" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/port/aft)
-"aXh" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/light/dim/directional/west,
-/turf/open/floor/carpet/red,
-/area/station/service/theater)
-"aXj" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"aXk" = (
-/obj/structure/table/wood,
-/obj/item/plate/large{
- pixel_y = 2
- },
-/obj/item/food/pizza/dank{
- pixel_y = 6
- },
-/obj/structure/sign/poster/contraband/pwr_game/directional/east,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/carpet/purple,
-/area/station/maintenance/floor1/port/aft)
-"aXq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/light/cold/no_nightlight/directional/north,
-/turf/open/floor/iron/white/side{
- dir = 4
- },
-/area/station/science/lobby)
-"aXC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/port/aft)
-"aXH" = (
-/obj/effect/turf_decal/tile/yellow/opposingcorners,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
-"aXN" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/green/arrow_ccw{
- dir = 1
- },
-/obj/machinery/camera/autoname/directional/south,
-/obj/structure/closet/secure_closet/personal,
-/turf/open/floor/iron/white/small,
-/area/station/commons/fitness/recreation)
-"aXO" = (
-/obj/item/trash/ready_donk,
-/obj/item/trash/candle,
-/obj/item/trash/can/food/envirochow{
- pixel_x = -7
- },
-/obj/item/trash/boritos/red{
- pixel_x = 4;
- pixel_y = 8
- },
-/obj/effect/decal/cleanable/garbage,
-/obj/effect/decal/cleanable/food/pie_smudge,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/aft)
-"aXR" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/medical/abandoned)
-"aXW" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/middle,
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/port)
-"aYa" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/textured_large,
-/area/station/hallway/secondary/exit/departure_lounge)
-"aYb" = (
-/obj/effect/turf_decal/trimline/red/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/red/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/airlock/public/glass{
- name = "Public Airlock"
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor4/aft)
-"aYd" = (
-/obj/effect/turf_decal/trimline/yellow/line{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"aYe" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor3/aft)
-"aYl" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/vending/wallmed/directional/south,
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/security/detectives_office)
-"aYq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port/aft)
-"aYs" = (
-/obj/machinery/power/shieldwallgen/xenobiologyaccess,
-/obj/effect/turf_decal/stripes{
- dir = 5
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/cytology)
-"aYv" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/medical/psychology)
-"aYy" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters{
- dir = 8;
- id = "mechbay";
- name = "Mech Bay Shutters"
- },
-/turf/open/floor/iron/smooth_half{
- dir = 1
- },
-/area/station/science/robotics/mechbay)
-"aYA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/door/airlock/public/glass{
- name = "Public Airlock"
- },
-/turf/open/floor/iron/dark/side{
- dir = 6
- },
-/area/station/hallway/floor2/fore)
-"aYB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/obj/machinery/light/small/directional/north,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/cryo)
-"aYJ" = (
-/obj/structure/cable,
-/obj/machinery/duct,
-/turf/open/floor/wood,
-/area/station/service/bar/atrium)
-"aYS" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/smooth,
-/area/station/construction)
-"aYU" = (
-/obj/structure/disposalpipe/sorting/mail/flip{
- dir = 8
- },
-/obj/effect/mapping_helpers/mail_sorting/medbay/chemistry,
-/obj/effect/mapping_helpers/mail_sorting/medbay/cmo_office,
-/obj/effect/mapping_helpers/mail_sorting/medbay/general,
-/obj/effect/mapping_helpers/mail_sorting/medbay/virology,
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor2/aft)
-"aZd" = (
-/obj/machinery/reagentgrinder,
-/obj/structure/table,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard)
-"aZl" = (
-/obj/structure/sign/poster/official/do_not_question/directional/south,
-/obj/effect/turf_decal/tile/dark_red/fourcorners,
-/turf/open/floor/iron,
-/area/station/security/brig)
-"aZm" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/item/grown/bananapeel,
-/obj/machinery/light/cold/no_nightlight/directional/south,
-/turf/open/floor/grass,
-/area/station/medical/virology)
-"aZn" = (
-/turf/open/floor/circuit/green,
-/area/station/science/robotics/mechbay)
-"aZp" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin/carbon,
-/obj/effect/spawner/random/trash/graffiti{
- pixel_y = 32
- },
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"aZq" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red/half{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/security/brig)
-"aZs" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/medical/morgue)
-"aZw" = (
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor3/port/fore)
-"aZA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/maintenance/floor2/starboard/aft)
-"aZC" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 1
- },
-/turf/open/floor/engine/hull,
-/area/space/nearstation)
-"aZF" = (
-/obj/structure/table/wood,
-/obj/item/toy/crayon/spraycan{
- pixel_x = -4
- },
-/obj/item/toy/crayon/spraycan,
-/obj/item/toy/crayon/spraycan{
- pixel_x = 4
- },
-/turf/open/floor/bamboo/tatami/black,
-/area/station/commons/storage/art)
-"aZI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/starboard/aft)
-"aZN" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/space/openspace,
-/area/space/nearstation)
-"aZW" = (
-/turf/closed/wall,
-/area/station/medical/treatment_center)
-"aZX" = (
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 9
- },
-/area/station/hallway/floor4/fore)
-"baa" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"bag" = (
-/obj/structure/table,
-/obj/item/paper/fluff/holodeck/disclaimer,
-/obj/item/storage/medkit/regular,
-/turf/open/floor/iron,
-/area/station/commons/fitness/recreation)
-"bam" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/station/hallway/floor2/fore)
-"bap" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/sign/departments/chemistry/pharmacy/directional/south,
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/stripes/white/corner,
-/obj/machinery/door/airlock/public/glass{
- name = "Public Airlock"
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor2/aft)
-"bau" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/purple/filled/corner{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
-"baA" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/smooth_edge{
- dir = 4
- },
-/area/station/science/robotics/mechbay)
-"bbb" = (
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 6
- },
-/turf/open/floor/iron/white,
-/area/station/maintenance/floor3/starboard/aft)
-"bbo" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/station/commons/storage/primary)
-"bbs" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/carpet,
-/area/station/service/abandoned_gambling_den)
-"bbv" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"bbE" = (
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/circuit/green,
-/area/station/science/robotics/mechbay)
-"bbI" = (
-/obj/structure/stairs/north,
-/obj/structure/sign/departments/science/alt/directional/west,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/hallway/floor2/aft)
-"bbK" = (
-/obj/machinery/door/airlock/science/glass{
- name = "Robotics Lab"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/science/robotics,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/science/robotics/lab)
-"bbL" = (
-/obj/structure/bonfire/prelit,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/aft)
-"bcb" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port/aft)
-"bcr" = (
-/obj/item/shard,
-/turf/open/floor/iron/dark/textured,
-/area/station/maintenance/floor2/starboard/aft)
-"bcx" = (
-/obj/effect/turf_decal/trimline/purple/warning{
- dir = 1
- },
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor2/fore)
-"bcC" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/purple{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/showroomfloor{
- name = "lab floor"
- },
-/area/station/science/genetics)
-"bcD" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/command/meeting_room)
-"bcH" = (
-/obj/effect/turf_decal/tile/purple/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/science/robotics/lab)
-"bcK" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/starboard)
-"bcR" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
-"bcZ" = (
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/iron/textured_large,
-/area/station/cargo/storage)
-"bde" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin,
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/wood/parquet,
-/area/station/commons/dorms/room2)
-"bdo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/sign/poster/contraband/random/directional/east,
-/obj/machinery/microwave{
- pixel_y = 6
- },
-/obj/structure/table,
-/turf/open/floor/catwalk_floor/iron,
-/area/station/cargo/miningdock)
-"bdx" = (
-/obj/structure/railing/corner,
-/obj/structure/chair/stool/bar/directional/east,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/wood,
-/area/station/service/bar/atrium)
-"bdC" = (
-/obj/structure/chair/bronze,
-/turf/open/floor/bronze/filled,
-/area/station/maintenance/floor1/starboard)
-"bdD" = (
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/siding/corner,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/rd)
-"bdN" = (
-/obj/structure/table,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/iron/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/pipe_dispenser,
-/obj/machinery/light/directional/east,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/construction/mining/aux_base)
-"bdR" = (
-/obj/effect/turf_decal/trimline/green/line,
-/obj/effect/turf_decal/trimline/green/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light/floor,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/fore)
-"beh" = (
-/turf/open/floor/iron,
-/area/station/commons/toilet)
-"bej" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/security/prison)
-"bel" = (
-/obj/structure/rack,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard)
-"bep" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/white/line{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
-"bet" = (
-/obj/machinery/vending/modularpc,
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/station/hallway/floor2/aft)
-"bew" = (
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/iron,
-/area/station/maintenance/floor4/starboard)
-"bex" = (
-/obj/machinery/door/airlock{
- name = "Unisex Restrooms"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/commons/toilet)
-"beB" = (
-/obj/structure/lattice,
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
- dir = 1
- },
-/turf/open/space/basic,
-/area/space/nearstation)
-"beE" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/fore)
-"beG" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
-"beM" = (
-/obj/machinery/vending/drugs,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/structure/sign/poster/official/random/directional/south,
-/turf/open/floor/iron/white/textured,
-/area/station/medical/medbay/central)
-"bfc" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/iron/white,
-/area/station/medical/abandoned)
-"bff" = (
-/obj/effect/turf_decal/siding/green{
- dir = 4
- },
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/obj/effect/mapping_helpers/airlock/access/any/supply/general,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
-"bfh" = (
-/obj/structure/chair/stool/bar/directional/south,
-/obj/effect/landmark/start/scientist,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/lobby)
-"bfj" = (
-/turf/open/openspace,
-/area/station/service/library)
-"bfk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"bfl" = (
-/obj/effect/turf_decal/bot,
-/obj/structure/reagent_dispensers/fueltank,
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/robotics/mechbay)
-"bfs" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/table/reinforced,
-/obj/item/assembly/prox_sensor{
- pixel_x = -6;
- pixel_y = -8
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = -7
- },
-/obj/item/assembly/prox_sensor{
- pixel_x = -8;
- pixel_y = 6
- },
-/obj/item/healthanalyzer{
- pixel_x = 3;
- pixel_y = 8
- },
-/obj/item/healthanalyzer{
- pixel_x = 4
- },
-/obj/item/healthanalyzer{
- pixel_x = 5;
- pixel_y = -6
- },
-/turf/open/floor/iron/white/smooth_large,
-/area/station/science/robotics/lab)
-"bfx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/fore)
-"bfC" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor1/aft)
-"bfM" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/requests_console/directional/west{
- department = "Chief Medical Officer's Desk";
- name = "Chief Medical Officer's Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/announcement,
-/obj/effect/mapping_helpers/requests_console/information,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/turf/open/floor/iron/stairs/left{
- dir = 1
- },
-/area/station/command/heads_quarters/cmo)
-"bfT" = (
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/door/airlock/command{
- name = "Teleporter Room"
- },
-/obj/effect/mapping_helpers/airlock/access/any/command/teleporter,
-/turf/open/floor/iron/dark,
-/area/station/command/teleporter)
-"bfW" = (
-/obj/effect/turf_decal/trimline/purple/warning{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor2/fore)
-"bfX" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit)
-"bgg" = (
-/obj/machinery/door/airlock/medical{
- name = "Safe Internment"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/any/medical/psychology,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/medical/psychology)
-"bgr" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured_corner,
-/area/station/maintenance/floor1/starboard/aft)
-"bgs" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/light/floor,
-/turf/open/floor/iron/dark/textured,
-/area/station/command/heads_quarters/ce)
-"bgw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/reagentgrinder,
-/obj/structure/table,
-/turf/open/floor/catwalk_floor/iron,
-/area/station/cargo/miningdock)
-"bgz" = (
-/obj/machinery/mech_bay_recharge_port{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/robotics/mechbay)
-"bgA" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/power/emitter/welded,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"bgH" = (
-/obj/structure/rack,
-/obj/item/toy/plush/plasmamanplushie{
- desc = "A stuffed toy that resembles your plasma coworkers. It is cute despite itself.";
- name = "Nitrous II"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/fore)
-"bgI" = (
-/obj/machinery/button/elevator/directional/south{
- id = "com_vator"
- },
-/obj/machinery/lift_indicator/directional/south{
- linked_elevator_id = "com_vator";
- pixel_y = -36
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/hallway/floor4/aft)
-"bgO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/textured_large,
-/area/station/cargo/miningdock)
-"bgQ" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/obj/structure/reflector/double,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"bhb" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/railing/corner,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/port/aft)
-"bhh" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor4/port/aft)
-"bho" = (
-/obj/item/statuebust,
-/turf/open/misc/beach/sand,
-/area/station/hallway/floor2/fore)
-"bhp" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/corner,
-/area/station/engineering/lobby)
-"bhz" = (
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 4
- },
-/obj/structure/marker_beacon/burgundy,
-/turf/open/floor/engine/hull,
-/area/space/nearstation)
-"bhF" = (
-/obj/machinery/chem_master,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/white,
-/area/station/medical/abandoned)
-"bhN" = (
-/obj/structure/cable,
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=3-2";
- location = "3-1"
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor3/fore)
-"bhW" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "disposals"
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 4
- },
-/obj/machinery/door/poddoor/shutters{
- id = "disposals-launch";
- name = "Disposals Launch"
- },
-/obj/structure/plasticflaps,
-/turf/open/floor/plating,
-/area/station/maintenance/disposal)
-"bhZ" = (
-/obj/structure/table/reinforced/rglass,
-/obj/item/clipboard,
-/obj/item/toy/figure/roboticist,
-/turf/open/floor/iron/large,
-/area/station/science/robotics/lab)
-"bid" = (
-/obj/machinery/computer/mech_bay_power_console,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/robotics/lab)
-"bie" = (
-/obj/structure/table,
-/obj/machinery/door/window/left/directional/west,
-/obj/machinery/door/poddoor/shutters{
- dir = 4;
- id = "visitation";
- name = "Visitation Shutters"
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/prison/visit)
-"bif" = (
-/obj/machinery/modular_computer/preset/civilian{
- dir = 4
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/robotics/lab)
-"bij" = (
-/obj/effect/turf_decal/stripes/white/line{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/construction)
-"bin" = (
-/obj/effect/turf_decal/trimline/green/warning{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor3/aft)
-"bir" = (
-/obj/effect/turf_decal/trimline/purple/warning{
- dir = 6
- },
-/obj/effect/spawner/random/engineering/canister,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/starboard)
-"biz" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/door/airlock/medical{
- name = "Paramedic Dispatch"
- },
-/obj/effect/mapping_helpers/airlock/access/any/medical/general,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/white/textured,
-/area/station/medical/paramedic)
-"biC" = (
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/port)
-"biD" = (
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/obj/structure/chair/office{
- dir = 1
- },
-/obj/machinery/button/door/directional/north{
- id = "roboprivacy";
- name = "Robotics Privacy Control";
- pixel_x = -24;
- req_access = list("robotics")
- },
-/obj/machinery/light_switch/directional/west{
- pixel_x = -52
- },
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"biH" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/obj/machinery/power/emitter/welded{
- dir = 1
- },
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"biJ" = (
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/misc/sandy_dirt,
-/area/station/science/cytology)
-"biM" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/effect/turf_decal/arrows{
- dir = 8
- },
-/obj/effect/turf_decal/arrows{
- dir = 4
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/turf/open/floor/carpet/red,
-/area/station/service/library)
-"biO" = (
-/obj/effect/spawner/structure/window/hollow/directional{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/port/aft)
-"biR" = (
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload)
-"biS" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/port)
-"biV" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/commons/dorms/apartment2)
-"biW" = (
-/obj/machinery/modular_computer/preset/civilian{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/white/line{
- dir = 8
- },
-/obj/machinery/newscaster/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/science/auxlab)
-"biZ" = (
-/obj/machinery/microwave/engineering/cell_included,
-/obj/structure/table/reinforced/rglass,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/turf/open/floor/iron/white/textured,
-/area/station/medical/break_room)
-"bja" = (
-/obj/machinery/vending/cigarette,
-/obj/machinery/camera/autoname/directional/west,
-/obj/machinery/light/directional/west,
-/turf/open/floor/wood,
-/area/station/command/meeting_room)
-"bjb" = (
-/obj/structure/cable,
-/turf/open/floor/plating/airless,
-/area/station/solars/starboard/aft)
-"bje" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit)
-"bjf" = (
-/obj/machinery/light/directional/east,
-/obj/effect/landmark/start/hangover,
-/obj/structure/flora/coconuts,
-/turf/open/misc/beach/sand,
-/area/station/hallway/floor2/fore)
-"bjg" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 9
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/engine,
-/area/station/maintenance/floor4/starboard/aft)
-"bjw" = (
-/obj/structure/table,
-/obj/machinery/computer/libraryconsole/bookmanagement,
-/turf/open/floor/wood/large,
-/area/station/security/prison/safe)
-"bjz" = (
-/obj/effect/spawner/random/structure/crate,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard)
-"bjC" = (
-/obj/structure/disposalpipe/segment,
-/obj/structure/lattice/catwalk,
-/turf/open/openspace,
-/area/station/maintenance/floor2/port/fore)
-"bjF" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/turf/open/floor/carpet,
-/area/station/medical/psychology)
-"bjI" = (
-/obj/structure/extinguisher_cabinet/directional/west,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"bjK" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/chair/sofa/middle/brown,
-/turf/open/floor/carpet/green,
-/area/station/service/bar/atrium)
-"bjP" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/grille/broken,
-/obj/structure/ladder,
-/turf/open/floor/plating,
-/area/station/hallway/floor2/aft)
-"bjT" = (
-/obj/machinery/computer{
- desc = "Barely powered, it's not working well.";
- name = "Flickering Nav Console"
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/mineral/plastitanium/red,
-/area/station/maintenance/floor4/starboard/aft)
-"bjZ" = (
-/obj/structure/chair/comfy/carp{
- dir = 8
- },
-/obj/effect/landmark/start/research_director,
-/obj/machinery/holopad,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/lobby)
-"bkd" = (
-/obj/structure/table/glass,
-/obj/item/hand_tele,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/command/teleporter)
-"bkh" = (
-/obj/effect/turf_decal/trimline/green/filled/line,
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
-"bkj" = (
-/obj/machinery/biogenerator,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/siding/green{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics/garden)
-"bks" = (
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/hallway/floor3/fore)
-"bku" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/effect/turf_decal/siding/white/corner,
-/obj/structure/railing/corner,
-/obj/machinery/vending/wardrobe/robo_wardrobe,
-/turf/open/floor/iron/white/side{
- dir = 10
- },
-/area/station/science/robotics/lab)
-"bkx" = (
-/obj/machinery/door/poddoor/shutters{
- id = "warehouseqm"
- },
-/obj/machinery/button/door/directional/north{
- id = "warehouseqm"
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
-/area/station/cargo/warehouse)
-"bkz" = (
-/obj/structure/flora/bush/sparsegrass/style_random,
-/obj/structure/window/spawner/directional/east,
-/obj/structure/window/spawner/directional/west,
-/turf/open/floor/grass,
-/area/station/hallway/secondary/exit/departure_lounge)
-"bkG" = (
-/obj/structure/railing{
- dir = 6
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 6
- },
-/turf/open/water/beach{
- desc = "Refreshing!";
- name = "treated water"
- },
-/area/station/maintenance/floor1/port/aft)
-"bkH" = (
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/obj/item/kirbyplants/random,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/fore)
-"bkM" = (
-/obj/effect/landmark/start/ai/secondary,
-/obj/item/radio/intercom/directional/north{
- freerange = 1;
- listening = 0;
- name = "Custom Channel";
- pixel_x = -8
- },
-/obj/item/radio/intercom/directional/west{
- freerange = 1;
- listening = 0;
- name = "Common Channel"
- },
-/obj/item/radio/intercom/directional/south{
- freerange = 1;
- frequency = 1447;
- listening = 0;
- name = "Private Channel";
- pixel_x = -8
- },
-/turf/open/floor/circuit/green,
-/area/station/ai_monitored/turret_protected/ai)
-"bkO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"bkR" = (
-/obj/effect/turf_decal/siding/white,
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/white/side,
-/area/station/science/robotics/lab)
-"bkT" = (
-/obj/machinery/newscaster/directional/west,
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/security/detectives_office)
-"bkU" = (
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
- dir = 4
- },
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
-"bkY" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/wardrobe/grey,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/port/fore)
-"blj" = (
-/obj/machinery/portable_atmospherics/canister/nitrogen,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron/dark/textured,
-/area/station/science/ordnance/storage)
-"bln" = (
-/obj/docking_port/stationary/random{
- dir = 2;
- name = "lavaland";
- shuttle_id = "pod_lavaland"
- },
-/obj/effect/turf_decal/stripes/line,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"blq" = (
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/hedge,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"blt" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plating,
-/area/station/maintenance/solars/port/aft)
-"blv" = (
-/obj/effect/turf_decal/siding/white,
-/obj/structure/railing/corner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white/side,
-/area/station/science/robotics/lab)
-"blw" = (
-/obj/structure/disposalpipe/junction/flip{
- dir = 4
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor3/fore)
-"blF" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"blH" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/siding/blue,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
-"blI" = (
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer2{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"blJ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/floor2/fore)
-"blK" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/station/hallway/floor1/fore)
-"blN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
-"blO" = (
-/obj/structure/railing/corner,
-/obj/effect/turf_decal/trimline/green/corner,
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/fore)
-"blS" = (
-/obj/effect/turf_decal/tile/green/half,
-/obj/structure/table,
-/obj/item/storage/bag/plants,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/service/hydroponics/garden)
-"blX" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted,
-/obj/effect/turf_decal/siding/white,
-/obj/structure/railing,
-/turf/open/floor/iron/white/side,
-/area/station/science/robotics/lab)
-"bmf" = (
-/obj/structure/window/spawner/directional/south,
-/obj/structure/closet/secure_closet/research_director,
-/turf/open/floor/carpet/green,
-/area/station/command/heads_quarters/rd)
-"bml" = (
-/obj/structure/lattice/catwalk,
-/obj/structure/ladder,
-/turf/open/floor/engine/hull/reinforced,
-/area/space/nearstation)
-"bmx" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 8
- },
-/obj/effect/turf_decal/tile/brown{
- dir = 4
- },
-/obj/machinery/rnd/production/techfab/department/cargo,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron/smooth,
-/area/station/cargo/office)
-"bmA" = (
-/obj/effect/turf_decal/siding/white/corner{
- dir = 8
- },
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/white/side,
-/area/station/science/robotics/lab)
-"bmD" = (
-/obj/machinery/status_display/ai/directional/north,
-/obj/machinery/door/airlock/public/glass{
- name = "Public Airlock"
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor4/fore)
-"bmE" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/maintenance/floor2/starboard/aft)
-"bmG" = (
-/obj/effect/turf_decal/tile/green/half,
-/obj/structure/table,
-/obj/item/cultivator,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/service/hydroponics/garden)
-"bmL" = (
-/obj/structure/chair/office,
-/turf/open/floor/iron/white/side,
-/area/station/science/robotics/lab)
-"bmN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Hatch"
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port/aft)
-"bmO" = (
-/obj/effect/turf_decal/trimline/neutral,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/machinery/duct,
-/turf/open/floor/iron/checker,
-/area/station/service/bar/atrium)
-"bmT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/landmark/navigate_destination/tcomms,
-/turf/open/floor/catwalk_floor/iron_smooth,
-/area/station/tcommsat/computer)
-"bna" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/turf/open/floor/iron/white/textured,
-/area/station/medical/office)
-"bne" = (
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/port/fore)
-"bnf" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"bnt" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/middle{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port/aft)
-"bnz" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/floor1/aft)
-"bnC" = (
-/obj/structure/bed/medical/anchored{
- dir = 1
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
-"bnL" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/hos)
-"bnN" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/item/radio/intercom/directional/south,
-/obj/structure/closet/secure_closet/security,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/first)
-"bnQ" = (
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/security/brig)
-"bnV" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/door/airlock/public/glass{
- name = "Public Airlock"
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/fore)
-"boa" = (
-/obj/effect/turf_decal/trimline/brown/filled/line,
-/obj/effect/turf_decal/trimline/brown/filled/mid_joiner,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light/directional/north,
-/turf/open/floor/carpet/red,
-/area/station/service/theater)
-"bof" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/starboard)
-"bom" = (
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/fore)
-"boq" = (
-/obj/structure/table/wood,
-/obj/item/storage/photo_album/chapel,
-/obj/effect/turf_decal/siding/yellow{
- dir = 1
- },
-/obj/item/storage/fancy/candle_box{
- pixel_x = -19;
- pixel_y = 5
- },
-/obj/machinery/requests_console/directional/north{
- department = "Chapel";
- name = "Chapel Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/assistance,
-/turf/open/floor/carpet/orange,
-/area/station/service/chapel/office)
-"bor" = (
-/obj/effect/spawner/random/vending/colavend,
-/turf/open/floor/iron/dark/side{
- dir = 5
- },
-/area/station/hallway/secondary/exit/departure_lounge)
-"bos" = (
-/obj/machinery/camera{
- c_tag = "Atmos Tank #5 - Plasma";
- dir = 1;
- network = list("ss13","engine")
- },
-/turf/open/floor/engine/plasma,
-/area/station/engineering/atmos)
-"boB" = (
-/obj/machinery/hydroponics/soil,
-/obj/item/shovel/spade,
-/turf/open/misc/dirt/jungle,
-/area/station/security/prison/garden)
-"boH" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/iron/stairs/left,
-/area/station/science/robotics/lab)
-"boI" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/stairs/right,
-/area/station/science/robotics/lab)
-"boL" = (
-/obj/machinery/rnd/destructive_analyzer,
-/obj/effect/turf_decal/bot,
-/obj/machinery/requests_console/directional/east{
- department = "Research Lab";
- name = "Research Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/ore_update,
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/effect/mapping_helpers/requests_console/announcement,
-/obj/effect/mapping_helpers/requests_console/information,
-/turf/open/floor/iron/dark,
-/area/station/science/lab)
-"boP" = (
-/obj/machinery/duct,
-/turf/open/floor/iron/dark/textured,
-/area/station/commons/fitness)
-"boS" = (
-/obj/effect/spawner/random/trash/botanical_waste,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/fore)
-"boY" = (
-/obj/machinery/atmospherics/pipe/multiz/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/multiz/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/fore)
-"bpd" = (
-/obj/machinery/camera/directional/south{
- c_tag = "Genetics Lab"
- },
-/obj/structure/flora/bush/sparsegrass/style_random,
-/turf/open/floor/grass,
-/area/station/service/library/garden)
-"bpq" = (
-/obj/machinery/vending/robotics,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/fore)
-"bpu" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/middle,
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/disposal/incinerator)
-"bpA" = (
-/obj/effect/turf_decal/siding/white{
- dir = 10
- },
-/obj/structure/railing{
- dir = 10
- },
-/obj/structure/table/reinforced/rglass,
-/obj/item/crowbar/mechremoval,
-/turf/open/floor/iron/large,
-/area/station/science/robotics/lab)
-"bpE" = (
-/obj/effect/spawner/random/trash/mess,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"bpF" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor4/starboard)
-"bpY" = (
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 5
- },
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology/hallway)
-"bqn" = (
-/obj/structure/closet/crate,
-/obj/item/reagent_containers/cup/bowl,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/reagent_containers/cup/bowl,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/kitchen/fork/plastic,
-/obj/item/storage/box/drinkingglasses,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/kitchen/spoon/plastic,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/knife/plastic,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/bag/tray/cafeteria,
-/obj/item/storage/box/drinkingglasses,
-/obj/machinery/light/directional/west,
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/security/prison)
-"bqs" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock{
- name = "Emergency Closet"
- },
-/turf/open/floor/plating,
-/area/station/security/prison)
-"bqu" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/tile/dark/half/contrasted{
- dir = 4
- },
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/fore)
-"bqx" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark/side,
-/area/station/commons/storage/primary)
-"bqF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/footprints,
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen/abandoned)
-"bqH" = (
-/obj/machinery/vending/cola,
-/turf/open/floor/iron/checker,
-/area/station/service/bar/atrium)
-"bqI" = (
-/obj/structure/window/spawner/directional/east,
-/turf/open/floor/grass,
-/area/station/maintenance/floor3/starboard)
-"bqQ" = (
-/obj/structure/closet/crate/freezer/blood{
- anchored = 1
- },
-/obj/effect/turf_decal/siding/white{
- dir = 10
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/office)
-"bqU" = (
-/obj/effect/turf_decal/trimline/blue,
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai)
-"brj" = (
-/turf/closed/wall,
-/area/station/hallway/secondary/entry)
-"brn" = (
-/obj/effect/turf_decal/tile/neutral{
- dir = 8
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/machinery/disposal/bin,
-/obj/machinery/airalarm/directional/north,
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/iron/dark,
-/area/station/science/breakroom)
-"brs" = (
-/obj/machinery/door/airlock/science/glass{
- name = "Laboratory A"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/all/science/research,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
-"bru" = (
-/obj/machinery/teleport/hub,
-/obj/effect/turf_decal/tile/blue/opposingcorners,
-/turf/open/floor/iron/dark,
-/area/station/command/teleporter)
-"brA" = (
-/obj/machinery/hydroponics/constructable,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/maintenance/floor1/port/aft)
-"brC" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"brN" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/directional,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/plating,
-/area/station/cargo/miningdock)
-"brT" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor4/port/fore)
-"bsl" = (
-/obj/item/stack/tile/iron/white,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/medical/abandoned)
-"bsu" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/hallway/secondary/entry)
-"bsv" = (
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/floor2/aft)
-"bsw" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/structure/chair/sofa/bench/left{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark/textured,
-/area/station/commons/fitness)
-"bsz" = (
-/obj/structure/closet/bombcloset,
-/obj/machinery/light/cold/no_nightlight/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
-"bsB" = (
-/obj/machinery/door/airlock/science{
- name = "Changing Room"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/turf/open/floor/iron/white,
-/area/station/science/lower)
-"bsC" = (
-/obj/effect/landmark/start/hangover,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=1-19";
- location = "1-18"
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor1/aft)
-"bsG" = (
-/obj/effect/decal/cleanable/blood/old,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port)
-"bsI" = (
-/obj/machinery/door/window/right/directional/north{
- name = "Infirmary"
- },
-/obj/machinery/duct,
-/turf/open/floor/iron/white/side{
- dir = 6
- },
-/area/station/security/medical)
-"bsK" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/iron/white/smooth_edge{
- dir = 8
- },
-/area/station/science/robotics/lab)
-"bsN" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor/heavy,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/fore)
-"bsQ" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/turf_decal/trimline/yellow,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor1/aft)
-"bsS" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/port/fore)
-"bsV" = (
-/obj/effect/turf_decal/tile/red,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/corner,
-/area/station/security/brig)
-"bsX" = (
-/obj/structure/table/reinforced/rglass,
-/obj/item/clothing/gloves/latex,
-/obj/item/clothing/glasses/science,
-/obj/item/healthanalyzer,
-/obj/item/clothing/glasses/hud/health,
-/obj/machinery/requests_console/directional/north{
- department = "Virology";
- name = "Virology Requests Console"
- },
-/turf/open/floor/iron/dark,
-/area/station/medical/virology)
-"bta" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/command/teleporter)
-"btp" = (
-/obj/structure/table,
-/obj/item/storage/backpack/science{
- pixel_y = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/lower)
-"btq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port/fore)
-"bts" = (
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor3/starboard)
-"btt" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/white/smooth_edge{
- dir = 4
- },
-/area/station/science/robotics/lab)
-"btC" = (
-/obj/effect/turf_decal/trimline/green/warning{
- dir = 1
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard/fore)
-"btL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/corner{
- dir = 8
- },
-/area/station/commons/storage/primary)
-"btN" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/hallway/secondary/entry)
-"btP" = (
-/obj/effect/spawner/random/structure/crate_loot,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard/fore)
-"btT" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/station/hallway/floor4/fore)
-"btU" = (
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
- dir = 4
- },
-/obj/machinery/status_display/ai/directional/east,
-/obj/machinery/camera/directional/east{
- c_tag = "MiniSAT Access"
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat/hallway)
-"btV" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark/side{
- dir = 9
- },
-/area/station/hallway/floor1/fore)
-"btW" = (
-/obj/effect/turf_decal/tile/purple/full,
-/obj/effect/turf_decal/bot,
-/obj/effect/landmark/start/roboticist,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/science/robotics/lab)
-"bun" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/secondary/entry)
-"buu" = (
-/obj/machinery/door/airlock/medical{
- name = "Operating Room"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/science/robotics,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/showroomfloor{
- name = "lab floor"
- },
-/area/station/science/robotics/lab)
-"buB" = (
-/obj/structure/closet/emcloset,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/port/aft)
-"buC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light_switch/directional/west,
-/obj/structure/chair/wood{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/wood/large,
-/area/station/maintenance/floor4/starboard/aft)
-"buI" = (
-/obj/machinery/door/window/brigdoor/right/directional/south{
- name = "Security Desk";
- req_access = list("security")
- },
-/obj/machinery/door/firedoor,
-/obj/structure/table/reinforced,
-/obj/structure/cable,
-/obj/structure/desk_bell{
- pixel_x = -3;
- pixel_y = 2
- },
-/turf/open/floor/iron,
-/area/station/security/checkpoint)
-"buJ" = (
-/obj/machinery/portable_atmospherics/canister,
-/obj/effect/turf_decal/trimline/brown,
-/turf/open/floor/engine/vacuum,
-/area/station/engineering/atmos)
-"buP" = (
-/obj/effect/spawner/random/vending/snackvend,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"buQ" = (
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible{
- dir = 9
- },
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/pumproom)
-"buR" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/structure/chair{
- dir = 1
- },
-/turf/open/floor/iron/white/textured,
-/area/station/medical/treatment_center)
-"bvc" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"bvf" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor/iron,
-/area/station/cargo/storage)
-"bvi" = (
-/obj/effect/decal/cleanable/blood/innards{
- pixel_x = -2;
- pixel_y = 8
- },
-/obj/effect/decal/cleanable/blood/old,
-/obj/structure/sink/directional/south{
- pixel_x = 9
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"bvq" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard)
-"bvx" = (
-/obj/structure/table,
-/obj/item/clothing/under/plasmaman/science{
- pixel_x = 2;
- pixel_y = -7
- },
-/obj/item/clothing/suit/hooded/wintercoat/science{
- pixel_x = 6;
- pixel_y = -3
- },
-/obj/item/clothing/suit/hooded/wintercoat/science,
-/obj/item/clothing/suit/hooded/wintercoat/science{
- pixel_x = -6;
- pixel_y = 3
- },
-/obj/item/clothing/head/helmet/space/plasmaman/science{
- pixel_x = 6;
- pixel_y = 9
- },
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron/white,
-/area/station/science/lower)
-"bvC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 5
- },
-/obj/structure/disposalpipe/trunk/multiz{
- dir = 8
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/aft)
-"bvF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/holopad,
-/obj/effect/landmark/start/bartender,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/structure/cable,
-/turf/open/floor/iron/checker,
-/area/station/service/bar)
-"bvG" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/hallway/secondary/entry)
-"bvL" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/masks{
- pixel_x = -5;
- pixel_y = 3
- },
-/obj/item/storage/box/gloves{
- pixel_x = 5;
- pixel_y = 3
- },
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/turf/open/floor/iron/white/textured,
-/area/station/medical/office)
-"bvM" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor4/starboard)
-"bvO" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/newscaster/directional/south,
-/obj/structure/railing{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"bvP" = (
-/obj/effect/turf_decal/siding/white{
- dir = 10
- },
-/turf/open/floor/mineral/silver,
-/area/station/service/chapel/funeral)
-"bvR" = (
-/obj/structure/chair/comfy,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/carpet/red,
-/area/station/commons/dorms/room1)
-"bvT" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/smart/simple/orange/visible,
-/turf/open/floor/plating,
-/area/station/engineering/atmos/pumproom)
-"bvU" = (
-/obj/effect/spawner/random/structure/grille,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/fore)
-"bwl" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
- dir = 6
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/engineering/atmos/pumproom)
-"bwu" = (
-/obj/effect/turf_decal/trimline/blue/arrow_ccw{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/blue/arrow_cw{
- dir = 8
- },
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor4/fore)
-"bwx" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"bwz" = (
-/obj/structure/table/wood,
-/obj/machinery/light_switch/directional/east,
-/obj/item/toy/figure/curator,
-/obj/machinery/requests_console/directional/south{
- department = "Library";
- name = "Library Requests Console"
- },
-/obj/machinery/camera/autoname/directional/east,
-/turf/open/floor/carpet/red,
-/area/station/service/library)
-"bwA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor4/starboard)
-"bwE" = (
-/obj/structure/sign/poster/official/random/directional/east,
-/obj/machinery/cryo_cell{
- dir = 8
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/cryo)
-"bwF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red/half,
-/turf/open/floor/iron/dark/side,
-/area/station/security/brig)
-"bwK" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard/aft)
-"bwL" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/port/aft)
-"bwS" = (
-/obj/effect/turf_decal/trimline/red/filled/end{
- dir = 4
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"bwZ" = (
-/obj/structure/girder,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/aft)
-"bxb" = (
-/obj/effect/turf_decal/trimline/neutral/warning{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/ai_monitored/command/storage/eva)
-"bxc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/airalarm/directional/south,
-/obj/structure/table/wood/fancy/blue,
-/obj/item/toy/figure/captain{
- pixel_x = -1;
- pixel_y = 3
- },
-/obj/item/lighter{
- pixel_x = 8
- },
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/captain)
-"bxd" = (
-/obj/structure/table,
-/obj/machinery/airalarm/directional/north,
-/obj/item/paper_bin,
-/turf/open/floor/iron,
-/area/station/engineering/atmos/office)
-"bxe" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/side{
- dir = 6
- },
-/area/station/command/bridge)
-"bxf" = (
-/obj/effect/turf_decal/bot,
-/turf/open/floor/engine,
-/area/station/maintenance/floor1/starboard/fore)
-"bxk" = (
-/obj/structure/rack,
-/obj/item/toy/crayon/spraycan/roboticist,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/science/robotics/lab)
-"bxl" = (
-/turf/closed/wall,
-/area/station/commons/dorms/room1)
-"bxr" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/machinery/conveyor_switch/oneway{
- id = "robo1"
- },
-/obj/structure/sign/poster/official/random/directional/west,
-/turf/open/floor/iron/white/smooth_large,
-/area/station/science/robotics/lab)
-"bxs" = (
-/obj/structure/rack,
-/obj/item/storage/briefcase{
- pixel_x = -3;
- pixel_y = 2
- },
-/obj/item/storage/briefcase/secure{
- pixel_x = 2;
- pixel_y = -2
- },
-/obj/item/clothing/glasses/sunglasses,
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 8
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/wood/parquet,
-/area/station/service/lawoffice)
-"bxE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/spawner/random/engineering/tracking_beacon,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/floor2/aft)
-"bxG" = (
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/smooth,
-/area/station/construction)
-"bxH" = (
-/obj/structure/flora/rock/pile,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/fakebasalt,
-/area/station/maintenance/floor3/port)
-"bxT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 4
- },
-/area/station/maintenance/floor1/starboard/aft)
-"bxZ" = (
-/obj/machinery/conveyor{
- dir = 1;
- id = "robo1"
- },
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"byc" = (
-/obj/machinery/door/airlock/hatch{
- name = "Elevator Shaft Access"
- },
-/obj/effect/mapping_helpers/airlock/unres,
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/turf/open/floor/plating,
-/area/station/hallway/floor1/fore)
-"byi" = (
-/obj/machinery/status_display/evac/directional,
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/station/hallway/secondary/exit/departure_lounge)
-"byk" = (
-/obj/effect/turf_decal/tile/blue/half{
- dir = 8
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/iron/textured_edge{
- dir = 8
- },
-/area/station/medical/chemistry)
-"byl" = (
-/obj/structure/ladder,
-/obj/effect/turf_decal/trimline/neutral/warning,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/starboard/aft)
-"byE" = (
-/obj/structure/table,
-/turf/open/floor/iron,
-/area/station/security/prison)
-"byH" = (
-/obj/machinery/conveyor{
- dir = 1;
- id = "robo2"
- },
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"byI" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/machinery/conveyor_switch/oneway{
- id = "robo2"
- },
-/turf/open/floor/iron/white/smooth_large,
-/area/station/science/robotics/lab)
-"byK" = (
-/turf/open/floor/iron/stairs{
- dir = 4
- },
-/area/station/service/bar/atrium)
-"byW" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/turf/open/floor/iron/white,
-/area/station/medical/storage)
-"byX" = (
-/obj/machinery/computer/monitor,
-/turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/aisat/service)
-"byY" = (
-/obj/structure/dresser,
-/obj/machinery/camera/directional/west{
- c_tag = "Command - Research Director's Quarters #2"
- },
-/turf/open/floor/carpet/green,
-/area/station/command/heads_quarters/rd)
-"bza" = (
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/engineering/storage/tech)
-"bzm" = (
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen/abandoned)
-"bzw" = (
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor1/fore)
-"bzy" = (
-/obj/effect/turf_decal/tile/green/full,
-/obj/structure/sink/kitchen/directional/south,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/service/bar)
-"bzB" = (
-/mob/living/basic/slime,
-/turf/open/floor/engine/xenobio,
-/area/station/science/xenobiology)
-"bzF" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/table/reinforced,
-/obj/effect/spawner/random/bureaucracy/folder,
-/obj/effect/spawner/random/bureaucracy/pen,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 1;
- id = "lockers";
- name = "Locker Room Shutters"
- },
-/turf/open/floor/iron/dark,
-/area/station/commons/locker)
-"bzJ" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/desk_bell{
- pixel_x = -3;
- pixel_y = 2
- },
-/turf/open/floor/carpet/red,
-/area/station/service/library)
-"bzM" = (
-/obj/structure/reagent_dispensers/plumbed{
- dir = 1
- },
-/turf/open/floor/pod,
-/area/station/maintenance/floor4/port/aft)
-"bzO" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/obj/structure/chair/comfy/brown{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet/directional/east,
-/obj/machinery/camera/directional/east{
- c_tag = "Science - Study"
- },
-/turf/open/floor/iron/grimy,
-/area/station/science/xenobiology/hallway)
-"bzW" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor3/aft)
-"bAb" = (
-/obj/structure/sign/poster/contraband/atmosia_independence/directional/west,
-/obj/machinery/light/small/directional/west,
-/obj/machinery/light_switch/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/wood/parquet,
-/area/station/maintenance/floor2/port/aft)
-"bAc" = (
-/obj/machinery/conveyor/inverted{
- dir = 10;
- id = "robo1"
- },
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"bAe" = (
-/obj/structure/rack,
-/obj/machinery/ecto_sniffer,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/port/aft)
-"bAf" = (
-/obj/machinery/camera/autoname/directional/east,
-/obj/structure/sign/directions/evac/directional/east{
- dir = 2
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/floor3/aft)
-"bAj" = (
-/obj/machinery/conveyor{
- dir = 9;
- id = "robo2"
- },
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"bAk" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/yellow/line,
-/obj/effect/turf_decal/trimline/yellow/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/aft)
-"bAq" = (
-/obj/effect/turf_decal/trimline/green/filled/arrow_cw{
- dir = 5
- },
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/virology/isolation)
-"bAx" = (
-/obj/machinery/light/directional/south,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
-"bAG" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor4/port)
-"bAL" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron,
-/area/station/cargo/miningdock)
-"bAP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/maintenance/floor2/starboard)
-"bBg" = (
-/obj/structure/bed/medical/emergency,
-/obj/machinery/iv_drip,
-/obj/effect/decal/cleanable/blood/old,
-/obj/machinery/light/cold/directional/south,
-/turf/open/floor/iron/white,
-/area/station/security/medical)
-"bBx" = (
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron,
-/area/station/hallway/floor1/fore)
-"bBK" = (
-/obj/effect/turf_decal/trimline/green/filled/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
-"bBP" = (
-/obj/effect/turf_decal/trimline/green/warning{
- dir = 8
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor3/starboard)
-"bBS" = (
-/obj/structure/chair/plastic,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/port/aft)
-"bBV" = (
-/obj/effect/turf_decal/trimline/green/arrow_cw{
- dir = 8
- },
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/obj/machinery/computer/order_console/mining,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"bCd" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/structure/table/reinforced/rglass,
-/obj/item/reagent_containers/chem_pack{
- pixel_x = -4;
- pixel_y = 2
- },
-/obj/item/reagent_containers/chem_pack{
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/item/reagent_containers/chem_pack{
- pixel_y = 3
- },
-/obj/item/clothing/neck/stethoscope{
- pixel_y = 4
- },
-/obj/item/reagent_containers/cup/bottle{
- pixel_x = -2
- },
-/obj/item/reagent_containers/cup/bottle{
- pixel_x = 2
- },
-/obj/effect/turf_decal/bot_white{
- color = "#74b2d3"
- },
-/turf/open/floor/iron/white/textured,
-/area/station/medical/treatment_center)
-"bCk" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/engineering/tool,
-/turf/open/floor/wood,
-/area/station/commons/vacant_room/office)
-"bCo" = (
-/obj/effect/turf_decal/trimline/green/filled/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/wood/tile,
-/area/station/service/library/lounge)
-"bCp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/central)
-"bCq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor4/fore)
-"bCr" = (
-/obj/structure/disposalpipe/trunk/multiz{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port)
-"bCz" = (
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/iron,
-/area/station/cargo/lobby)
-"bCG" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
-"bCR" = (
-/obj/structure/disposalpipe/trunk/multiz{
- dir = 8
- },
-/obj/structure/grille,
-/obj/structure/window/reinforced/tinted/frosted/spawner/directional/east,
-/turf/open/floor/plating,
-/area/station/cargo/bitrunning/den)
-"bCT" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard)
-"bCW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/engineering/material,
-/obj/structure/table/wood,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
-"bCX" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/rods/ten,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"bDg" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/requests_console/directional/south{
- department = "Mining";
- name = "Mining Requests Console"
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"bDm" = (
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/entry)
-"bDn" = (
-/obj/effect/turf_decal/stripes{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/testlab)
-"bDr" = (
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard/fore)
-"bDC" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
-"bDD" = (
-/obj/effect/spawner/random/structure/crate,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/starboard/fore)
-"bDL" = (
-/turf/closed/wall/r_wall,
-/area/station/security/checkpoint)
-"bDU" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/table/reinforced,
-/obj/item/paper_bin{
- pixel_x = 1;
- pixel_y = 2
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 1;
- id = "lockers";
- name = "Locker Room Shutters"
- },
-/turf/open/floor/iron/dark,
-/area/station/commons/locker)
-"bDV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/side,
-/area/station/command/bridge)
-"bED" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical{
- pixel_x = -2;
- pixel_y = 8
- },
-/obj/item/cigbutt/cigarbutt{
- pixel_x = 7
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/iron/dark/smooth_half,
-/area/station/cargo/bitrunning/den)
-"bEK" = (
-/obj/structure/holosign/barrier,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"bEQ" = (
-/obj/structure/table/wood,
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/carpet/green,
-/area/station/commons/dorms/apartment2)
-"bET" = (
-/obj/effect/turf_decal/trimline/blue/warning{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"bEV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat/service)
-"bFd" = (
-/turf/open/floor/wood/large,
-/area/station/command/heads_quarters/qm)
-"bFf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/firedoor,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port/aft)
-"bFq" = (
-/obj/machinery/light/red/dim/directional/north,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard/fore)
-"bFD" = (
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/hallway/floor1/fore)
-"bFH" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/floor2/aft)
-"bFI" = (
-/obj/machinery/door/window/left/directional/south{
- name = "Inner Pipe Access";
- req_access = list("atmospherics")
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/visible/layer4{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"bFM" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/directional{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
-"bGb" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/table/wood,
-/obj/machinery/computer/libraryconsole/bookmanagement{
- dir = 8
- },
-/turf/open/floor/carpet/red,
-/area/station/service/library)
-"bGc" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/port)
-"bGf" = (
-/turf/open/water/beach{
- desc = "Refreshing!";
- name = "treated water"
- },
-/area/station/maintenance/floor1/port/aft)
-"bGh" = (
-/obj/effect/spawner/random/engineering/atmospherics_portable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor3/port/aft)
-"bGl" = (
-/obj/structure/table/reinforced/plastitaniumglass,
-/obj/machinery/light/small/red/directional/north,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard/fore)
-"bGn" = (
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/fore)
-"bGs" = (
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/duct,
-/turf/open/floor/iron/dark,
-/area/station/security/lockers)
-"bGt" = (
-/obj/effect/turf_decal/trimline/neutral/warning{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/ai_monitored/command/storage/eva)
-"bGV" = (
-/obj/machinery/door/window/brigdoor/left/directional/north,
-/mob/living/basic/pet/fox,
-/turf/open/floor/noslip,
-/area/station/maintenance/floor1/port)
-"bHw" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/highsecurity{
- name = "Secure Tech"
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
-/turf/open/floor/iron/dark,
-/area/station/engineering/gravity_generator)
-"bHU" = (
-/obj/effect/spawner/structure/window/reinforced/plasma,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port)
-"bIk" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"bIl" = (
-/obj/effect/spawner/structure/window/reinforced/tinted,
-/turf/open/floor/plating,
-/area/station/service/chapel/funeral)
-"bIm" = (
-/obj/structure/chair,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/solars/port/aft)
-"bIx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor1/aft)
-"bIy" = (
-/obj/structure/chair/comfy/black{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/green/filled/line,
-/turf/open/floor/iron/dark,
-/area/station/medical/virology)
-"bID" = (
-/obj/effect/turf_decal/stripes{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/science/cytology)
-"bIG" = (
-/obj/effect/turf_decal/tile/green/half,
-/obj/machinery/newscaster/directional/north,
-/obj/structure/closet/emcloset,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/secondary/exit/departure_lounge)
-"bII" = (
-/obj/machinery/power/solar,
-/obj/structure/cable,
-/turf/open/floor/iron/solarpanel/airless,
-/area/station/solars/starboard/fore)
-"bIQ" = (
-/obj/structure/extinguisher_cabinet/directional/north,
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/tile/green/full,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/service/bar)
-"bIW" = (
-/obj/machinery/door/airlock/maintenance/external{
- name = "Ports To Supermatter"
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/turf/open/floor/plating,
-/area/station/engineering/atmos/pumproom)
-"bJg" = (
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/aft)
-"bJi" = (
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
-"bJj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron,
-/area/station/security/range)
-"bJk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/landmark/generic_maintenance_landmark,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/aft)
-"bJm" = (
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/security/interrogation)
-"bJo" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/secondary/exit/departure_lounge)
-"bJs" = (
-/obj/effect/spawner/random/structure/crate,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/medical/abandoned)
-"bJA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
-"bJQ" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor4/port/fore)
-"bJU" = (
-/obj/structure/table,
-/obj/item/book/manual/wiki/atmospherics,
-/obj/item/t_scanner,
-/obj/item/storage/belt/utility,
-/obj/machinery/requests_console/directional/west{
- department = "Atmospherics";
- name = "Atmospherics Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/assistance,
-/obj/effect/mapping_helpers/requests_console/supplies,
-/turf/open/floor/iron,
-/area/station/engineering/atmos/office)
-"bJV" = (
-/obj/structure/chair/comfy/black{
- dir = 8
- },
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue/opposingcorners,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor4/fore)
-"bJW" = (
-/obj/structure/ladder,
-/turf/open/floor/plating/foam,
-/area/station/maintenance/floor1/port/aft)
-"bKa" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"bKp" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/obj/effect/turf_decal/siding/thinplating_new/corner{
- dir = 8
- },
-/obj/structure/flora/bush/sparsegrass/style_random,
-/turf/open/floor/grass,
-/area/station/hallway/secondary/entry)
-"bKq" = (
-/obj/effect/turf_decal/siding/blue/corner{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/carpet/neon/simple/pink/nodots,
-/area/station/maintenance/floor2/port/fore)
-"bKv" = (
-/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer4{
- dir = 6
- },
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2,
-/turf/open/floor/engine,
-/area/station/maintenance/disposal/incinerator)
-"bKz" = (
-/obj/item/restraints/handcuffs/cable/zipties/used,
-/obj/structure/table/optable,
-/obj/effect/landmark/blobstart,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/white,
-/area/station/maintenance/floor3/starboard/aft)
-"bKG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/sign/poster/contraband/random/directional/north,
-/turf/open/floor/wood,
-/area/station/service/theater)
-"bKP" = (
-/obj/effect/turf_decal/bot_white/left,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/engineering/gravity_generator)
-"bKR" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/port/aft)
-"bKS" = (
-/obj/structure/table/reinforced,
-/obj/effect/spawner/random/entertainment/lighter,
-/obj/effect/turf_decal/tile/green/full,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/duct,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/service/bar)
-"bKY" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor3/port)
-"bLd" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/service/kitchen/abandoned)
-"bLi" = (
-/obj/effect/turf_decal/siding/wideplating_new{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/cytology)
-"bLm" = (
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "viro-inner";
- name = "Virology Inner Shutters"
- },
-/turf/open/floor/plating,
-/area/station/medical/virology)
-"bLq" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 6
- },
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/third)
-"bLt" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"bLy" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/wood/large,
-/area/station/medical/virology/isolation)
-"bLB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/fore)
-"bMa" = (
-/obj/structure/tank_dispenser/oxygen,
-/obj/effect/turf_decal/siding/thinplating_new,
-/turf/open/floor/catwalk_floor/iron_dark,
-/area/station/ai_monitored/command/storage/eva)
-"bMd" = (
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Bulkhead"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/port/aft)
-"bMo" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/door/airlock/public/glass{
- name = "Public Airlock"
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"bMs" = (
-/obj/structure/chair/wood,
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/carpet/royalblack,
-/area/station/service/kitchen/diner)
-"bMt" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light/floor,
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"bMz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/girder,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"bMD" = (
-/turf/closed/wall/r_wall,
-/area/station/maintenance/floor1/starboard)
-"bME" = (
-/obj/effect/spawner/random/trash/hobo_squat,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/port/aft)
-"bMI" = (
-/obj/item/flashlight/lamp,
-/obj/structure/table,
-/obj/item/radio/intercom/directional/west,
-/obj/item/paper/fluff/jobs/engineering/frequencies,
-/turf/open/floor/iron/smooth,
-/area/station/tcommsat/computer)
-"bMJ" = (
-/turf/open/floor/iron/freezer,
-/area/station/hallway/secondary/service)
-"bMP" = (
-/obj/structure/closet/emcloset/anchored,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor4/port)
-"bMR" = (
-/obj/machinery/door/airlock/security{
- name = "Evidence Lockers"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"bMW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/structure/electrified_grille,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/port)
-"bNg" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/warden)
-"bNh" = (
-/obj/machinery/status_display/ai/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat_interior)
-"bNp" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port/fore)
-"bNs" = (
-/obj/structure/closet/firecloset/full,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/fore)
-"bNu" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/west,
-/turf/open/floor/iron/smooth,
-/area/station/construction)
-"bNL" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/red/line,
-/obj/effect/turf_decal/stripes/red/line{
- dir = 1
- },
-/obj/structure/reflector/box/anchored{
- dir = 8
- },
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"bNP" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/effect/turf_decal/siding/thinplating/dark,
-/obj/effect/turf_decal/siding/thinplating/dark/corner{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/ordnance/storage)
-"bNU" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/green/warning,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor3/aft)
-"bOg" = (
-/obj/structure/marker_beacon/burgundy,
-/obj/effect/turf_decal/trimline/brown/warning,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/turf/open/floor/engine/hull,
-/area/space/nearstation)
-"bOk" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
- dir = 4
- },
-/turf/open/space/basic,
-/area/space/nearstation)
-"bOq" = (
-/obj/machinery/door/airlock/maintenance/external,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "Gravgenrear"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/aft)
-"bOx" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/structure/table/wood,
-/obj/machinery/fax{
- fax_name = "Medical";
- name = "Medical Fax Machine"
- },
-/obj/structure/sign/poster/contraband/moffuchis_pizza/directional/east,
-/turf/open/floor/wood/parquet,
-/area/station/medical/break_room)
-"bOB" = (
-/obj/effect/turf_decal/tile/blue/anticorner{
- dir = 8
- },
-/turf/open/floor/iron/textured_corner{
- dir = 4
- },
-/area/station/medical/chemistry)
-"bOE" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/ai_monitored/command/storage/eva)
-"bOJ" = (
-/obj/effect/spawner/random/maintenance/two,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard)
-"bPh" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 5
- },
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal/bin/tagger,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"bPq" = (
-/obj/effect/spawner/random/structure/grille,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/port)
-"bPv" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/commons/storage/primary)
-"bPx" = (
-/obj/structure/water_source/puddle,
-/obj/structure/flora/bush/reed/style_2{
- pixel_x = -6
- },
-/turf/open/floor/grass,
-/area/station/service/hydroponics/garden/abandoned)
-"bPK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 5
- },
-/obj/machinery/duct,
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/aft)
-"bPO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/purple/filled/line,
-/obj/machinery/camera/directional/north{
- c_tag = "Science - Applied Mechanics"
- },
-/obj/item/radio/intercom/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/corner{
- dir = 1
- },
-/area/station/science/auxlab)
-"bPP" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/duct,
-/turf/open/floor/wood/parquet,
-/area/station/command/heads_quarters/cmo)
-"bQe" = (
-/obj/structure/chair/wood{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hop)
-"bQn" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 9
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/third)
-"bQv" = (
-/obj/machinery/power/terminal{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor/iron,
-/area/station/maintenance/solars/starboard/fore)
-"bQz" = (
-/obj/machinery/camera{
- c_tag = "Supermatter Foyer Cam #1";
- dir = 1;
- network = list("ss13","engine")
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
-"bQA" = (
-/obj/effect/turf_decal/trimline/red,
-/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
-/turf/open/floor/engine/n2o,
-/area/station/engineering/atmos)
-"bQG" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen)
-"bQK" = (
-/obj/effect/spawner/random/structure/chair_maintenance{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/medical/abandoned)
-"bQU" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos/project)
-"bQV" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"bQY" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/machinery/door/window/left/directional/north{
- name = "Genetics Desk";
- req_access = list("genetics")
- },
-/turf/open/floor/iron,
-/area/station/science/genetics)
-"bRd" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/computer/atmos_control/oxygen_tank,
-/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
- dir = 4
- },
-/obj/structure/window/reinforced/spawner/directional/north,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"bRh" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/atmospherics/components/tank/air,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor4/starboard/fore)
-"bRl" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/pod,
-/area/station/maintenance/floor4/starboard/aft)
-"bRq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/floor4/fore)
-"bRt" = (
-/obj/structure/marker_beacon/burgundy,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/aft)
-"bRx" = (
-/obj/structure/frame/machine,
-/obj/item/circuitboard/machine/telecomms/receiver,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard/fore)
-"bRI" = (
-/obj/effect/turf_decal/stripes{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/maintenance/floor2/starboard/aft)
-"bRM" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor/iron,
-/area/station/cargo/storage)
-"bRP" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/effect/turf_decal/tile/red/half,
-/turf/open/floor/iron/dark,
-/area/station/security/holding_cell)
-"bRR" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=1-14";
- location = "1-13"
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor1/aft)
-"bRZ" = (
-/turf/open/floor/iron/dark/textured_large,
-/area/station/engineering/atmos/pumproom)
-"bSa" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plating,
-/area/station/engineering/supermatter/room)
-"bSb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/griddle,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen/abandoned)
-"bSd" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen)
-"bSg" = (
-/obj/structure/grille,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/service/chapel/funeral)
-"bSi" = (
-/obj/machinery/door/airlock/external{
- name = "Labor Camp Shuttle Airlock";
- shuttledocked = 1
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/transfer)
-"bSj" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"bSq" = (
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{
- dir = 6
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"bSs" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/hallway/floor1/aft)
-"bSE" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/digital_clock/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"bSH" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/port)
-"bSR" = (
-/obj/structure/closet/crate/freezer,
-/obj/effect/spawner/random/medical/memeorgans,
-/obj/effect/spawner/random/medical/surgery_tool,
-/turf/open/floor/iron/white,
-/area/station/maintenance/floor3/starboard/aft)
-"bSU" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/first)
-"bSV" = (
-/obj/machinery/door/airlock/medical{
- name = "Psychologist's Office"
- },
-/obj/effect/mapping_helpers/airlock/access/any/medical/psychology,
-/obj/machinery/door/firedoor,
-/obj/effect/turf_decal/siding/wood{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/medical/psychology)
-"bSX" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/any/security/general,
-/obj/effect/mapping_helpers/airlock/abandoned,
-/obj/machinery/door/airlock/security{
- name = "Private Investigator's Office"
- },
-/turf/open/floor/iron/dark,
-/area/station/security/detectives_office/private_investigators_office)
-"bTe" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"bTf" = (
-/obj/structure/chair/pew/right{
- dir = 1
- },
-/turf/open/floor/iron/white/textured_large,
-/area/station/service/chapel)
-"bTm" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/obj/effect/turf_decal/trimline/white/filled/corner{
- dir = 1
- },
-/obj/effect/turf_decal/arrows/white{
- pixel_x = -16
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/dark,
-/area/station/medical/psychology)
-"bTq" = (
-/obj/machinery/light/directional/north,
-/obj/effect/turf_decal/tile/green/half,
-/obj/structure/closet/emcloset,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/secondary/exit/departure_lounge)
-"bTu" = (
-/turf/open/floor/iron,
-/area/station/service/chapel)
-"bTy" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/iron/dark/small,
-/area/station/science/xenobiology)
-"bTK" = (
-/obj/machinery/door/window/brigdoor/right/directional/west{
- name = "Judge's Stand";
- req_access = list("court")
- },
-/obj/structure/extinguisher_cabinet/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/security/courtroom)
-"bTQ" = (
-/turf/closed/wall,
-/area/station/science/ordnance/bomb)
-"bTR" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/junction/yjunction{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/central)
-"bTW" = (
-/obj/effect/turf_decal/tile/green/half{
- dir = 4
- },
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron/smooth_half{
- dir = 1
- },
-/area/station/hallway/secondary/entry)
-"bTX" = (
-/obj/structure/sign/poster/official/random/directional/west,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/obj/effect/turf_decal/tile/red/half{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/security/brig)
-"bTY" = (
-/obj/machinery/camera/directional/west,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 9
- },
-/obj/machinery/newscaster/directional/west,
-/turf/open/floor/iron/white,
-/area/station/security/prison/safe)
-"bUa" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/starboard/aft)
-"bUh" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/showroomfloor{
- name = "lab floor"
- },
-/area/station/science/robotics/lab)
-"bUq" = (
-/obj/machinery/vending/cigarette,
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/exit/departure_lounge)
-"bUv" = (
-/obj/structure/flora/bush/flowers_pp/style_random,
-/turf/open/floor/grass,
-/area/station/service/library/garden)
-"bUC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/smooth_half,
-/area/station/cargo/warehouse)
-"bUH" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/duct,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/fore)
-"bUO" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
-/obj/machinery/camera{
- c_tag = "Supermatter Foyer Cam #3";
- dir = 8;
- network = list("ss13","engine")
- },
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
-"bUP" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/middle{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/multiz/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/multiz/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"bUW" = (
-/obj/machinery/computer/records/security{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint)
-"bUZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"bVg" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor2/aft)
-"bVj" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/security/range)
-"bVl" = (
-/obj/effect/turf_decal/siding/wood/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/duct,
-/turf/open/floor/wood,
-/area/station/service/kitchen/diner)
-"bVu" = (
-/obj/structure/sign/poster/official/random/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/fore)
-"bVy" = (
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor4/aft)
-"bVG" = (
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"bVT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/button/door/directional/south{
- id = "public_toilets_b";
- name = "Door Bolt Control";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/obj/machinery/duct,
-/turf/open/floor/iron/showroomfloor,
-/area/station/commons/toilet)
-"bVY" = (
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/port/fore)
-"bVZ" = (
-/obj/structure/table,
-/obj/item/hfr_box/corner,
-/obj/item/hfr_box/corner,
-/obj/item/hfr_box/corner,
-/obj/item/hfr_box/corner,
-/obj/item/hfr_box/core,
-/obj/effect/turf_decal/stripes/line,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/hfr_room)
-"bWd" = (
-/obj/machinery/shieldgen,
-/turf/open/floor/iron/textured_large,
-/area/station/engineering/lobby)
-"bWn" = (
-/obj/effect/turf_decal/tile/green/half/contrasted{
- dir = 4
- },
-/obj/machinery/space_heater,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard)
-"bWu" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/light_switch/directional/south,
-/turf/open/floor/iron/half,
-/area/station/engineering/atmos/hfr_room)
-"bWz" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners,
-/obj/machinery/vending/cigarette,
-/turf/open/floor/iron/white,
-/area/station/hallway/floor2/aft)
-"bWH" = (
-/obj/effect/spawner/random/vending/colavend,
-/obj/structure/sign/poster/official/cleanliness/directional/east,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/hallway/secondary/entry)
-"bWZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/obj/machinery/camera/autoname/directional/north,
-/turf/open/floor/iron/dark/textured,
-/area/station/commons/fitness)
-"bXd" = (
-/obj/effect/turf_decal/trimline/purple/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology/hallway)
-"bXe" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/catwalk_floor/iron,
-/area/station/engineering/lobby)
-"bXn" = (
-/obj/effect/turf_decal/trimline/blue/warning{
- dir = 6
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/plumbed{
- dir = 1
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port)
-"bXv" = (
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=1-5";
- location = "1-4"
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor1/fore)
-"bXw" = (
-/obj/machinery/door/airlock/engineering/glass/critical{
- heat_proof = 1;
- id_tag = "sm_bolt";
- name = "Supermatter Engine"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/general,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter)
-"bXz" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/ai_slipper{
- uses = 10
- },
-/turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/aisat/hallway)
-"bXB" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"bXD" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/layer4{
- dir = 8
- },
-/turf/open/floor/engine,
-/area/station/maintenance/disposal/incinerator)
-"bYb" = (
-/obj/structure/table/glass,
-/obj/item/stack/medical/gauze,
-/obj/machinery/defibrillator_mount/directional/east,
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
-"bYg" = (
-/obj/effect/turf_decal/trimline/blue,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor2/aft)
-"bYp" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/engineering/material,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/fore)
-"bYq" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/structure/sign/poster/official/random/directional/south,
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=4-3";
- location = "4-2"
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor4/aft)
-"bYu" = (
-/obj/structure/fluff/broken_canister_frame,
-/turf/open/floor/engine,
-/area/station/maintenance/floor1/port/aft)
-"bYB" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/medical/storage)
-"bYJ" = (
-/obj/machinery/camera/directional/south{
- c_tag = "Xenobio - Port Pens"
- },
-/obj/structure/sign/poster/official/nanotrasen_logo/directional/south,
-/turf/open/floor/iron/dark/small,
-/area/station/science/xenobiology)
-"bYP" = (
-/obj/effect/turf_decal/trimline/green/filled/corner{
- dir = 4
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/aft)
-"bYX" = (
-/obj/structure/bed/medical/anchored{
- dir = 8
- },
-/obj/item/bedsheet/medical{
- dir = 4
- },
-/obj/structure/curtain/cloth,
-/obj/machinery/newscaster/directional/south,
-/obj/effect/landmark/start/medical_doctor,
-/turf/open/floor/wood/parquet,
-/area/station/medical/patients_rooms)
-"bZd" = (
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/trimline/blue,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor4/aft)
-"bZg" = (
-/obj/machinery/portable_atmospherics/canister,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"bZr" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/brown{
- dir = 8
- },
-/obj/effect/turf_decal/stripes{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"bZA" = (
-/obj/structure/table,
-/obj/item/plate{
- pixel_y = -3
- },
-/obj/item/plate,
-/obj/item/plate{
- pixel_y = 3
- },
-/obj/item/knife/plastic{
- pixel_x = 14
- },
-/obj/item/knife/plastic{
- pixel_x = 14;
- pixel_y = -3
- },
-/obj/item/knife/plastic{
- pixel_x = 14;
- pixel_y = 3
- },
-/obj/item/kitchen/fork/plastic{
- pixel_x = -12;
- pixel_y = 3
- },
-/obj/item/kitchen/fork/plastic{
- pixel_x = -12;
- pixel_y = -3
- },
-/obj/item/kitchen/fork/plastic{
- pixel_x = -12
- },
-/turf/open/floor/iron/checker,
-/area/station/commons/dorms/apartment1)
-"bZE" = (
-/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden/layer1{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/status_display/ai/directional/south,
-/turf/open/floor/iron,
-/area/station/engineering/atmos/pumproom)
-"bZM" = (
-/obj/structure/chair/stool/bar/directional/east,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/duct,
-/turf/open/floor/wood,
-/area/station/service/bar/atrium)
-"cah" = (
-/obj/machinery/door/airlock/command{
- name = "Teleporter Storage"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/command/teleporter)
-"can" = (
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 8
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/white,
-/area/station/science/cytology)
-"cau" = (
-/obj/machinery/atmospherics/pipe/smart/simple/purple/hidden/layer1{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/engineering/atmos/pumproom)
-"cax" = (
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor1/aft)
-"cay" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/fore)
-"caC" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"caF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/landmark/navigate_destination/aiupload,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/floor2/aft)
-"caP" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/bureaucracy/briefcase{
- spawn_loot_count = 2;
- spawn_loot_split = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/commons/locker)
-"caQ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/medical/abandoned)
-"cbi" = (
-/obj/structure/table/wood,
-/obj/machinery/requests_console/directional/south{
- department = "Kitchen";
- name = "Kitchen Requests Console"
- },
-/obj/effect/mapping_helpers/requests_console/supplies,
-/obj/item/storage/bag/tray,
-/obj/item/reagent_containers/cup/rag,
-/turf/open/floor/wood/large,
-/area/station/service/kitchen/kitchen_backroom)
-"cbm" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/turf/open/floor/plating/reinforced{
- initial_gas_mix = "TEMP=2.7"
- },
-/area/station/science/ordnance/bomb)
-"cbo" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/secondary/service)
-"cbt" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/grille,
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/starboard)
-"cbu" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 1
- },
-/obj/effect/landmark/start/chemist,
-/turf/open/floor/iron/white/side{
- dir = 8
- },
-/area/station/medical/pharmacy)
-"cbw" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
-"cbE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/stack/cable_coil/cut,
-/turf/open/floor/plating,
-/area/station/medical/abandoned)
-"cbG" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/hallway/secondary/exit/departure_lounge)
-"cbM" = (
-/obj/effect/spawner/random/structure/crate,
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/turf_decal/trimline/yellow/warning,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/aft)
-"cbT" = (
-/obj/effect/turf_decal/trimline/yellow/line{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/yellow/line{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"cca" = (
-/obj/structure/transport/linear/public,
-/obj/effect/landmark/transport/transport_id{
- specific_transport_id = "aft_vator"
- },
-/obj/effect/abstract/elevator_music_zone{
- linked_elevator_id = "aft_vator";
- range = 2
- },
-/turf/open/floor/plating/elevatorshaft,
-/area/station/hallway/floor1/aft)
-"ccc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/structure/cable,
-/turf/open/floor/wood/large,
-/area/station/command/heads_quarters/hop)
-"ccf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/start/captain,
-/obj/machinery/duct,
-/turf/open/floor/wood/tile,
-/area/station/command/heads_quarters/captain/private)
-"ccp" = (
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/station/service/bar/atrium)
-"ccA" = (
-/obj/effect/spawner/random/engineering/material_cheap,
-/obj/structure/table/wood,
-/obj/item/chisel{
- pixel_x = -7;
- pixel_y = 5
- },
-/obj/item/toy/crayon/spraycan{
- pixel_x = 7;
- pixel_y = 9
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
-"ccF" = (
-/obj/effect/turf_decal/trimline/brown/filled/corner,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor3/fore)
-"ccH" = (
-/turf/closed/wall/r_wall,
-/area/station/maintenance/floor3/starboard/fore)
-"ccK" = (
-/obj/effect/decal/cleanable/blood/footprints,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/aft)
-"ccP" = (
-/obj/machinery/seed_extractor,
-/obj/item/seeds/poppy,
-/obj/effect/turf_decal/siding/green{
- dir = 6
- },
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics/garden)
-"ccU" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/donkpockets,
-/turf/open/floor/wood/parquet,
-/area/station/medical/break_room)
-"ccV" = (
-/obj/effect/spawner/random/structure/grille,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard)
-"cdc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/textured,
-/area/station/hallway/floor2/aft)
-"cdd" = (
-/obj/effect/turf_decal/stripes{
- dir = 6
- },
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/machinery/button/ignition{
- id = "Xenobio";
- pixel_x = 24;
- pixel_y = 5
- },
-/obj/machinery/button/door/directional/east{
- id = "Xenolab";
- name = "Test Chamber Blast Doors";
- pixel_y = -5;
- req_access = list("xenobiology")
- },
-/obj/machinery/light/cold/no_nightlight/directional/east,
-/obj/machinery/power/shieldwallgen/xenobiologyaccess,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/science/cytology)
-"cdf" = (
-/obj/structure/chair/office,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/hos)
-"cdj" = (
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 1
- },
-/obj/machinery/duct,
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/starboard)
-"cdm" = (
-/obj/machinery/light/cold/no_nightlight/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor2/aft)
-"cdo" = (
-/obj/effect/turf_decal/arrows/red{
- dir = 4;
- pixel_x = -15
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/engineering/atmos/hfr_room)
-"cdq" = (
-/obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal/bin,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"cdF" = (
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor3/aft)
-"cdN" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=2-4";
- location = "2-3"
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor2/fore)
-"cdS" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{
- dir = 1
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/maintenance/disposal/incinerator)
-"cdU" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/directional{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard)
-"ced" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/wood/tile,
-/area/station/command/heads_quarters/captain/private)
-"cee" = (
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard/fore)
-"ceh" = (
-/obj/effect/turf_decal/trimline/brown/filled/line,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor3/fore)
-"cek" = (
-/obj/structure/closet/emcloset/anchored,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor4/starboard)
-"cem" = (
-/obj/structure/closet/firecloset,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port/aft)
-"cep" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/computer/security/telescreen/minisat/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/command/teleporter)
-"cev" = (
-/obj/structure/cable,
-/obj/machinery/door/airlock/hatch{
- desc = "Someone's bolted this manually.";
- name = "Damaged Airlock"
- },
-/obj/effect/mapping_helpers/airlock/locked,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/port)
-"cez" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/mob/living/basic/rabbit,
-/turf/open/floor/grass,
-/area/station/hallway/secondary/entry)
-"ceF" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/shutters/preopen{
- name = "CMO Privacy Shutters";
- dir = 4;
- id = "cmoshutter"
- },
-/turf/open/floor/plating,
-/area/station/medical/storage)
-"ceH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/trimline/green/line{
- dir = 10
- },
-/obj/effect/spawner/random/trash/moisture_trap,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/fore)
-"ceL" = (
-/obj/machinery/vending/cola,
-/turf/open/floor/iron,
-/area/station/commons/fitness/recreation)
-"cfa" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/checkpoint/second)
-"cfe" = (
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/machinery/shower/directional/west,
-/turf/open/floor/iron/showroomfloor{
- name = "bathroom tiles"
- },
-/area/station/security/lockers)
-"cff" = (
-/obj/structure/hedge/opaque,
-/obj/structure/hedge/opaque,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/window/reinforced/spawner/directional/east,
-/turf/open/floor/grass,
-/area/station/service/chapel)
-"cfh" = (
-/obj/structure/chair/office{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/science/auxlab)
-"cfp" = (
-/obj/effect/spawner/random/structure/table_or_rack,
-/obj/effect/turf_decal/trimline/green/warning{
- dir = 4
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/port/fore)
-"cfu" = (
-/obj/structure/railing{
- dir = 1
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor4/fore)
-"cfC" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/port)
-"cfD" = (
-/obj/machinery/door/poddoor/preopen{
- id = "armblast";
- name = "Armory Blast Door"
- },
-/obj/machinery/door/poddoor/shutters{
- dir = 8;
- id = "armory";
- name = "Armoury Shutter"
- },
-/turf/open/floor/iron/dark,
-/area/station/security/office)
-"cfH" = (
-/obj/structure/stairs/north,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat/hallway)
-"cfJ" = (
-/obj/structure/railing{
- dir = 5
- },
-/turf/open/floor/engine/hull/reinforced,
-/area/space/nearstation)
-"cfO" = (
-/obj/machinery/vending/wardrobe/cargo_wardrobe,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"cfU" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/service/kitchen/abandoned)
-"cga" = (
-/obj/machinery/light/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron/showroomfloor,
-/area/station/commons/toilet)
-"cgb" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/cmo)
-"cgc" = (
-/obj/effect/turf_decal/trimline/purple/warning{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/starboard)
-"cgi" = (
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/port/fore)
-"cgm" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/dark_blue/line,
-/turf/open/floor/iron/dark,
-/area/station/commons/storage/tools)
-"cgp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 5
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/medical/storage)
-"cgw" = (
-/obj/effect/decal/cleanable/oil,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod,
-/area/station/maintenance/floor4/starboard/aft)
-"cgx" = (
-/obj/structure/sign/warning{
- pixel_x = -32
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor1/port/aft)
-"cgB" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/iron/dark,
-/area/station/science/xenobiology/hallway)
-"cgM" = (
-/turf/open/floor/iron/stairs{
- icon_state = "stairs-m"
- },
-/area/station/science/lobby)
-"cgR" = (
-/obj/structure/closet/secure_closet/hydroponics,
-/obj/effect/turf_decal/tile/green/full,
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
-"cgT" = (
-/obj/machinery/plumbing/sender,
-/obj/effect/turf_decal/tile/blue/half{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/turf/open/floor/iron/textured_edge{
- dir = 4
- },
-/area/station/medical/chemistry)
-"cgZ" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/warden)
-"chd" = (
-/obj/structure/railing,
-/obj/effect/turf_decal/trimline/purple/warning,
-/obj/structure/chair{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/fore)
-"che" = (
-/obj/structure/railing,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port)
-"chk" = (
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Bulkhead"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port/fore)
-"chn" = (
-/obj/machinery/airalarm/directional/north,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/station/service/theater)
-"chs" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/airlock/engineering{
- name = "Construction"
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/machinery/door/firedoor,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/commons/storage/primary)
-"cht" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/pharmacy)
-"chF" = (
-/obj/machinery/holopad,
-/obj/effect/turf_decal/tile/red/opposingcorners{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/security/office)
-"chO" = (
-/obj/structure/table/wood,
-/obj/item/folder/yellow{
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/item/folder/blue,
-/turf/open/floor/wood/large,
-/area/station/command/heads_quarters/hop)
-"chP" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/station/maintenance/floor4/starboard/aft)
-"chY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor4/aft)
-"cib" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/security/prison)
-"cil" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard/fore)
-"cim" = (
-/obj/structure/stairs/north,
-/obj/structure/sign/departments/cargo/directional/east,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/hallway/floor1/fore)
-"ciq" = (
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/spawner/random/vending/snackvend,
-/turf/open/floor/iron/dark/side{
- dir = 5
- },
-/area/station/hallway/secondary/exit/departure_lounge)
-"cir" = (
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
- dir = 8
- },
-/turf/open/floor/iron/dark/textured_large,
-/area/station/engineering/supermatter/room)
-"cis" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/structure/rack,
-/obj/item/clothing/under/trek/command/next,
-/turf/open/floor/iron/dark/side{
- dir = 9
- },
-/area/station/command/teleporter)
-"cix" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood,
-/area/station/service/kitchen/diner)
-"ciz" = (
-/obj/structure/table/wood,
-/obj/item/folder/blue,
-/obj/item/stamp/head/captain,
-/turf/open/floor/carpet,
-/area/station/command/heads_quarters/captain)
-"ciC" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 8
- },
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/turf/open/floor/iron/white,
-/area/station/medical/surgery/fore)
-"ciH" = (
-/obj/structure/table,
-/obj/item/stack/sheet/plasteel{
- amount = 10
- },
-/obj/item/stack/rods/fifty,
-/obj/effect/spawner/random/trash/janitor_supplies,
-/obj/effect/turf_decal/tile/yellow/anticorner/contrasted,
-/obj/machinery/button/door/directional/south{
- id = "aux_base_shutters";
- name = "Public Shutters Control";
- req_access = list("aux_base")
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/construction/mining/aux_base)
-"ciK" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/white/smooth_corner{
- dir = 1
- },
-/area/station/commons/fitness/recreation)
-"ciM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/wood/large,
-/area/station/service/library/artgallery)
-"ciQ" = (
-/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/tile/red/anticorner/contrasted,
-/obj/machinery/camera/autoname/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/entry)
-"ciS" = (
-/obj/machinery/door/airlock/medical/glass{
- id_tag = "MedbayFoyer";
- name = "Permabrig Medbay"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/security/prison/safe)
-"ciU" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/wood/parquet,
-/area/station/service/lawoffice)
-"ciW" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/fore)
-"ciZ" = (
-/obj/structure/window/reinforced/plasma/spawner/directional/north,
-/obj/structure/foamedmetal,
-/turf/open/floor/plating/foam,
-/area/station/maintenance/floor1/port/aft)
-"cja" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/structure/crate,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/starboard/fore)
-"cjc" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/obj/machinery/door/poddoor/preopen{
- id = "ceprivacy";
- name = "Privacy Shutter"
- },
-/turf/open/floor/plating,
-/area/station/engineering/engine_smes)
-"cjo" = (
-/obj/effect/turf_decal/trimline/red/filled/corner{
- dir = 8
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor4/fore)
-"cjp" = (
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology/hallway)
-"cjx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/smooth,
-/area/station/construction)
-"cjB" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/shreds,
-/turf/open/floor/engine,
-/area/station/maintenance/floor4/starboard/aft)
-"cjC" = (
-/obj/structure/closet/emcloset/anchored,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/aft)
-"cjE" = (
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer2{
- dir = 4
- },
-/turf/open/floor/catwalk_floor/iron,
-/area/station/engineering/atmos)
-"cjK" = (
-/obj/effect/turf_decal/siding/wood,
-/obj/item/kirbyplants/organic/plant21,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/wood/parquet,
-/area/station/service/lawoffice)
-"cjM" = (
-/obj/effect/turf_decal/tile/blue/half{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/command/teleporter)
-"cjX" = (
-/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/machinery/door/airlock/external,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/starboard)
-"ckk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron/dark/corner,
-/area/station/hallway/floor2/aft)
-"ckl" = (
-/obj/item/toy/snowball,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible,
-/turf/open/misc/asteroid/snow/standard_air,
-/area/station/maintenance/floor2/port/aft)
-"ckn" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos/project)
-"ckv" = (
-/obj/structure/cable,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/large,
-/area/station/security/prison/safe)
-"cky" = (
-/obj/structure/table_frame/wood,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/plating,
-/area/station/service/abandoned_gambling_den)
-"ckQ" = (
-/obj/item/kirbyplants/random,
-/turf/open/floor/wood/parquet,
-/area/station/medical/psychology)
-"ckR" = (
-/obj/item/storage/medkit/o2{
- pixel_x = -3;
- pixel_y = -3
- },
-/obj/item/storage/medkit/o2,
-/obj/item/storage/medkit/o2{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/item/storage/medkit/regular,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/structure/window/reinforced/spawner/directional/south,
-/turf/open/floor/iron/white/textured,
-/area/station/medical/storage)
-"ckU" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 5
- },
-/turf/open/floor/engine,
-/area/station/maintenance/floor4/starboard/aft)
-"ckX" = (
-/obj/machinery/atmospherics/pipe/layer_manifold/supply/visible{
- dir = 4
- },
-/turf/closed/wall/r_wall,
-/area/station/maintenance/disposal/incinerator)
-"clb" = (
-/obj/structure/flora/bush/sparsegrass/style_random,
-/turf/open/floor/grass,
-/area/station/hallway/secondary/entry)
-"cle" = (
-/obj/effect/turf_decal/tile/blue/opposingcorners,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/machinery/camera/autoname/directional/east,
-/obj/structure/sign/warning/yes_smoking/circle/directional/east,
-/turf/open/floor/iron/white,
-/area/station/hallway/floor2/aft)
-"clf" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/commons/vacant_room/commissary)
-"cll" = (
-/turf/open/floor/engine,
-/area/station/maintenance/floor1/port/aft)
-"clp" = (
-/obj/effect/spawner/random/structure/grille,
-/obj/structure/cable,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard)
-"clv" = (
-/obj/machinery/door/airlock/hatch{
- name = "Stairwell Access"
- },
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/effect/turf_decal/stripes{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron/smooth_large,
-/area/station/maintenance/disposal)
-"cly" = (
-/obj/machinery/atmospherics/pipe/multiz/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/multiz/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor,
-/area/station/hallway/floor2/fore)
-"clF" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 5
- },
-/obj/structure/marker_beacon/burgundy,
-/turf/open/floor/mineral/plastitanium/airless,
-/area/space/nearstation)
-"clH" = (
-/obj/machinery/power/terminal{
- dir = 8
- },
-/obj/item/radio/intercom/directional/north,
-/obj/machinery/power/port_gen/pacman/pre_loaded,
-/obj/effect/turf_decal/stripes/line{
- dir = 10
- },
-/obj/effect/turf_decal/stripes/white/line{
- dir = 5
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/ai_monitored/turret_protected/aisat/service)
-"clJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/kitchen,
-/area/station/service/kitchen/abandoned)
-"clP" = (
-/obj/machinery/chem_master,
-/obj/machinery/digital_clock/directional/north,
-/turf/open/floor/iron/textured_large,
-/area/station/medical/chemistry)
-"clT" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/broken/directional/south,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/pod,
-/area/station/maintenance/floor4/starboard/aft)
-"clU" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/turf/open/floor/iron/dark/corner{
- dir = 1
- },
-/area/station/security/brig)
-"clV" = (
-/obj/structure/closet{
- name = "Evidence Closet 4"
- },
-/obj/effect/turf_decal/tile/red/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/evidence)
-"cmh" = (
-/obj/structure/closet/toolcloset,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/camera/autoname/directional/north,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/commons/vacant_room/commissary)
-"cmi" = (
-/obj/machinery/atmospherics/components/trinary/filter/atmos/flipped/plasma{
- dir = 8
- },
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/west,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"cmj" = (
-/obj/structure/flora/bush/sparsegrass/style_random,
-/obj/structure/flora/bush/flowers_br/style_random,
-/turf/open/floor/grass,
-/area/station/hallway/floor1/fore)
-"cmk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/starboard)
-"cml" = (
-/obj/structure/sign/poster/official/random/directional/east,
-/turf/open/floor/iron,
-/area/station/hallway/floor2/fore)
-"cmr" = (
-/obj/effect/spawner/structure/window/hollow/directional{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/port)
-"cms" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/carpet,
-/area/station/cargo/miningdock)
-"cmu" = (
-/obj/structure/ladder,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor3/starboard)
-"cmw" = (
-/obj/structure/railing{
- dir = 8
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/fore)
-"cmG" = (
-/turf/closed/wall,
-/area/station/medical/psychology)
-"cmH" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/station/hallway/floor3/aft)
-"cmM" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/security/courtroom)
-"cmT" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/textured,
-/area/station/command/heads_quarters/qm)
-"cng" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron/dark/textured,
-/area/station/commons/fitness)
-"cnj" = (
-/turf/open/floor/carpet,
-/area/station/hallway/secondary/entry)
-"cnk" = (
-/obj/effect/spawner/random/entertainment/arcade,
-/turf/open/floor/iron/dark,
-/area/station/commons/locker)
-"cnq" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port)
-"cnx" = (
-/obj/effect/turf_decal/siding/wood/corner,
-/obj/machinery/light_switch/directional/west,
-/turf/open/floor/wood,
-/area/station/commons/dorms/apartment1)
-"cnz" = (
-/obj/machinery/iv_drip,
-/obj/structure/mirror/directional/south,
-/obj/machinery/camera/autoname/directional/east,
-/obj/effect/decal/cleanable/blood/old,
-/obj/structure/sign/poster/official/cleanliness/directional/east,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/surgery/fore)
-"cnI" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/directional,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard)
-"cnL" = (
-/obj/effect/turf_decal/trimline/purple/warning{
- dir = 8
- },
-/obj/effect/turf_decal/stripes{
- dir = 8
- },
-/obj/structure/closet/firecloset,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/starboard)
-"col" = (
-/obj/effect/turf_decal/tile/blue/half{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/ai_monitored/turret_protected/ai)
-"con" = (
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port)
-"cow" = (
-/turf/open/floor/iron/smooth,
-/area/station/cargo/sorting)
-"coH" = (
-/obj/structure/chair/comfy/brown,
-/turf/open/floor/wood/large,
-/area/station/medical/virology/isolation)
-"coI" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/ce)
-"coZ" = (
-/obj/item/kirbyplants/random,
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
-"cpa" = (
-/obj/structure/table/wood,
-/obj/item/stack/pipe_cleaner_coil/random,
-/obj/item/stack/pipe_cleaner_coil/random,
-/obj/item/stack/pipe_cleaner_coil/random,
-/obj/machinery/status_display/ai/directional/north,
-/turf/open/floor/bamboo/tatami/black,
-/area/station/commons/storage/art)
-"cpe" = (
-/obj/machinery/holopad,
-/turf/open/floor/carpet,
-/area/station/hallway/secondary/entry)
-"cpg" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/mapping_helpers/airlock/access/all/science/genetics,
-/obj/machinery/door/airlock/hatch{
- name = "Genetics Maintenance"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard)
-"cpk" = (
-/obj/vehicle/ridden/janicart,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/effect/turf_decal/trimline/green/filled/corner{
- dir = 8
- },
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/service/janitor)
-"cpm" = (
-/obj/structure/flora/bush/flowers_br/style_random,
-/turf/open/floor/grass,
-/area/station/service/library/garden)
-"cpo" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/commons/locker)
-"cpr" = (
-/turf/open/floor/plating,
-/area/station/construction)
-"cpu" = (
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/grass,
-/area/station/service/library/garden)
-"cpx" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/closed/wall,
-/area/station/hallway/floor1/aft)
-"cpz" = (
-/obj/structure/table,
-/obj/item/stack/package_wrap,
-/obj/item/hand_labeler,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/pod/light,
-/area/station/cargo/sorting)
-"cpD" = (
-/obj/structure/falsewall,
-/turf/open/floor/plating,
-/area/station/medical/abandoned)
-"cpE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark/textured,
-/area/station/command/heads_quarters/ce)
-"cpW" = (
-/obj/machinery/light/small/directional/west,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/solars/starboard/fore)
-"cqc" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron/dark/corner{
- dir = 8
- },
-/area/station/command/teleporter)
-"cqm" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/white/textured_large,
-/area/station/service/chapel/office)
-"cqu" = (
-/obj/structure/flora/bush/sparsegrass/style_random,
-/obj/structure/flora/bush/lavendergrass/style_random,
-/obj/structure/window/spawner/directional/south,
-/obj/structure/window/spawner/directional/east,
-/obj/structure/window/spawner/directional/west,
-/turf/open/floor/grass,
-/area/station/hallway/secondary/exit/departure_lounge)
-"cqy" = (
-/obj/structure/table,
-/obj/item/folder/white,
-/obj/machinery/camera/autoname/directional/north,
-/obj/item/paper_bin,
-/obj/effect/turf_decal/siding/white/corner,
-/obj/machinery/newscaster/directional/north,
-/obj/item/healthanalyzer,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/paramedic)
-"cqz" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/security/checkpoint)
-"cqP" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/duct,
-/turf/open/floor/wood/parquet,
-/area/station/command/heads_quarters/cmo)
-"cqR" = (
-/obj/effect/turf_decal/tile/neutral/half/contrasted{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/smooth_edge,
-/area/station/science/robotics/mechbay)
-"cqT" = (
-/obj/machinery/recycler{
- dir = 8
- },
-/obj/machinery/conveyor{
- dir = 4;
- id = "disposals"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/disposal)
-"cqV" = (
-/obj/machinery/disposal/bin,
-/obj/effect/turf_decal/delivery,
-/obj/machinery/button/door/directional/north{
- id = "lockers";
- name = "Shutters Control"
- },
-/obj/structure/disposalpipe/trunk{
- dir = 8
- },
-/obj/structure/sign/poster/official/random/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/commons/locker)
-"cqY" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/yellow/line,
-/obj/effect/turf_decal/trimline/yellow/line{
- dir = 1
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/aft)
-"crd" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark/corner{
- dir = 1
- },
-/turf/open/floor/engine/hull,
-/area/space/nearstation)
-"crj" = (
-/obj/structure/window/reinforced/tinted/fulltile,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard)
-"crn" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"crp" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2,
-/turf/open/floor/engine/vacuum,
-/area/station/science/ordnance/freezerchamber)
-"crr" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 9
- },
-/turf/open/floor/iron/white,
-/area/station/medical/office)
-"crK" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/machinery/camera/motion/directional/south{
- c_tag = "AI Upload Chamber - Port";
- network = list("aiupload")
- },
-/obj/effect/turf_decal/tile/blue/half/contrasted,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload)
-"crO" = (
-/turf/open/floor/iron/dark/side{
- dir = 6
- },
-/area/station/hallway/floor1/fore)
-"crW" = (
-/obj/machinery/atmospherics/components/unary/passive_vent{
- dir = 4
- },
-/obj/machinery/door/poddoor/shutters/window{
- dir = 4;
- id = "atmos_incinerator_auxvent";
- name = "Combustion Chamber Vent"
- },
-/turf/open/floor/engine/airless,
-/area/station/maintenance/disposal/incinerator)
-"cse" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/junction/flip{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor1/aft)
-"csf" = (
-/obj/machinery/atmospherics/components/binary/pump{
- dir = 1;
- name = "Supermatter Waste To Port"
- },
-/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer4{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/pumproom)
-"csr" = (
-/obj/structure/table/wood,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron/checker,
-/area/station/service/bar/atrium)
-"css" = (
-/turf/closed/wall/r_wall,
-/area/station/engineering/atmos/project)
-"csw" = (
-/obj/structure/chair{
- name = "Judge"
- },
-/obj/machinery/camera/directional/north{
- c_tag = "Courtroom"
- },
-/obj/effect/landmark/start/hangover,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/security/courtroom)
-"csz" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=2-10";
- location = "2-9"
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/fore)
-"csC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood/large,
-/area/station/service/library/lounge)
-"csF" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/plating,
-/area/station/maintenance/floor4/starboard/aft)
-"csM" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"csP" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/wood,
-/area/station/service/bar)
-"csR" = (
-/obj/effect/turf_decal/siding/blue{
- dir = 4;
- pixel_x = -15
- },
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted,
-/obj/machinery/camera/directional/north{
- c_tag = "Medbay - Treatment Center";
- name = "medbay camera";
- network = list("ss13","medbay");
- dir = 2
- },
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/lobby)
-"csT" = (
-/obj/effect/turf_decal/stripes/corner{
- dir = 1
- },
-/obj/structure/chair/office{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/item/radio/intercom/directional/south,
-/obj/structure/railing/corner/end{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"csY" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron/dark/textured_half{
- dir = 1
- },
-/area/station/engineering/atmos/hfr_room)
-"ctd" = (
-/obj/structure/sign/poster/contraband/pwr_game,
-/turf/closed/wall,
-/area/station/maintenance/floor3/port/aft)
-"cti" = (
-/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/stripes,
-/obj/effect/spawner/random/engineering/tank,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/starboard/fore)
-"ctv" = (
-/obj/machinery/computer/warrant,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor4/aft)
-"ctI" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/starboard/fore)
-"ctT" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 5
- },
-/obj/effect/turf_decal/stripes{
- dir = 8
- },
-/obj/item/reagent_containers/syringe,
-/turf/open/floor/iron/white,
-/area/station/medical/psychology)
-"ctX" = (
-/obj/machinery/camera{
- c_tag = "Atmospherics Cam #9";
- dir = 4;
- network = list("ss13","engine")
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
-/area/station/engineering/atmos/project)
-"ctY" = (
-/obj/effect/turf_decal/delivery,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/door/airlock/public/glass{
- name = "Public Airlock"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/aft)
-"cub" = (
-/obj/structure/rack,
-/obj/item/clothing/under/trek/command/voy,
-/obj/item/clothing/under/trek/command,
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/command/teleporter)
-"cuc" = (
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/unres,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port)
-"cuf" = (
-/obj/structure/sign/poster/contraband/eat/directional/east,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"cui" = (
-/obj/machinery/button/door/directional/south{
- id = "nsminingdorm1";
- normaldoorcontrol = 1;
- specialfunctions = 4
- },
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/carpet,
-/area/station/cargo/miningdock)
-"cuk" = (
-/obj/effect/turf_decal/tile/red/full,
-/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
- dir = 1
- },
-/obj/machinery/camera{
- c_tag = "Atmospherics Cam #2";
- network = list("ss13","engine")
- },
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/textured_large,
-/area/station/engineering/atmos)
-"cun" = (
-/obj/machinery/camera/motion/directional/east{
- c_tag = "MiniSat - Fore";
- network = list("minisat")
- },
-/obj/structure/lattice/catwalk,
-/turf/open/floor/engine/hull/reinforced,
-/area/space/nearstation)
-"cus" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
-"cuC" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/blue/filled/corner,
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/medical/office)
-"cuK" = (
-/obj/machinery/photocopier,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/hop)
-"cuL" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/preopen{
- dir = 1;
- id = "surg_b_privacy";
- name = "Surgery Privacy Shutters"
- },
-/turf/open/floor/plating,
-/area/station/medical/surgery/aft)
-"cuR" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/middle,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard/aft)
-"cuS" = (
-/obj/structure/flora/bush/flowers_pp/style_random,
-/turf/open/floor/grass,
-/area/station/hallway/secondary/entry)
-"cuT" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
-"cuX" = (
-/obj/effect/turf_decal/trimline/green/line,
-/obj/effect/turf_decal/trimline/green/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/public/glass{
- name = "Public Airlock"
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/aft)
-"cvf" = (
-/obj/effect/spawner/structure/window/hollow/middle,
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/port/aft)
-"cvg" = (
-/obj/structure/table/reinforced,
-/obj/item/shard/plasma{
- pixel_x = -7;
- pixel_y = 4
- },
-/obj/effect/decal/cleanable/oil,
-/obj/item/weldingtool{
- pixel_x = 4;
- pixel_y = 6
- },
-/obj/item/clothing/glasses/welding,
-/turf/open/floor/iron,
-/area/station/maintenance/floor2/starboard/aft)
-"cvm" = (
-/obj/item/stack/tile/light,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port/fore)
-"cvn" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/holopad,
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/cmo)
-"cvo" = (
-/obj/structure/toilet{
- dir = 4
- },
-/obj/machinery/newscaster/directional/south,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/showroomfloor,
-/area/station/commons/toilet)
-"cvA" = (
-/obj/effect/turf_decal/trimline/purple/filled/line,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
-"cvC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=2-5";
- location = "2-4"
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor2/fore)
-"cvD" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/structure/railing{
- dir = 1
- },
-/obj/structure/ladder,
-/turf/open/floor/plating/airless,
-/area/space/nearstation)
-"cvE" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/service)
-"cvK" = (
-/obj/structure/water_source/puddle,
-/turf/open/floor/grass,
-/area/station/science/cytology)
-"cvM" = (
-/obj/machinery/door/airlock/public/glass{
- name = "Garden"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
-/area/station/service/hydroponics/garden)
-"cvP" = (
-/obj/effect/turf_decal/tile/green/half{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/service/hydroponics/garden)
-"cvW" = (
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Hatch"
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard)
-"cvX" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/wood/tile,
-/area/station/service/library/printer)
-"cvZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/landmark/start/cyborg,
-/obj/structure/cable/layer3,
-/obj/machinery/light/floor,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat)
-"cwl" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/fakebasalt,
-/area/station/maintenance/floor3/port)
-"cwq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/starboard/fore)
-"cwz" = (
-/obj/structure/disposalpipe/segment{
- dir = 9
- },
-/obj/machinery/duct,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/medical/treatment_center)
-"cwD" = (
-/obj/machinery/newscaster/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/camera/directional/south{
- c_tag = "Courtroom - Gallery"
- },
-/turf/open/floor/iron/dark,
-/area/station/security/courtroom)
-"cwF" = (
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/landmark/navigate_destination/library,
-/obj/machinery/light/floor,
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"cwG" = (
-/obj/machinery/door/airlock{
- id_tag = "nsminingdorm2";
- name = "Room 2"
- },
-/obj/effect/turf_decal/siding/wood,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood,
-/area/station/cargo/miningdock)
-"cwX" = (
-/obj/effect/spawner/structure/window/reinforced,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/lockers)
-"cxc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/junction/yjunction{
- dir = 4
- },
-/turf/open/floor/iron/dark/corner{
- dir = 4
- },
-/area/station/security/office)
-"cxg" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Gen Pop"
- },
-/obj/effect/mapping_helpers/airlock/access/any/security/brig,
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/security/holding_cell)
-"cxl" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 6
- },
-/turf/open/floor/engine,
-/area/station/engineering/atmos/hfr_room)
-"cxx" = (
-/obj/effect/turf_decal/tile/green/half{
- dir = 4
- },
-/turf/open/floor/iron/smooth_half{
- dir = 1
- },
-/area/station/hallway/secondary/entry)
-"cxN" = (
-/obj/structure/rack,
-/obj/item/clothing/gloves/boxing/blue,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/starboard/aft)
-"cxO" = (
-/obj/machinery/vending/hydronutrients,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/tile/green{
- dir = 8
- },
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/green{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/maintenance/floor1/port/aft)
-"cxQ" = (
-/obj/structure/table_frame,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/engine,
-/area/station/maintenance/floor1/port/aft)
-"cxR" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/turf/open/floor/plating/reinforced{
- initial_gas_mix = "TEMP=2.7"
- },
-/area/station/science/ordnance/bomb)
-"cxX" = (
-/obj/effect/landmark/generic_maintenance_landmark,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/starboard/aft)
-"cyb" = (
-/obj/effect/turf_decal/trimline/purple/filled/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/lower)
-"cyc" = (
-/obj/machinery/door/airlock{
- id_tag = "dorms_lux_1_bolts";
- name = "Luxury Dorm 1"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/wood,
-/area/station/commons/dorms/apartment1)
-"cyx" = (
-/obj/structure/sign/poster/official/random/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor1/aft)
-"cyF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron,
-/area/station/service/hydroponics/garden)
-"cyL" = (
-/obj/structure/table/wood,
-/obj/item/storage/dice,
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/wood/large,
-/area/station/service/library/lounge)
-"cyX" = (
-/obj/item/instrument/banjo,
-/obj/item/clothing/head/costume/festive,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/starboard/fore)
-"czj" = (
-/obj/structure/sign/poster/random/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/machinery/duct,
-/turf/open/floor/wood/large,
-/area/station/service/kitchen/kitchen_backroom)
-"czm" = (
-/obj/effect/turf_decal/trimline/green/line,
-/obj/effect/turf_decal/trimline/green/line{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/fore)
-"czp" = (
-/turf/closed/wall/r_wall,
-/area/station/command/meeting_room)
-"czr" = (
-/obj/structure/closet/firecloset/full,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/hallway/secondary/exit/escape_pod)
-"czu" = (
-/obj/structure/rack,
-/obj/item/toner/large,
-/obj/item/toner/large,
-/obj/item/toner/large,
-/obj/item/toner/large,
-/obj/item/toner/large,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/bamboo/tatami/black,
-/area/station/commons/storage/art)
-"czP" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/service/bar)
-"czZ" = (
-/obj/machinery/door/window/left/directional/north{
- name = "Pen 1";
- req_access = list("xenobiology")
- },
-/turf/open/floor/iron/dark/small,
-/area/station/science/xenobiology)
-"cAf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible,
-/obj/item/radio/intercom/directional/east,
-/obj/structure/cable,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
-"cAi" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/fore)
-"cAt" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/security/brig)
-"cAu" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"cAJ" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/catwalk_floor,
-/area/station/security/mechbay)
-"cAO" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/item/radio/intercom/directional/west,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/wood/large,
-/area/station/command/heads_quarters/hop)
-"cAU" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/turf/open/floor/wood,
-/area/station/service/theater)
-"cBb" = (
-/obj/effect/spawner/random/structure/chair_maintenance{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard/fore)
-"cBk" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/white/warning,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor1/fore)
-"cBq" = (
-/obj/structure/table/wood/poker,
-/obj/item/toy/cards/deck,
-/turf/open/floor/carpet/green,
-/area/station/service/abandoned_gambling_den)
-"cBx" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/hos)
-"cBE" = (
-/obj/machinery/firealarm/directional/west,
-/obj/effect/turf_decal/tile/red/opposingcorners{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/security/brig)
-"cBJ" = (
-/obj/machinery/door/airlock/medical{
- name = "Morgue"
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/any/medical/morgue,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/turf/open/floor/iron/white,
-/area/station/medical/morgue)
-"cBU" = (
-/obj/structure/window/reinforced/spawner/directional/west,
-/obj/structure/flora/bush/sunny/style_random,
-/turf/open/floor/grass,
-/area/station/security/courtroom)
-"cCc" = (
-/obj/structure/railing{
- dir = 1
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor2/aft)
-"cCd" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/green{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/secondary/entry)
-"cCf" = (
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 6
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 5
- },
-/turf/open/floor/engine/hull,
-/area/space/nearstation)
-"cCk" = (
-/obj/machinery/camera/directional/west{
- c_tag = "Aft Starboard Solar Maintenance"
- },
-/obj/effect/turf_decal/stripes{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/solars/starboard/aft)
-"cCq" = (
-/turf/closed/wall,
-/area/station/maintenance/solars/port/aft)
-"cCu" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/textured_large,
-/area/station/hallway/secondary/exit/departure_lounge)
-"cCC" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/chair{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"cCE" = (
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 8
- },
-/turf/open/floor/engine/hull,
-/area/space/nearstation)
-"cCK" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/obj/machinery/light_switch/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/service)
-"cCO" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron/corner{
- dir = 4
- },
-/area/station/maintenance/solars/starboard/fore)
-"cCS" = (
-/obj/effect/turf_decal/trimline/green/filled/corner{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/service/hydroponics)
-"cCV" = (
-/obj/machinery/light/red/dim/directional/north,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/fore)
-"cCX" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/blue/filled/line,
-/obj/machinery/duct,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/white,
-/area/station/medical/medbay/central)
-"cDa" = (
-/obj/structure/cable,
-/obj/machinery/chem_master,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/pharmacy)
-"cDh" = (
-/obj/item/broken_bottle,
-/turf/open/floor/carpet/neon/simple/pink/nodots,
-/area/station/maintenance/floor2/port/fore)
-"cDj" = (
-/obj/effect/turf_decal/delivery,
-/obj/structure/sign/departments/cargo/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"cDq" = (
-/obj/effect/turf_decal/trimline/green/warning{
- dir = 10
- },
-/obj/effect/turf_decal/stripes{
- dir = 10
- },
-/obj/effect/spawner/random/structure/tank_holder,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/starboard)
-"cDu" = (
-/obj/structure/chair/comfy/brown,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/obj/item/radio/intercom/directional/west,
-/obj/effect/landmark/start/assistant,
-/obj/effect/turf_decal/siding/wood{
- dir = 5
- },
-/turf/open/floor/iron/checker,
-/area/station/service/bar/atrium)
-"cDv" = (
-/obj/effect/landmark/start/atmospheric_technician,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"cEb" = (
-/obj/effect/turf_decal/tile/green/half{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/service/hydroponics/garden)
-"cEt" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/holopad,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/trimline/green/end{
- dir = 8
- },
-/obj/machinery/duct,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/fore)
-"cEu" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 4
- },
-/obj/effect/spawner/random/structure/crate,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard/fore)
-"cEw" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/poddoor/shutters/preopen{
- id = "library2"
- },
-/obj/machinery/door/airlock/public/glass{
- name = "Library"
- },
-/turf/open/floor/iron,
-/area/station/service/library)
-"cEH" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 5
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor2/aft)
-"cEP" = (
-/obj/structure/frame/machine,
-/turf/open/floor/iron/smooth,
-/area/station/construction)
-"cFc" = (
-/obj/structure/chair/office{
- dir = 8
- },
-/turf/open/floor/iron/half{
- dir = 1
- },
-/area/station/engineering/lobby)
-"cFg" = (
-/obj/machinery/chem_master,
-/turf/open/floor/circuit,
-/area/station/science/xenobiology)
-"cFq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 8
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port)
-"cFx" = (
-/obj/effect/turf_decal/trimline/brown/corner,
-/turf/open/floor/engine/hull,
-/area/space/nearstation)
-"cFF" = (
-/obj/effect/turf_decal/tile/red/diagonal_edge,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/security/checkpoint/escape)
-"cFK" = (
-/obj/structure/table/wood/poker,
-/obj/effect/spawner/random/entertainment/dice,
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/carpet/green,
-/area/station/service/abandoned_gambling_den)
-"cFM" = (
-/obj/structure/window/reinforced/tinted/spawner/directional/west,
-/obj/structure/chair/office{
- dir = 1
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 10
- },
-/turf/open/floor/wood,
-/area/station/commons/vacant_room/office)
-"cFQ" = (
-/turf/closed/wall,
-/area/station/science/auxlab/firing_range)
-"cGh" = (
-/obj/effect/spawner/random/structure/grille,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard/fore)
-"cGn" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/effect/turf_decal/trimline/red/filled/line,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/first)
-"cGt" = (
-/obj/effect/turf_decal/trimline/neutral/corner{
- dir = 4
- },
-/obj/effect/turf_decal/siding/thinplating/dark{
- dir = 8
- },
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/command/gateway)
-"cGu" = (
-/turf/open/floor/glass/reinforced,
-/area/station/maintenance/floor2/starboard/aft)
-"cGA" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
- },
-/obj/structure/cable,
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/lab)
-"cGI" = (
-/obj/structure/table,
-/obj/item/paper_bin/construction,
-/obj/item/pen/fountain,
-/turf/open/floor/carpet/blue,
-/area/station/command/heads_quarters/hop)
-"cGM" = (
-/obj/structure/cable,
-/obj/machinery/conveyor{
- dir = 5;
- id = "mining"
- },
-/turf/open/floor/iron/checker,
-/area/station/cargo/miningdock)
-"cGQ" = (
-/obj/machinery/modular_computer/preset/civilian{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
-"cGT" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/security/courtroom)
-"cGU" = (
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/trimline/green,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor3/fore)
-"cGX" = (
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/structure/table,
-/obj/item/raw_anomaly_core/random{
- pixel_x = -5;
- pixel_y = 7
- },
-/obj/item/raw_anomaly_core/random{
- pixel_x = 7;
- pixel_y = 9
- },
-/obj/item/raw_anomaly_core/random{
- pixel_y = 5
- },
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
-"cHb" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/grille/broken,
-/obj/structure/ladder,
-/turf/open/floor/plating,
-/area/station/hallway/floor1/fore)
-"cHd" = (
-/obj/effect/turf_decal/siding/white,
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 1
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/science/cytology)
-"cHf" = (
-/obj/structure/sign/poster/official/random/directional/south,
-/obj/effect/turf_decal/siding/wood{
- dir = 6
- },
-/turf/open/floor/iron/dark,
-/area/station/service/library/lounge)
-"cHg" = (
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/machinery/door/airlock/hatch{
- name = "Elevator Shaft Access"
- },
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/unres,
-/turf/open/floor/plating,
-/area/station/hallway/floor2/aft)
-"cHm" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/light/floor,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/hallway/floor3/fore)
-"cHr" = (
-/obj/machinery/atmospherics/pipe/multiz/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/multiz/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port/fore)
-"cHy" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Second Deck Outpost"
- },
-/obj/effect/mapping_helpers/airlock/access/any/security/brig,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/second)
-"cHz" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/machinery/space_heater,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/fore)
-"cHE" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/dark_blue/line{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/station/commons/storage/tools)
-"cHK" = (
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
- dir = 9
- },
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/stripes/white/line,
-/turf/open/floor/iron/dark,
-/area/station/science/ordnance/testlab)
-"cHT" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/port)
-"cHX" = (
-/obj/structure/lattice,
-/turf/open/space/basic,
-/area/space/nearstation)
-"cIc" = (
-/obj/machinery/door/airlock/highsecurity{
- name = "AI Upload"
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/mapping_helpers/airlock/access/any/command/ai_upload,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/structure/sign/departments/aiupload/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/ai_upload_foyer)
-"cId" = (
-/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
- dir = 8
- },
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat/hallway)
-"cIl" = (
-/obj/machinery/vending/hydronutrients,
-/obj/effect/turf_decal/siding/green{
- dir = 8
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/service/hydroponics/garden)
-"cIo" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/window/right/directional/west{
- name = "Outer Window"
- },
-/obj/machinery/door/window/brigdoor/left/directional/east{
- name = "Security Desk";
- req_access = list("security")
- },
-/obj/item/folder/red,
-/obj/item/pen,
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
-/area/station/security/checkpoint/escape)
-"cIr" = (
-/obj/structure/chair/stool/bar/directional/east,
-/turf/open/floor/wood,
-/area/station/service/bar/atrium)
-"cIt" = (
-/obj/machinery/firealarm/directional/south,
-/obj/effect/turf_decal/stripes/line,
-/obj/effect/turf_decal/tile/brown/opposingcorners{
- dir = 1
- },
-/turf/open/floor/iron/checker,
-/area/station/cargo/miningdock)
-"cIE" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 1
- },
-/obj/effect/decal/cleanable/blood/splatter,
-/turf/open/floor/engine,
-/area/station/maintenance/floor4/starboard/aft)
-"cIJ" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/red/arrow_cw,
-/turf/open/floor/mineral/plastitanium{
- desc = "cushioned to protect from rough landings";
- name = "boxing ring"
- },
-/area/station/commons/fitness)
-"cIL" = (
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer1{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"cIM" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/starboard/aft)
-"cIN" = (
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/siding/purple{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
-"cIT" = (
-/obj/effect/turf_decal/bot_white,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 8
- },
-/turf/open/floor/iron,
-/area/station/engineering/gravity_generator)
-"cJh" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
-"cJi" = (
-/obj/effect/turf_decal/trimline/green/warning{
- dir = 4
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor3/port/aft)
-"cJt" = (
-/turf/open/floor/catwalk_floor/iron,
-/area/station/cargo/storage)
-"cJu" = (
-/obj/effect/turf_decal/siding/wideplating_new/dark{
- dir = 8
- },
-/turf/open/floor/engine/co2,
-/area/station/engineering/atmos)
-"cJv" = (
-/obj/effect/mapping_helpers/airlock/access/all/science/robotics,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Access"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port)
-"cJw" = (
-/obj/effect/landmark/start/hangover,
-/obj/machinery/shower/directional/west,
-/turf/open/floor/noslip,
-/area/station/commons/toilet)
-"cJB" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/hydroponics,
-/obj/effect/spawner/random/food_or_drink/seed,
-/obj/effect/spawner/random/food_or_drink/seed,
-/obj/effect/spawner/random/food_or_drink/seed,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/iron,
-/area/station/service/hydroponics/garden/abandoned)
-"cJI" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/floor2/aft)
-"cJR" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/landmark/start/roboticist,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/science/robotics/lab)
-"cJY" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/port/fore)
-"cKf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/engineering/glass,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/aft)
-"cKq" = (
-/obj/effect/turf_decal/trimline/blue/line{
- dir = 8
- },
-/obj/machinery/light/directional/east,
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/command/teleporter)
-"cKs" = (
-/obj/structure/closet/firecloset,
-/obj/effect/turf_decal/trimline/red/warning,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port)
-"cKv" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 1
- },
-/obj/machinery/duct,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/cmo)
-"cKC" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/yellow/line,
-/obj/effect/turf_decal/trimline/yellow/line{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/aft)
-"cKE" = (
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/purple/filled/corner{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
-"cKH" = (
-/obj/machinery/light/floor,
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/hallway/floor3/aft)
-"cKJ" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/checker,
-/area/station/commons/vacant_room/commissary)
-"cKM" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/purple/warning,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor2/fore)
-"cKS" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/button/elevator/directional/south{
- id = "com_vator"
- },
-/obj/machinery/lift_indicator/directional/south{
- linked_elevator_id = "com_vator";
- pixel_y = -36
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/hallway/floor3/fore)
-"cLg" = (
-/obj/effect/turf_decal/trimline/blue/line,
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input,
-/turf/open/floor/engine/o2,
-/area/station/engineering/atmos)
-"cLt" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
-"cLA" = (
-/obj/structure/railing,
-/turf/open/floor/grass,
-/area/station/science/cytology)
-"cLC" = (
-/obj/structure/table,
-/obj/machinery/newscaster/directional/north,
-/turf/open/floor/iron,
-/area/station/commons/dorms/room1)
-"cLF" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/corner{
- dir = 4
- },
-/area/station/security/brig)
-"cLG" = (
-/obj/structure/chair/e_chair,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/remains/human,
-/turf/open/floor/pod/dark,
-/area/station/service/kitchen/abandoned)
-"cLI" = (
-/obj/effect/turf_decal/siding/white{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/purple/line{
- dir = 8
- },
-/obj/structure/extinguisher_cabinet/directional/west,
-/turf/open/floor/iron/white,
-/area/station/science/cytology)
-"cLQ" = (
-/obj/machinery/door/airlock{
- name = "Locker Room"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron,
-/area/station/commons/locker)
-"cLX" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor1/aft)
-"cMb" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/light/small/red/directional/east,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port/aft)
-"cMg" = (
-/obj/effect/turf_decal/tile/blue{
- dir = 4
- },
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/structure/closet/crate/trashcart/laundry,
-/obj/effect/spawner/random/contraband/prison,
-/obj/item/clothing/under/rank/prisoner,
-/obj/item/clothing/under/rank/prisoner,
-/obj/item/clothing/under/rank/prisoner/skirt,
-/obj/effect/turf_decal/tile/blue{
- dir = 8
- },
-/obj/item/seeds/tea,
-/obj/item/clothing/under/rank/prisoner/skirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/sign/poster/official/random/directional/south,
-/obj/structure/cable,
-/turf/open/floor/iron/cafeteria,
-/area/station/security/prison)
-"cMh" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port)
-"cMi" = (
-/obj/effect/turf_decal/trimline/white/arrow_cw{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/white/mid_joiner{
- dir = 8
- },
-/turf/open/floor/iron/smooth_large,
-/area/station/hallway/secondary/entry)
-"cMz" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/camera/autoname/directional/south,
-/obj/machinery/bluespace_vendor/directional/south,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor2/aft)
-"cMA" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/catwalk_floor/iron,
-/area/station/cargo/storage)
-"cMB" = (
-/obj/structure/flora/bush/sparsegrass/style_random,
-/turf/open/floor/grass,
-/area/station/hallway/floor1/aft)
-"cMU" = (
-/obj/effect/turf_decal/tile/green/anticorner{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/snack/green,
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/station/hallway/secondary/exit/escape_pod)
-"cNb" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
- dir = 8
- },
-/obj/machinery/portable_atmospherics/pump,
-/obj/structure/sign/warning/vacuum{
- pixel_y = 32
- },
-/obj/machinery/camera/autoname/directional/north,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/hallway/floor1/aft)
-"cNf" = (
-/obj/item/stack/tile/pod/light,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard/fore)
-"cNl" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/light/floor,
-/turf/open/floor/iron,
-/area/station/hallway/floor1/aft)
-"cNm" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/hatch{
- name = "Science Maintenance"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard/fore)
-"cNx" = (
-/obj/effect/turf_decal/stripes/line,
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/hfr_room)
-"cNA" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/bronze/filled,
-/area/station/maintenance/floor1/starboard)
-"cNE" = (
-/obj/structure/mineral_door/paperframe,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/bamboo/tatami/black,
-/area/station/commons/storage/art)
-"cNH" = (
-/obj/effect/turf_decal/siding/white{
- dir = 9
- },
-/turf/open/floor/mineral/silver,
-/area/station/service/chapel/funeral)
-"cNQ" = (
-/obj/structure/extinguisher_cabinet/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/turf/open/floor/iron/dark/side{
- dir = 10
- },
-/area/station/security/checkpoint)
-"cNR" = (
-/obj/effect/turf_decal/bot/right,
-/turf/open/floor/engine,
-/area/station/engineering/atmos/hfr_room)
-"cNT" = (
-/obj/machinery/holopad,
-/obj/effect/turf_decal/trimline/blue,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/turret_protected/aisat_interior)
-"cOt" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"cOx" = (
-/turf/open/floor/iron/dark/side{
- dir = 5
- },
-/area/station/security/prison/garden)
-"cOz" = (
-/obj/machinery/vending/wardrobe/chap_wardrobe,
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/iron/white/textured_large,
-/area/station/service/chapel/office)
-"cOD" = (
-/obj/machinery/atmospherics/components/binary/pump/layer2,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard/aft)
-"cOE" = (
-/obj/effect/turf_decal/trimline/white/line,
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/air_input,
-/turf/open/floor/engine/air,
-/area/station/engineering/atmos)
-"cOI" = (
-/obj/effect/turf_decal/trimline/yellow/line{
- dir = 4
- },
-/obj/item/radio/intercom/directional/south,
-/obj/effect/decal/cleanable/oil,
-/turf/open/floor/iron/half{
- dir = 1
- },
-/area/station/hallway/floor1/aft)
-"cOM" = (
-/obj/effect/decal/cleanable/confetti,
-/obj/effect/turf_decal/siding/blue{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/carpet/neon/simple/pink/nodots,
-/area/station/maintenance/floor2/port/fore)
-"cOT" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/effect/turf_decal/arrows{
- dir = 4
- },
-/obj/machinery/light/directional/north,
-/obj/effect/landmark/start/bitrunner,
-/turf/open/floor/iron/dark/textured_large,
-/area/station/cargo/bitrunning/den)
-"cPg" = (
-/obj/effect/turf_decal/tile/blue/fourcorners,
-/obj/machinery/atmospherics/components/binary/pump/on{
- name = "O2 to Airmix"
- },
-/obj/machinery/atmospherics/components/binary/pump/layer2,
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/window/reinforced/spawner/directional/east,
-/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"cPQ" = (
-/obj/structure/railing{
- dir = 5
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 5
- },
-/turf/open/water/no_planet_atmos{
- desc = "Filthy.";
- name = "untreated water"
- },
-/area/station/maintenance/floor1/port/aft)
-"cPR" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/structure/table,
-/obj/item/grenade/chem_grenade/smart_metal_foam{
- pixel_x = -4;
- pixel_y = 6
- },
-/obj/item/grenade/chem_grenade/smart_metal_foam{
- pixel_y = 4
- },
-/obj/item/grenade/chem_grenade/smart_metal_foam{
- pixel_x = 4;
- pixel_y = 2
- },
-/obj/item/grenade/chem_grenade/smart_metal_foam{
- pixel_x = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 8
- },
-/area/station/engineering/atmos)
-"cPT" = (
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron/smooth,
-/area/station/hallway/floor4/aft)
-"cQa" = (
-/obj/effect/turf_decal/trimline/green/filled/corner{
- dir = 1
- },
-/obj/machinery/camera/autoname/directional/west,
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"cQj" = (
-/obj/effect/spawner/random/structure/chair_maintenance{
- dir = 8
- },
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/fore)
-"cQm" = (
-/obj/effect/turf_decal/trimline/red/filled/end{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"cQo" = (
-/obj/effect/turf_decal/siding/white{
- dir = 8
- },
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/wood/tile,
-/area/station/science/xenobiology/hallway)
-"cQr" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port/fore)
-"cQz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"cQB" = (
-/obj/effect/turf_decal/siding/thinplating_new{
- dir = 1
- },
-/obj/structure/tank_dispenser/oxygen,
-/obj/structure/window/spawner/directional/east,
-/turf/open/floor/iron/dark/textured_corner{
- dir = 8
- },
-/area/station/engineering/lobby)
-"cQC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/smes,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/maintenance/floor4/port/fore)
-"cQL" = (
-/obj/machinery/atmospherics/pipe/smart/simple/purple/visible/layer1{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible/layer2{
- dir = 9
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"cQS" = (
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/iron/dark/textured_half{
- dir = 1
- },
-/area/station/engineering/atmos/hfr_room)
-"cQY" = (
-/obj/effect/turf_decal/trimline/blue/filled/corner{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/medical/abandoned)
-"cRd" = (
-/obj/machinery/door/airlock/science/glass{
- name = "Research and Development"
- },
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/science/general,
-/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
- cycle_id = "bridge"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 1
- },
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
-"cRe" = (
-/obj/machinery/status_display/ai/directional/north,
-/obj/structure/secure_safe/caps_spare,
-/obj/structure/table/reinforced,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
-"cRs" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/obj/machinery/recharge_station,
-/turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/aisat/service)
-"cRA" = (
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai)
-"cRH" = (
-/obj/machinery/light/small/directional/north,
-/obj/structure/closet/emcloset/anchored,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/starboard/fore)
-"cRJ" = (
-/obj/structure/filingcabinet/security,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
- },
-/turf/open/floor/iron/dark/side{
- dir = 6
- },
-/area/station/command/teleporter)
-"cRL" = (
-/obj/structure/bodycontainer/morgue{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/service/chapel/funeral)
-"cRU" = (
-/obj/machinery/sparker/directional/north{
- id = "Xenobio"
- },
-/obj/effect/turf_decal/stripes{
- dir = 1
- },
-/turf/open/floor/engine,
-/area/station/science/cytology)
-"cRY" = (
-/obj/machinery/door/airlock/public/glass/incinerator/atmos_interior,
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer4{
- dir = 4
- },
-/turf/open/floor/engine,
-/area/station/maintenance/disposal/incinerator)
-"cSb" = (
-/obj/structure/table,
-/obj/item/stock_parts/micro_laser,
-/obj/item/stock_parts/servo{
- pixel_x = 15;
- pixel_y = 4
- },
-/obj/item/reagent_containers/dropper{
- pixel_x = -2;
- pixel_y = 9
- },
-/obj/effect/turf_decal/tile/purple/fourcorners,
-/obj/item/flatpack{
- board = /obj/item/circuitboard/machine/flatpacker
- },
-/obj/item/multitool,
-/turf/open/floor/iron/white,
-/area/station/science/lab)
-"cSc" = (
-/obj/item/food/cornchips/green{
- pixel_x = -8;
- pixel_y = -7
- },
-/obj/item/toy/plush/rouny{
- desc = "That is a rouny.";
- pixel_x = 10;
- pixel_y = 2
- },
-/obj/structure/bed/pod,
-/obj/item/bedsheet/green,
-/obj/effect/landmark/start/janitor,
-/turf/open/floor/eighties,
-/area/station/service/janitor)
-"cSe" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/circuit/green,
-/area/station/science/robotics/mechbay)
-"cSk" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance/two,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard)
-"cSu" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/iron,
-/area/station/service/chapel)
-"cSF" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 9
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/wood,
-/area/station/security/detectives_office)
-"cSK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/maintenance,
-/obj/structure/rack,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port)
-"cSQ" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/tile/yellow/fourcorners,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/security/prison)
-"cSW" = (
-/obj/structure/sign/poster/official/random/directional/west,
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 10
- },
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/iron,
-/area/station/hallway/floor2/fore)
-"cSY" = (
-/obj/structure/flora/bush/sparsegrass/style_random,
-/obj/structure/flora/bush/flowers_yw/style_random,
-/obj/structure/window/spawner/directional/south,
-/obj/structure/window/spawner/directional/north,
-/turf/open/floor/grass,
-/area/station/hallway/secondary/exit/departure_lounge)
-"cTb" = (
-/obj/effect/turf_decal/trimline/brown/filled/corner{
- dir = 1
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"cTk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor/iron,
-/area/station/hallway/secondary/entry)
-"cTo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/ai)
-"cTw" = (
-/obj/structure/table/reinforced,
-/obj/machinery/airalarm/directional/south,
-/obj/item/storage/box/evidence,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/detectives_office/private_investigators_office)
-"cTB" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/open/floor/iron/textured_large,
-/area/station/engineering/atmos)
-"cTJ" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/green/warning{
- dir = 10
- },
-/obj/machinery/airalarm/directional/west,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/starboard)
-"cTV" = (
-/obj/effect/turf_decal/trimline/purple/filled/corner{
- dir = 8
- },
-/obj/machinery/airalarm/directional/south,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
-"cUb" = (
-/obj/effect/landmark/start/chemist,
-/obj/effect/turf_decal/tile/blue/half{
- dir = 4
- },
-/turf/open/floor/iron/textured_edge{
- dir = 4
- },
-/area/station/medical/chemistry)
-"cUd" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/turf_decal/stripes/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/ai_monitored/security/armory)
-"cUh" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/trimline/green/line{
- dir = 8
- },
-/obj/effect/spawner/random/maintenance/two,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/fore)
-"cUq" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/structure/cable/multilayer/multiz,
-/turf/open/floor/plating/airless,
-/area/station/solars/starboard/aft)
-"cUt" = (
-/obj/docking_port/stationary/public_mining_dock,
-/turf/open/floor/plating,
-/area/station/construction/mining/aux_base)
-"cUu" = (
-/obj/machinery/firealarm/directional/north,
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 4
- },
-/obj/structure/window/spawner/directional/east,
-/obj/structure/disposalpipe/trunk{
- dir = 4
- },
-/obj/machinery/disposal/bin,
-/turf/open/floor/wood,
-/area/station/hallway/secondary/entry)
-"cUL" = (
-/turf/closed/wall,
-/area/station/cargo/storage)
-"cUN" = (
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/trimline/purple/warning{
- dir = 10
- },
-/obj/structure/rack,
-/obj/item/food/grown/poppy/geranium/fraxinella{
- color = "#00FFFF";
- desc = "A beautiful cyan flower. You get the feeling you won't see one like this here very often."
- },
-/obj/item/clothing/mask/gas/cyborg,
-/obj/machinery/light/red/dim/directional/east,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port)
-"cUY" = (
-/obj/effect/spawner/random/trash/mess,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/structure/sign/poster/contraband/random/directional/north,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard)
-"cVb" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/splatter,
-/turf/open/floor/engine,
-/area/station/maintenance/floor4/starboard/aft)
-"cVl" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/turf/open/floor/carpet/orange,
-/area/station/service/chapel/funeral)
-"cVo" = (
-/obj/machinery/door/airlock/command{
- name = "Fuel Storage"
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard/aft)
-"cVy" = (
-/obj/structure/transport/linear/public,
-/obj/machinery/lift_indicator/directional/east{
- linked_elevator_id = "aft_vator";
- pixel_x = 38;
- pixel_y = -7
- },
-/obj/machinery/elevator_control_panel/directional/east{
- linked_elevator_id = "aft_vator";
- pixel_x = 24;
- preset_destination_names = list("2" = "Supply-Engi Floor", "3" = "Med-Sci Floor", "4" = "Service Floor")
- },
-/turf/open/floor/plating/elevatorshaft,
-/area/station/hallway/floor1/aft)
-"cVz" = (
-/obj/machinery/door/airlock/security{
- name = "Gulag"
- },
-/obj/effect/mapping_helpers/airlock/access/any/security/brig,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark,
-/area/station/security/execution/transfer)
-"cVD" = (
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/secondary/exit/departure_lounge)
-"cVG" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/machinery/door/airlock/external,
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/port)
-"cVJ" = (
-/obj/effect/turf_decal/tile/purple/anticorner/contrasted{
- dir = 1
- },
-/turf/open/floor/iron/dark/corner,
-/area/station/hallway/floor2/aft)
-"cVK" = (
-/obj/machinery/vending/cigarette,
-/obj/structure/sign/poster/official/random/directional/west,
-/turf/open/floor/iron/checker,
-/area/station/service/bar/atrium)
-"cVL" = (
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/checker{
- dir = 1
- },
-/area/station/commons/locker)
-"cVR" = (
-/obj/machinery/light/small/directional/west,
-/turf/open/openspace,
-/area/station/service/chapel)
-"cVT" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/robotics/lab)
-"cVX" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/junction{
- dir = 8
- },
-/turf/open/floor/iron/chapel{
- dir = 4
- },
-/area/station/service/chapel)
-"cWf" = (
-/obj/structure/flora/bush/sparsegrass/style_random,
-/turf/open/floor/grass,
-/area/station/hallway/floor4/fore)
-"cWo" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/light/red/dim/directional/south,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/port/aft)
-"cWu" = (
-/obj/effect/turf_decal/trimline/yellow/warning{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/yellow/warning,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port)
-"cWw" = (
-/obj/effect/decal/cleanable/vomit/old,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/fore)
-"cWy" = (
-/obj/structure/table,
-/obj/machinery/button/door{
- desc = "Controls the shutters over the cell windows.";
- id = "secure-gate";
- name = "Cell Window Control";
- pixel_x = -6;
- pixel_y = 7;
- req_access = list("armory");
- specialfunctions = 4
- },
-/obj/machinery/button/door{
- desc = "Controls the shutters over the brig windows.";
- id = "briglockdown";
- name = "Brig Lockdown Control";
- pixel_x = 6;
- pixel_y = 7;
- req_access = list("armory")
- },
-/obj/effect/turf_decal/tile/red/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/warden)
-"cWD" = (
-/obj/effect/turf_decal/trimline/brown/warning{
- dir = 10
- },
-/obj/structure/marker_beacon/burgundy,
-/turf/open/floor/engine/hull,
-/area/space/nearstation)
-"cWF" = (
-/obj/structure/railing{
- dir = 5
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/starboard/fore)
-"cWK" = (
-/turf/open/floor/iron,
-/area/station/security/range)
-"cWM" = (
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/virology{
- name = "Virology"
- },
-/obj/effect/mapping_helpers/airlock/unres{
- dir = 8
- },
-/turf/open/floor/plating,
-/area/station/medical/abandoned)
-"cWO" = (
-/obj/machinery/atmospherics/pipe/heat_exchanging/simple,
-/obj/effect/turf_decal/trimline/white/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/white/line{
- dir = 8
- },
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/iron/dark/telecomms,
-/area/station/tcommsat/server)
-"cWR" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/light,
-/area/station/maintenance/solars/port/aft)
-"cWX" = (
-/obj/structure/railing{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/starboard/fore)
-"cWY" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/railing/corner{
- dir = 1
- },
-/obj/structure/railing/corner{
- dir = 8
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/starboard/aft)
-"cWZ" = (
-/obj/effect/spawner/random/trash/graffiti{
- pixel_y = -32
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/aft)
-"cXm" = (
-/obj/structure/lattice/catwalk,
-/obj/effect/landmark/carpspawn,
-/turf/open/space/openspace,
-/area/space/nearstation)
-"cXo" = (
-/obj/machinery/light/small/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor1/port)
-"cXq" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/sign/poster/official/random/directional/south,
-/obj/machinery/light/directional/south,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor2/fore)
-"cXr" = (
-/obj/effect/turf_decal/tile/red/diagonal_edge,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/turf/open/floor/iron/dark,
-/area/station/security/prison/visit)
-"cXs" = (
-/obj/effect/turf_decal/trimline/yellow/filled/line{
- dir = 9
- },
-/obj/structure/closet/firecloset/full,
-/turf/open/floor/iron,
-/area/station/hallway/floor1/aft)
-"cXC" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/station/maintenance/floor3/port/fore)
-"cXD" = (
-/obj/machinery/suit_storage_unit/security,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/effect/turf_decal/bot,
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/dark,
-/area/station/security/eva)
-"cXG" = (
-/obj/structure/table,
-/obj/item/stack/sheet/glass/fifty,
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/item/radio/intercom/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/hfr_room)
-"cXI" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/starboard)
-"cXJ" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/item/toy/plush/lizard_plushie/green{
- desc = "A stuffed toy which resembles a wayward Ashlander. This one fills you with hope for the future.";
- name = "Bites-The-Wires"
- },
-/obj/effect/turf_decal/trimline/green/line{
- dir = 10
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/port/fore)
-"cXK" = (
-/obj/effect/turf_decal/trimline/green/line{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/green/line{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/floor,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor3/fore)
-"cXP" = (
-/obj/machinery/telecomms/bus/preset_three,
-/turf/open/floor/circuit/telecomms,
-/area/station/tcommsat/server)
-"cYh" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/effect/turf_decal/stripes,
-/obj/effect/turf_decal/stripes{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/effect/spawner/random/engineering/tank,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/starboard)
-"cYu" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/machinery/computer/security/telescreen/entertainment/directional/south,
-/turf/open/floor/wood,
-/area/station/commons/dorms/apartment2)
-"cYx" = (
-/obj/structure/window/reinforced/spawner/directional/north,
-/obj/structure/rack,
-/obj/item/wrench,
-/obj/effect/turf_decal/trimline/yellow/line{
- dir = 9
- },
-/obj/effect/turf_decal/siding/thinplating_new/dark{
- dir = 1
- },
-/turf/open/floor/iron/telecomms,
-/area/station/tcommsat/server)
-"cYF" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
- dir = 1
- },
-/obj/machinery/portable_atmospherics/canister,
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/engineering/atmos/pumproom)
-"cYP" = (
-/obj/structure/closet/wardrobe/black,
-/obj/effect/spawner/random/contraband/permabrig_weapon,
-/turf/open/floor/iron,
-/area/station/maintenance/floor4/starboard)
-"cYR" = (
-/obj/machinery/atmospherics/pipe/smart/simple/green/visible{
- dir = 4
- },
-/obj/machinery/door/window/left/directional/south{
- name = "Inner Pipe Access";
- req_access = list("atmospherics")
- },
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"cYS" = (
-/obj/structure/closet/emcloset/anchored,
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor3/starboard/aft)
-"cYW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/dark/side{
- dir = 9
- },
-/area/station/security/prison)
-"cYZ" = (
-/obj/structure/chair/sofa/bench{
- dir = 1
- },
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor1/fore)
-"cZe" = (
-/obj/effect/turf_decal/tile/green/half,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/secondary/exit/escape_pod)
-"cZA" = (
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 6
- },
-/obj/item/reagent_containers/cup/bottle/morphine{
- pixel_y = 6
- },
-/obj/item/reagent_containers/syringe,
-/obj/structure/table,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/iron/white,
-/area/station/security/prison/safe)
-"cZB" = (
-/obj/structure/sign/painting/library{
- pixel_x = -32
- },
-/obj/machinery/holopad,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/wood/large,
-/area/station/service/library/artgallery)
-"cZG" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/duct,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/cmo)
-"cZK" = (
-/obj/structure/chair/sofa/bench/left{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/security/prison)
-"cZS" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/science/xenobiology)
-"cZT" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable,
-/obj/machinery/computer/order_console/cook{
- dir = 8
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/service)
-"daa" = (
-/obj/machinery/camera/motion/directional/north{
- c_tag = "Minisat North"
- },
-/obj/machinery/power/smes/super/full,
-/obj/structure/cable,
-/turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/aisat/service)
-"dab" = (
-/obj/effect/spawner/random/trash/garbage{
- spawn_scatter_radius = 1
- },
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/starboard/fore)
-"dac" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/effect/spawner/random/trash/cigbutt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/fore)
-"daf" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/exit/departure_lounge)
-"dan" = (
-/obj/structure/cable,
-/obj/effect/spawner/random/trash/graffiti{
- pixel_x = -32
- },
-/turf/open/floor/iron,
-/area/station/service/hydroponics/garden)
-"daz" = (
-/obj/machinery/light/directional/north,
-/mob/living/basic/pet/penguin/baby/permanent{
- dir = 8
- },
-/turf/open/misc/snow/actually_safe{
- icon_state = "snow6"
- },
-/area/station/hallway/floor2/fore)
-"daD" = (
-/obj/effect/turf_decal/tile/red/half/contrasted,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor4/aft)
-"daT" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/hallway/floor2/aft)
-"daY" = (
-/obj/machinery/door/poddoor/shutters{
- id = "survhang";
- name = "Ancient Hangars"
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor4/starboard/aft)
-"dbc" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 4
- },
-/obj/machinery/door/airlock/external{
- name = "External Airlock"
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/secondary/exit)
-"dbe" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/tile/yellow/half/contrasted{
- dir = 1
- },
-/obj/structure/table,
-/obj/effect/spawner/random/trash/janitor_supplies,
-/obj/item/stack/sheet/plasteel{
- amount = 10
- },
-/obj/item/stack/rods/fifty,
-/turf/open/floor/iron,
-/area/station/construction/mining/aux_base)
-"dby" = (
-/turf/open/floor/iron/dark/side{
- dir = 4
- },
-/area/station/hallway/secondary/exit/departure_lounge)
-"dbH" = (
-/obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance,
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Hatch"
- },
-/turf/open/floor/catwalk_floor,
-/area/station/construction/mining/aux_base)
-"dbK" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/stripes,
-/turf/open/floor/iron/white,
-/area/station/science/auxlab/firing_range)
-"dbN" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/trimline/blue/warning,
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor2/aft)
-"dbU" = (
-/obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2{
- dir = 4
- },
-/obj/machinery/airlock_controller/incinerator_atmos{
- pixel_y = 26
- },
-/obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/bridge_pipe/supply/visible/layer4,
-/turf/open/floor/iron,
-/area/station/maintenance/disposal/incinerator)
-"dbZ" = (
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/wood,
-/area/station/hallway/floor4/fore)
-"dch" = (
-/obj/machinery/light/directional/east,
-/obj/structure/sign/poster/random/directional/south,
-/turf/open/floor/carpet/purple,
-/area/station/commons/dorms/apartment1)
-"dcp" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/red/line{
- dir = 8
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron/textured_large,
-/area/station/engineering/lobby)
-"dcw" = (
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/starboard)
-"dcG" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/station/hallway/secondary/exit/departure_lounge)
-"dcH" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/mapping_helpers/broken_floor,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/wood,
-/area/station/maintenance/floor3/starboard/aft)
-"dcN" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/port)
-"dcO" = (
-/obj/effect/turf_decal/tile/yellow{
- dir = 4
- },
-/obj/effect/turf_decal/tile/yellow{
- dir = 8
- },
-/turf/open/floor/iron/white/small,
-/area/station/medical/chemistry)
-"dcZ" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 8
- },
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
-"ddb" = (
-/obj/structure/closet/crate/solarpanel_small,
-/obj/machinery/door/window/left/directional/west{
- name = "Spare Solars";
- req_access = list("engineering")
- },
-/turf/open/floor/plating/airless,
-/area/station/maintenance/solars/starboard/aft)
-"ddd" = (
-/obj/structure/bodycontainer/morgue{
- dir = 8
- },
-/obj/machinery/camera/autoname/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/service/chapel/funeral)
-"ddg" = (
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"ddj" = (
-/obj/effect/turf_decal/trimline/green/warning{
- dir = 1
- },
-/obj/machinery/light/small/red/directional/south,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor3/port/aft)
-"ddv" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table/bronze,
-/obj/item/toy/eightball,
-/turf/open/floor/bronze,
-/area/station/maintenance/floor1/starboard)
-"ddx" = (
-/obj/structure/curtain/cloth/fancy/mechanical{
- id = "restaurant_booth_a";
- name = "Booth A"
- },
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/turf/open/floor/carpet/royalblack,
-/area/station/service/kitchen/diner)
-"ddy" = (
-/obj/effect/turf_decal/trimline/brown/filled/line{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/hallway/floor3/aft)
-"ddA" = (
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/trimline/red/filled/line,
-/obj/machinery/holopad,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/security/checkpoint/second)
-"ddH" = (
-/obj/effect/turf_decal/tile/neutral/full,
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/iron,
-/area/station/science/ordnance/testlab)
-"ddM" = (
-/obj/structure/chair{
- dir = 8
- },
-/obj/effect/turf_decal/stripes/line{
- dir = 4
- },
-/turf/open/floor/plating/reinforced{
- initial_gas_mix = "TEMP=2.7"
- },
-/area/station/science/ordnance/bomb)
-"ddO" = (
-/obj/effect/turf_decal/siding/wideplating_new/corner,
-/obj/effect/turf_decal/siding/wideplating_new/corner{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/purple/corner{
- dir = 8
- },
-/obj/machinery/newscaster/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/iron/white,
-/area/station/science/cytology)
-"ddT" = (
-/obj/structure/closet/radiation,
-/obj/effect/turf_decal/siding/thinplating_new/dark,
-/turf/open/floor/iron/dark/textured_corner{
- dir = 1
- },
-/area/station/engineering/supermatter/room)
-"ddW" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/floor1/aft)
-"deg" = (
-/obj/machinery/door/airlock/external{
- name = "External Airlock"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 8
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
-/turf/open/floor/plating,
-/area/station/maintenance/floor4/starboard/aft)
-"dej" = (
-/obj/machinery/door/firedoor/heavy,
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
-"dek" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor4/port)
-"del" = (
-/obj/machinery/door/airlock/shuttle,
-/turf/open/floor/mineral/plastitanium,
-/area/station/maintenance/floor2/starboard/aft)
-"deu" = (
-/obj/structure/railing{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/green/filled/arrow_ccw,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron,
-/area/station/commons/vacant_room/commissary)
-"deF" = (
-/obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/aft)
-"deG" = (
-/obj/structure/flora/bush/sparsegrass/style_random,
-/turf/open/floor/grass,
-/area/station/service/library/garden)
-"deK" = (
-/obj/structure/secure_safe/directional/south,
-/turf/open/floor/mineral/plastitanium,
-/area/station/maintenance/floor2/starboard/aft)
-"deM" = (
-/turf/open/floor/iron/white/textured_large,
-/area/station/service/chapel)
-"dfa" = (
-/obj/item/flashlight/lamp/green,
-/obj/structure/table/wood,
-/obj/item/instrument/guitar,
-/obj/machinery/duct,
-/turf/open/floor/wood/parquet,
-/area/station/command/heads_quarters/cmo)
-"dff" = (
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor3/fore)
-"dfi" = (
-/obj/effect/decal/cleanable/blood/tracks{
- dir = 6
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/aft)
-"dfl" = (
-/obj/structure/chair/comfy/teal{
- dir = 4
- },
-/obj/effect/landmark/start/hangover,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/starboard/fore)
-"dfm" = (
-/obj/effect/turf_decal/trimline/red/line{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/red/line,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/hallway/floor4/fore)
-"dfn" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/commons/locker)
-"dfp" = (
-/obj/effect/spawner/random/trash/mess,
-/obj/effect/spawner/random/trash/grime,
-/turf/open/floor/light/colour_cycle/dancefloor_a,
-/area/station/medical/abandoned)
-"dfs" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/middle{
- dir = 4
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/maintenance/floor3/port)
-"dfw" = (
-/obj/machinery/status_display/ai/directional/west,
-/turf/open/openspace,
-/area/station/ai_monitored/turret_protected/aisat/hallway)
-"dfA" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/starboard)
-"dfB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/door/poddoor/shutters/window/preopen{
- dir = 1;
- name = "Medbay Lockdown Shutters";
- id = "med_lockdown"
- },
-/turf/open/floor/plating,
-/area/station/medical/medbay/lobby)
-"dfP" = (
-/obj/structure/chair{
- dir = 8
- },
-/obj/structure/sign/poster/contraband/red_rum/directional/east,
-/obj/effect/landmark/start/assistant,
-/turf/open/floor/iron/showroomfloor,
-/area/station/commons/fitness)
-"dfR" = (
-/obj/structure/disposalpipe/junction{
- dir = 8
- },
-/turf/open/floor/iron/checker,
-/area/station/commons/locker)
-"dfU" = (
-/obj/machinery/computer/pandemic,
-/obj/structure/sign/poster/official/periodic_table/directional/north,
-/obj/machinery/camera/autoname/directional/north,
-/turf/open/floor/iron/dark,
-/area/station/medical/virology)
-"dgb" = (
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/turf/open/floor/iron/textured_large,
-/area/station/hallway/secondary/exit/departure_lounge)
-"dge" = (
-/obj/effect/turf_decal/stripes{
- dir = 5
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/iron,
-/area/station/maintenance/floor2/starboard/aft)
-"dgp" = (
-/obj/effect/turf_decal/stripes/line{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
-/obj/structure/railing{
- dir = 1
- },
-/turf/open/floor/iron,
-/area/station/cargo/miningdock)
-"dgq" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/disposalpipe/segment,
-/obj/effect/turf_decal/tile/red/fourcorners,
-/turf/open/floor/iron/dark,
-/area/station/security/office)
-"dgs" = (
-/obj/effect/spawner/structure/window/reinforced/plasma,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/aft)
-"dgw" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/door/airlock/silver{
- name = "Bathroom"
- },
-/turf/open/floor/iron/showroomfloor,
-/area/station/commons/dorms/apartment2)
-"dgA" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/structure/sign/warning/pods/directional/south,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor3/port/aft)
-"dgU" = (
-/obj/structure/cable,
-/obj/machinery/light/red/dim/directional/north,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/port)
-"dgZ" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/iron/white,
-/area/station/medical/abandoned)
-"dhb" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/door/airlock/public/glass{
- name = "Petting Zoo"
- },
-/obj/machinery/door/firedoor,
-/turf/open/floor/iron/white,
-/area/station/science/cytology)
-"dhs" = (
-/obj/structure/table/wood/fancy/royalblack,
-/obj/item/modular_computer/laptop/preset/civilian,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/carpet/neon/simple/white,
-/area/station/commons/dorms/room3)
-"dhE" = (
-/obj/machinery/power/turbine/inlet_compressor{
- dir = 1
- },
-/turf/open/floor/engine,
-/area/station/maintenance/disposal/incinerator)
-"dhJ" = (
-/obj/effect/turf_decal/trimline/purple/line,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/white,
-/area/station/science/lobby)
-"dhX" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/iron,
-/area/station/hallway/floor2/fore)
-"dhZ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/effect/turf_decal/trimline/blue/filled/line{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/station/medical/paramedic)
-"dil" = (
-/obj/machinery/door/airlock/hatch{
- name = "Maintenance Hatch"
- },
-/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/starboard/aft)
-"dim" = (
-/obj/structure/chair/stool/bar/directional/east,
-/obj/machinery/light/cold/no_nightlight/directional/west,
-/obj/effect/turf_decal/trimline/purple/filled/line{
- dir = 4
- },
-/turf/open/floor/iron,
-/area/station/science/auxlab)
-"din" = (
-/obj/structure/cable,
-/obj/structure/sign/poster/official/random/directional/south,
-/turf/open/floor/iron/smooth,
-/area/station/cargo/sorting)
-"dit" = (
-/obj/effect/decal/cleanable/blood/gibs/old,
-/turf/open/floor/iron/dark,
-/area/station/maintenance/floor2/starboard/aft)
-"diA" = (
-/turf/closed/wall,
-/area/station/service/kitchen/coldroom)
-"diS" = (
-/obj/machinery/door/airlock/freezer{
- name = "Bathroom"
- },
-/turf/open/floor/iron/showroomfloor,
-/area/station/service/theater)
-"diU" = (
-/obj/effect/decal/cleanable/ash,
-/obj/structure/disposalpipe/broken{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/station/medical/abandoned)
-"diW" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
- },
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port/aft)
-"djc" = (
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/space/openspace,
-/area/space/nearstation)
-"djd" = (
-/obj/structure/cable,
-/turf/open/floor/iron/dark,
-/area/station/security/courtroom)
-"dje" = (
-/obj/structure/chair/stool/bamboo,
-/turf/open/floor/iron/white/textured_large,
-/area/station/service/chapel/office)
-"dji" = (
-/obj/structure/table,
-/obj/machinery/recharger,
-/turf/open/floor/iron/white/small,
-/area/station/security/execution/education)
-"djs" = (
-/obj/structure/railing,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor2/port/fore)
-"djv" = (
-/obj/effect/landmark/start/research_director,
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/turf/open/floor/iron/white,
-/area/station/command/heads_quarters/rd)
-"djx" = (
-/obj/structure/window/reinforced/spawner/directional/south,
-/obj/effect/turf_decal/tile/green/full,
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/siding/wood{
- dir = 8
- },
-/obj/structure/displaycase/forsale/kitchen{
- pixel_y = 8
- },
-/turf/open/floor/iron/dark/smooth_large,
-/area/station/service/bar)
-"djy" = (
-/turf/closed/wall/mineral/iron,
-/area/station/maintenance/floor3/starboard/aft)
-"djF" = (
-/obj/structure/rack,
-/obj/item/chair/plastic,
-/obj/item/chair/plastic{
- pixel_y = 4
- },
-/obj/item/chair/plastic{
- pixel_y = 8
- },
-/obj/item/chair/plastic{
- pixel_y = 12
- },
-/obj/item/chair/plastic{
- pixel_y = 14
- },
-/obj/effect/turf_decal/trimline/green/warning,
-/turf/open/floor/pod,
-/area/station/maintenance/floor3/starboard)
-"djH" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor,
-/obj/effect/mapping_helpers/airlock/access/all/science/genetics,
-/obj/structure/cable,
-/obj/machinery/door/airlock/science{
- name = "Genetics"
- },
-/turf/open/floor/iron,
-/area/station/science/genetics)
-"djJ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
-"djX" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor1/starboard/fore)
-"dke" = (
-/obj/machinery/door/window/left/directional/south,
-/obj/machinery/door/window/left/directional/north,
-/obj/machinery/holopad,
-/turf/open/floor/circuit/green,
-/area/station/science/server)
-"dkf" = (
-/obj/machinery/light/floor,
-/turf/open/floor/iron,
-/area/station/cargo/storage)
-"dkh" = (
-/obj/machinery/camera/motion/directional/south{
- name = "Minisat - Starboard";
- network = list("minisat")
- },
-/turf/open/floor/engine/hull/reinforced,
-/area/space/nearstation)
-"dkk" = (
-/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible/layer2,
-/obj/machinery/atmospherics/pipe/smart/simple/supply/visible,
-/turf/open/floor/iron,
-/area/station/engineering/atmos)
-"dkn" = (
-/obj/structure/railing/corner{
- dir = 4
- },
-/turf/open/space/openspace,
-/area/space/nearstation)
-"dks" = (
-/obj/structure/girder,
-/obj/item/stack/sheet/iron,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor4/starboard)
-"dkD" = (
-/obj/machinery/computer/cargo/request{
- dir = 4
- },
-/turf/open/floor/iron/dark,
-/area/station/command/bridge)
-"dkP" = (
-/obj/structure/bodycontainer/morgue{
- dir = 2
- },
-/turf/open/floor/iron/dark,
-/area/station/security/execution/education)
-"dkQ" = (
-/obj/effect/turf_decal/tile/neutral/opposingcorners{
- dir = 8
- },
-/obj/structure/filingcabinet/chestdrawer,
-/obj/structure/cable,
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/iron/dark,
-/area/station/command/heads_quarters/rd)
-"dla" = (
-/obj/effect/spawner/random/structure/girder,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/starboard/aft)
-"dlp" = (
-/obj/effect/turf_decal/tile/yellow,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/engineering/storage/tcomms)
-"dlt" = (
-/turf/open/floor/wood,
-/area/station/command/heads_quarters/hos)
-"dly" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/directional,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/station/security/prison/safe)
-"dlR" = (
-/obj/item/radio/intercom/directional/north{
- broadcasting = 1;
- frequency = 1447;
- listening = 0;
- name = "Private Channel"
- },
-/obj/machinery/recharge_station,
-/obj/machinery/computer/security/telescreen/minisat/directional/east,
-/turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/aisat/service)
-"dlW" = (
-/turf/closed/wall,
-/area/station/maintenance/floor4/starboard/aft)
-"dmc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/cable,
-/obj/effect/landmark/navigate_destination/eva,
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor4/fore)
-"dmx" = (
-/obj/docking_port/stationary{
- dir = 8;
- dwidth = 12;
- height = 18;
- name = "Emergency Shuttle Dock";
- shuttle_id = "emergency_home";
- width = 32
- },
-/turf/open/space/basic,
-/area/space)
-"dmG" = (
-/obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor1/port/fore)
-"dmR" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/floor4/port/aft)
-"dmS" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/turf/open/floor/iron/dark/side{
- dir = 6
- },
-/area/station/hallway/floor1/aft)
-"dmU" = (
-/turf/open/floor/iron/dark/side,
-/area/station/hallway/secondary/entry)
-"dnx" = (
-/obj/structure/girder,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/fore)
-"dny" = (
-/turf/open/floor/iron/textured_half{
- dir = 1
- },
-/area/station/cargo/office)
-"dnH" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/cup/beaker/large,
-/obj/item/reagent_containers/dropper,
-/turf/open/floor/iron/dark/textured,
-/area/station/medical/pharmacy)
-"dnJ" = (
-/obj/structure/railing{
- dir = 4
- },
-/obj/effect/turf_decal/trimline/green/warning{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/structure/disposalpipe/segment,
-/turf/open/floor/pod/light,
-/area/station/maintenance/floor2/starboard)
-"dnM" = (
-/obj/structure/chair{
- dir = 1
- },
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/station/maintenance/floor2/starboard/aft)
-"dnR" = (
-/obj/structure/disposalpipe/junction{
- dir = 2
- },
-/turf/open/floor/iron/dark/side{
- dir = 1
- },
-/area/station/hallway/floor3/fore)
-"dnS" = (
-/obj/structure/lattice/catwalk,
-/turf/open/space/openspace,
-/area/station/solars/port/aft)
-"dnT" = (
-/obj/effect/turf_decal/tile/blue,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/turf/open/floor/iron,
-/area/station/engineering/lobby)
-"dnU" = (
-/turf/closed/wall,
-/area/station/security/office)
-"dog" = (
-/obj/structure/showcase/cyborg/old{
- dir = 8;
- pixel_x = 9;
- pixel_y = 2
- },
-/obj/machinery/camera/autoname/directional/east,
-/turf/open/floor/circuit,
-/area/station/ai_monitored/turret_protected/aisat_interior)
-"doh" = (
-/obj/effect/turf_decal/trimline/green/filled/line{
- dir = 10
- },
-/turf/open/floor/iron/dark,
-/area/station/medical/virology)
-"dop" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/stairs/south,
-/turf/open/floor/pod/dark,
-/area/station/maintenance/floor2/port)
-"dou" = (
-/obj/effect/decal/cleanable/ash,
-/obj/effect/mapping_helpers/broken_floor,
-/turf/open/floor/plating,
-/area/station/maintenance/floor1/port/aft)
-"doy" = (
-/obj/machinery/light/directional/east,
-/obj/machinery/shower/directional/south,
-/turf/open/floor/iron/freezer,
-/area/station/service/chapel)
-"doC" = (
-/obj/effect/spawner/structure/window/hollow/plasma/middle{
- dir = 4
- },
-/obj/structure/girder/reinforced,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
-/turf/open/floor/engine,
-/area/station/science/ordnance/burnchamber)
-"doJ" = (
-/obj/structure/flora/bush/flowers_br/style_random,
-/turf/open/floor/grass,
-/area/station/science/genetics)
-"doT" = (
-/obj/structure/table/reinforced,
-/obj/item/grenade/chem_grenade{
- pixel_x = -4
- },
-/obj/item/grenade/chem_grenade{
- pixel_x = 5
- },
-/obj/item/grenade/chem_grenade,
-/obj/item/stack/cable_coil,
-/obj/item/screwdriver{
- pixel_y = 10
- },
-/obj/effect/turf_decal/tile/yellow/opposingcorners,
-/obj/structure/extinguisher_cabinet/directional/south,
-/turf/open/floor/iron/white,
-/area/station/medical/pharmacy)
-"dpd" = (
-/obj/structure/chair{
- dir = 4
- },
-/obj/machinery/newscaster/directional/south,
-/obj/effect/turf_decal/tile/bar/opposingcorners,
-/turf/open/floor/iron/checker,
-/area/station/service/bar/atrium)
-"dps" = (
-/obj/effect/turf_decal/siding/wood{
- dir = 1
- },
-/obj/structure/sign/poster/official/random/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/wood/tile,
-/area/station/service/library)
-"dpC" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light/directional/east,
-/turf/open/floor/iron/dark/textured_edge{
- dir = 8
- },
-/area/station/medical/chemistry)
-"dpH" = (
-/turf/closed/wall/r_wall,
-/area/station/cargo/miningdock)
-"dpL" = (
-/turf/closed/wall,
-/area/station/science/lower)
-"dpM" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
- dir = 8
- },
-/obj/effect/turf_decal/trimline/red/arrow_cw{
- dir = 4
- },
-/turf/open/floor/mineral/plastitanium{
- desc = "cushioned to protect from rough landings";
- name = "boxing ring"
- },
-/area/station/commons/fitness)
-"dpP" = (
-/obj/effect/turf_decal/tile/purple/opposingcorners,
-/obj/structure/closet/firecloset/full,
-/turf/open/floor/iron,
-/area/station/science/cytology)
-"dpQ" = (
-/obj/structure/filingcabinet/security,
-/turf/open/floor/iron/dark/corner{
- dir = 4
- },
-/area/station/service/lawoffice)
-"dpR" = (
-/obj/item/paper{
- default_raw_text = "The SM DOES IN FACT LOOP 1. Wrench in the plasma can. " + str + " ")
#define span_blueteamradio(str) ("" + str + " ")
#define span_bold(str) ("" + str + " ")
+/// This span outputs to OOC, it's meant for OOC announcements
+/// Use span_bolddanger for IC danger messages, it's identical to this
#define span_boldannounce(str) ("" + str + " ")
#define span_bolddanger(str) ("" + str + " ")
#define span_bolditalic(str) ("" + str + " ")
diff --git a/code/__DEFINES/surgery.dm b/code/__DEFINES/surgery.dm
index f510d7a1a9410..814c8fed9e5ca 100644
--- a/code/__DEFINES/surgery.dm
+++ b/code/__DEFINES/surgery.dm
@@ -93,6 +93,12 @@
#define SURGERY_REQUIRES_REAL_LIMB (1<<4)
///Will grant a bonus during surgery steps to users with TRAIT_MORBID while they're using tools with CRUEL_IMPLEMENT
#define SURGERY_MORBID_CURIOSITY (1<<5)
+/**
+ * Instead of checking if the tool used is an actual surgery tool to avoid accidentally whacking patients with the wrong tool,
+ * it'll check if it has a defined tool behaviour instead. Useful for surgeries that use mechanical tools instead of medical ones,
+ * like hardware manipulation.
+ */
+#define SURGERY_CHECK_TOOL_BEHAVIOUR (1<<6)
///Return true if target is not in a valid body position for the surgery
#define IS_IN_INVALID_SURGICAL_POSITION(target, surgery) ((surgery.surgery_flags & SURGERY_REQUIRE_RESTING) && (target.mobility_flags & MOBILITY_LIEDOWN && target.body_position != LYING_DOWN))
diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm
index 64e5031cd667a..eb623ed708ec9 100644
--- a/code/__DEFINES/traits/declarations.dm
+++ b/code/__DEFINES/traits/declarations.dm
@@ -731,6 +731,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
///Mobs won't slip on a wet turf while it has this trait
#define TRAIT_TURF_IGNORE_SLIPPERY "turf_ignore_slippery"
+///failsafe for whether an item with the beauty element is influencing the beauty of the area of not.
+#define TRAIT_BEAUTY_APPLIED "beauty_applied"
+
/// Mobs with this trait can't send the mining shuttle console when used outside the station itself
#define TRAIT_FORBID_MINING_SHUTTLE_CONSOLE_OUTSIDE_STATION "forbid_mining_shuttle_console_outside_station"
@@ -799,8 +802,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_ROD_ATTRACT_SHINY_LOVERS "rod_attract_shiny_lovers"
/// This rod can be used to fish on lava
#define TRAIT_ROD_LAVA_USABLE "rod_lava_usable"
-/// Stuff that can go inside fish cases
-#define TRAIT_FISH_CASE_COMPATIBILE "fish_case_compatibile"
+/// Stuff that can go inside fish cases and aquariums
+#define TRAIT_AQUARIUM_CONTENT "aquarium_content"
/// If the item can be used as a bit.
#define TRAIT_FISHING_BAIT "fishing_bait"
/// This bait will kill any fish that doesn't have it on its favorite_bait list
@@ -818,6 +821,19 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
* instead, it'll allow the fishing dud to be there unless there's at least one fish that likes the bait
*/
#define TRAIT_BAIT_ALLOW_FISHING_DUD "bait_dont_affect_fishing_dud"
+/**
+ * This location has the aquarium component. Not much different than a GetComponent()
+ * disguised as an 'is_x' macro, but I don't have to hide anything here.
+ * I just don't want a confusing 'is_aquarium(A)' macro which people think it's interchangable with
+ * an 'istype(A, /obj/structure/aquarium)' when it's the component what truly matters.
+ */
+#define TRAIT_IS_AQUARIUM "is_aquarium"
+/// A location (probably aquarium) that amplifies the zaps of electricity-generating fish.
+#define TRAIT_BIOELECTRIC_GENERATOR "bioelectric_generator"
+/// A location (likely aquarium) that doesn't allow fish to growth and reproduce
+#define TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH "stop_fish_reproduction_and_growth"
+/// This is an aquarium with an open panel
+#define TRAIT_AQUARIUM_PANEL_OPEN "aquarium_panel_open"
/// Plants that were mutated as a result of passive instability, not a mutation threshold.
#define TRAIT_PLANT_WILDMUTATE "wildmutation"
/// If you hit an APC with exposed internals with this item it will try to shock you
@@ -1375,4 +1391,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Gives a little examine to their body that they can be revived with a soul
#define TRAIT_GHOSTROLE_ON_REVIVE "ghostrole_on_revive"
+///Trait given to atoms currently affected by projectile dampeners
+#define TRAIT_GOT_DAMPENED "got_dampened"
+
// END TRAIT DEFINES
diff --git a/code/__DEFINES/traits/sources.dm b/code/__DEFINES/traits/sources.dm
index 12d1c2e3b903f..4deb392514123 100644
--- a/code/__DEFINES/traits/sources.dm
+++ b/code/__DEFINES/traits/sources.dm
@@ -309,3 +309,6 @@
/// Trait from an engraving
#define ENGRAVED_TRAIT "engraved"
+
+/// From the aquarium component
+#define AQUARIUM_TRAIT "aquarium"
diff --git a/code/__HELPERS/_planes.dm b/code/__HELPERS/_planes.dm
index 87e9ff2d1ce69..1bebefa2fa84b 100644
--- a/code/__HELPERS/_planes.dm
+++ b/code/__HELPERS/_planes.dm
@@ -92,12 +92,13 @@ GLOBAL_LIST_INIT(topdown_planes, list(
"[FLOOR_PLANE]" = TRUE,
))
+#define IS_TOPDOWN_PLANE(plane) GLOB.topdown_planes["[PLANE_TO_TRUE(plane)]"]
+
/// Checks if a passed in MA or atom is allowed to have its current plane/layer matchup
/proc/check_topdown_validity(mutable_appearance/thing_to_check)
if(istype(thing_to_check, /atom/movable/screen/plane_master))
return
- var/topdown_plane = GLOB.topdown_planes["[PLANE_TO_TRUE(thing_to_check.plane)]"]
- if(topdown_plane)
+ if(IS_TOPDOWN_PLANE(thing_to_check.plane))
if(thing_to_check.layer - TOPDOWN_LAYER < 0 || thing_to_check.layer >= BACKGROUND_LAYER)
stack_trace("[thing_to_check] ([thing_to_check.type]) was expected to have a TOPDOWN_LAYER layer due to its plane, but it DID NOT! layer: ([thing_to_check.layer]) plane: ([thing_to_check.plane])")
else if(thing_to_check.layer - TOPDOWN_LAYER >= 0 && thing_to_check.layer < BACKGROUND_LAYER)
diff --git a/code/__HELPERS/filters.dm b/code/__HELPERS/filters.dm
index 14233a2807636..930c889b09cab 100644
--- a/code/__HELPERS/filters.dm
+++ b/code/__HELPERS/filters.dm
@@ -312,9 +312,13 @@ GLOBAL_LIST_INIT(master_filter_info, list(
animate(filter, offset = random_roll, time = 0, loop = -1, flags = ANIMATION_PARALLEL)
animate(offset = random_roll - 1, time = rand() * 20 + 10)
-/proc/remove_wibbly_filters(atom/in_atom)
+/proc/remove_wibbly_filters(atom/in_atom, remove_duration = 0)
var/filter
for(var/i in 1 to 7)
filter = in_atom.get_filter("wibbly-[i]")
- animate(filter)
- in_atom.remove_filter("wibbly-[i]")
+ if(remove_duration == 0)
+ animate(filter)
+ in_atom.remove_filter("wibbly-[i]")
+ continue
+ animate(filter, x = 0, y = 0, size = 0, offset = 0, time = remove_duration)
+ addtimer(CALLBACK(in_atom, TYPE_PROC_REF(/datum, remove_filter), "wibbly-[i]"), remove_duration)
diff --git a/code/__HELPERS/maths.dm b/code/__HELPERS/maths.dm
index 040e9694429dc..27d3c5d38ab60 100644
--- a/code/__HELPERS/maths.dm
+++ b/code/__HELPERS/maths.dm
@@ -1,5 +1,5 @@
///Calculate the angle between two movables and the west|east coordinate
-/proc/get_angle(atom/movable/start, atom/movable/end)//For beams.
+/proc/get_angle(atom/movable/start, atom/movable/end)
if(!start || !end)
return 0
var/dy =(ICON_SIZE_Y * end.y + end.pixel_y) - (ICON_SIZE_Y * start.y + start.pixel_y)
@@ -238,7 +238,7 @@
return min(new_value, threshold * -1)
/// Takes two values x and y, and returns 1/((1/x) + y)
-/// Useful for providing an additive modifier to a value that is used as a divisor, such as `/obj/projectile/var/speed`
+/// Useful for providing an additive modifier to a value that is used as a divisor
/proc/reciprocal_add(x, y)
return 1/((1/x)+y)
diff --git a/code/__HELPERS/paths/jps.dm b/code/__HELPERS/paths/jps.dm
index 208888d21ba5c..daeddc13c60e4 100644
--- a/code/__HELPERS/paths/jps.dm
+++ b/code/__HELPERS/paths/jps.dm
@@ -55,7 +55,7 @@
/datum/pathfind/jps
/// The movable we are pathing
- var/atom/movable/caller
+ var/atom/movable/requester
/// The turf we're trying to path to (note that this won't track a moving target)
var/turf/end
/// The open list/stack we pop nodes out from (TODO: make this a normal list and macro-ize the heap operations to reduce proc overhead)
@@ -72,9 +72,9 @@
///Defines how we handle diagonal moves. See __DEFINES/path.dm
var/diagonal_handling = DIAGONAL_REMOVE_CLUNKY
-/datum/pathfind/jps/proc/setup(atom/movable/caller, list/access, max_distance, simulated_only, avoid, list/datum/callback/on_finish, atom/goal, mintargetdist, skip_first, diagonal_handling)
- src.caller = caller
- src.pass_info = new(caller, access)
+/datum/pathfind/jps/proc/setup(atom/movable/requester, list/access, max_distance, simulated_only, avoid, list/datum/callback/on_finish, atom/goal, mintargetdist, skip_first, diagonal_handling)
+ src.requester = requester
+ src.pass_info = new(requester, access)
src.max_distance = max_distance
src.simulated_only = simulated_only
src.avoid = avoid
@@ -88,12 +88,12 @@
/datum/pathfind/jps/Destroy(force)
. = ..()
- caller = null
+ requester = null
end = null
open = null
/datum/pathfind/jps/start()
- start = start || get_turf(caller)
+ start = start || get_turf(requester)
. = ..()
if(!.)
return .
@@ -115,7 +115,7 @@
. = ..()
if(!.)
return .
- if(QDELETED(caller))
+ if(QDELETED(requester))
return FALSE
while(!open.is_empty() && !path)
diff --git a/code/__HELPERS/paths/path.dm b/code/__HELPERS/paths/path.dm
index 950cd1906846c..da1c9917b6be2 100644
--- a/code/__HELPERS/paths/path.dm
+++ b/code/__HELPERS/paths/path.dm
@@ -4,7 +4,7 @@
* It will yield until a path is returned, using magic
*
* Arguments:
- * * caller: The movable atom that's trying to find the path
+ * * requester: The movable atom that's trying to find the path
* * end: What we're trying to path to. It doesn't matter if this is a turf or some other atom, we're gonna just path to the turf it's on anyway
* * max_distance: The maximum number of steps we can take in a given path to search (default: 30, 0 = infinite)
* * mintargetdistance: Minimum distance to the target before path returns, could be used to get near a target, but not right to it - for an AI mob with a gun, for example.
@@ -14,16 +14,16 @@
* * skip_first: Whether or not to delete the first item in the path. This would be done because the first item is the starting tile, which can break movement for some creatures.
* * diagonal_handling: defines how we handle diagonal moves. see __DEFINES/path.dm
*/
-/proc/get_path_to(atom/movable/caller, atom/end, max_distance = 30, mintargetdist, access=list(), simulated_only = TRUE, turf/exclude, skip_first=TRUE, diagonal_handling=DIAGONAL_REMOVE_CLUNKY)
+/proc/get_path_to(atom/movable/requester, atom/end, max_distance = 30, mintargetdist, access=list(), simulated_only = TRUE, turf/exclude, skip_first=TRUE, diagonal_handling=DIAGONAL_REMOVE_CLUNKY)
var/list/hand_around = list()
// We're guaranteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list
var/datum/callback/await = list(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pathfinding_finished), hand_around))
- if(!SSpathfinder.pathfind(caller, end, max_distance, mintargetdist, access, simulated_only, exclude, skip_first, diagonal_handling, await))
+ if(!SSpathfinder.pathfind(requester, end, max_distance, mintargetdist, access, simulated_only, exclude, skip_first, diagonal_handling, await))
return list()
UNTIL(length(hand_around))
var/list/return_val = hand_around[1]
- if(!islist(return_val) || (QDELETED(caller) || QDELETED(end))) // It's trash, just hand back empty to make it easy
+ if(!islist(return_val) || (QDELETED(requester) || QDELETED(end))) // It's trash, just hand back empty to make it easy
return list()
return return_val
@@ -37,7 +37,7 @@
* It will yield until a path is returned, using magic
*
* Arguments:
- * * caller: The movable atom that's trying to find the path
+ * * requester: The movable atom that's trying to find the path
* * end: What we're trying to path to. It doesn't matter if this is a turf or some other atom, we're gonna just path to the turf it's on anyway
* * max_distance: The maximum number of steps we can take in a given path to search (default: 30, 0 = infinite)
* * mintargetdistance: Minimum distance to the target before path returns, could be used to get near a target, but not right to it - for an AI mob with a gun, for example.
@@ -47,29 +47,29 @@
* * exclude: If we want to avoid a specific turf, like if we're a mulebot who already got blocked by some turf
* * skip_first: Whether or not to delete the first item in the path. This would be done because the first item is the starting tile, which can break movement for some creatures.
*/
-/proc/get_swarm_path_to(atom/movable/caller, atom/end, max_distance = 30, mintargetdist, age = MAP_REUSE_INSTANT, access = list(), simulated_only = TRUE, turf/exclude, skip_first=TRUE)
+/proc/get_swarm_path_to(atom/movable/requester, atom/end, max_distance = 30, mintargetdist, age = MAP_REUSE_INSTANT, access = list(), simulated_only = TRUE, turf/exclude, skip_first=TRUE)
var/list/hand_around = list()
// We're guaranteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list
var/datum/callback/await = list(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pathfinding_finished), hand_around))
- if(!SSpathfinder.swarmed_pathfind(caller, end, max_distance, mintargetdist, age, access, simulated_only, exclude, skip_first, await))
+ if(!SSpathfinder.swarmed_pathfind(requester, end, max_distance, mintargetdist, age, access, simulated_only, exclude, skip_first, await))
return list()
UNTIL(length(hand_around))
var/list/return_val = hand_around[1]
- if(!islist(return_val) || (QDELETED(caller) || QDELETED(end))) // It's trash, just hand back empty to make it easy
+ if(!islist(return_val) || (QDELETED(requester) || QDELETED(end))) // It's trash, just hand back empty to make it easy
return list()
return return_val
-/proc/get_sssp(atom/movable/caller, max_distance = 30, access = list(), simulated_only = TRUE, turf/exclude)
+/proc/get_sssp(atom/movable/requester, max_distance = 30, access = list(), simulated_only = TRUE, turf/exclude)
var/list/hand_around = list()
// We're guaranteed that list will be the first list in pathfinding_finished's argset because of how callback handles the arguments list
var/datum/callback/await = list(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pathfinding_finished), hand_around))
- if(!SSpathfinder.build_map(caller, get_turf(caller), max_distance, access, simulated_only, exclude, await))
+ if(!SSpathfinder.build_map(requester, get_turf(requester), max_distance, access, simulated_only, exclude, await))
return null
UNTIL(length(hand_around))
var/datum/path_map/return_val = hand_around[1]
- if(!istype(return_val, /datum/path_map) || (QDELETED(caller))) // It's trash, just hand back null to make it easy
+ if(!istype(return_val, /datum/path_map) || (QDELETED(requester))) // It's trash, just hand back null to make it easy
return null
return return_val
@@ -202,7 +202,7 @@
return modified_path
/**
- * For seeing if we can actually move between 2 given turfs while accounting for our access and the caller's pass_flags
+ * For seeing if we can actually move between 2 given turfs while accounting for our access and the requester's pass_flags
*
* Assumes destinantion turf is non-dense - check and shortcircuit in code invoking this proc to avoid overhead.
* Makes some other assumptions, such as assuming that unless declared, non dense objects will not block movement.
@@ -311,7 +311,7 @@
/// Let's avoid this
var/camera_type
- /// Weakref to the caller used to generate this info
+ /// Weakref to the requester used to generate this info
/// Should not use this almost ever, it's for context and to allow for proc chains that
/// Require a movable
var/datum/weakref/caller_ref = null
diff --git a/code/__HELPERS/paths/sssp.dm b/code/__HELPERS/paths/sssp.dm
index 21e520ea0164c..092da587793a8 100644
--- a/code/__HELPERS/paths/sssp.dm
+++ b/code/__HELPERS/paths/sssp.dm
@@ -201,8 +201,8 @@
/// Our current position in the working queue
var/working_index
-/datum/pathfind/sssp/proc/setup(atom/movable/caller, list/access, turf/center, max_distance, simulated_only, turf/avoid, list/datum/callback/on_finish)
- src.pass_info = new(caller, access)
+/datum/pathfind/sssp/proc/setup(atom/movable/requester, list/access, turf/center, max_distance, simulated_only, turf/avoid, list/datum/callback/on_finish)
+ src.pass_info = new(requester, access)
src.start = center
src.max_distance = max_distance
src.simulated_only = simulated_only
diff --git a/code/__HELPERS/type_processing.dm b/code/__HELPERS/type_processing.dm
index dfd74f7e3c6bc..e005088c2813f 100644
--- a/code/__HELPERS/type_processing.dm
+++ b/code/__HELPERS/type_processing.dm
@@ -128,11 +128,29 @@
if(endcheck.len > 1)
filter = endcheck[1]
end_len = length_char(filter)
+ var/endtype = (filter[length(filter)] == "*")
+ if (endtype)
+ filter = splittext(filter, "*")[1]
for(var/key in L)
var/value = L[key]
- if(findtext("[key]", filter, -end_len) || findtext("[value]", filter, -end_len))
+ if (findtext("[key]", filter, -end_len))
+ if (endtype)
+ var/list/split_filter = splittext("[key]", filter)
+ if (!findtext(split_filter[length(split_filter)], "/"))
+ matches[key] = value
+ continue
+ else
+ matches[key] = value
+ continue
+
+ if (findtext("[value]", filter, -end_len))
+ if (endtype)
+ var/list/split_filter = splittext("[value]", filter)
+ if (findtext(split_filter[length(split_filter)], "/"))
+ continue
matches[key] = value
+
return matches
/proc/return_typenames(type)
diff --git a/code/__HELPERS/view.dm b/code/__HELPERS/view.dm
index 139bdedc425ff..61aaed8835061 100644
--- a/code/__HELPERS/view.dm
+++ b/code/__HELPERS/view.dm
@@ -1,7 +1,5 @@
-/proc/getviewsize(view)
- if(!view) // Just to avoid any runtimes that could otherwise cause constant disconnect loops.
- stack_trace("Missing value for 'view' in getviewsize(), defaulting to world.view!")
- view = world.view
+/proc/getviewsize(view = world.view)
+ SHOULD_BE_PURE(TRUE)
if(isnum(view))
var/totalviewrange = (view < 0 ? -1 : 1) + 2 * view
diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index 9772ebff8d10f..2bd9309406a0a 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -81,7 +81,7 @@
#endif // REFERENCE_TRACKING_STANDARD
// If this is uncommented, we do a single run though of the game setup and tear down process with unit tests in between
-// #define UNIT_TESTS
+//#define UNIT_TESTS
// If this is uncommented, will attempt to load and initialize prof.dll/libprof.so by default.
// Even if it's not defined, you can pass "tracy" via -params in order to try to load it.
diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
index e311a67a89f9c..6fba866b857db 100644
--- a/code/_globalvars/bitfields.dm
+++ b/code/_globalvars/bitfields.dm
@@ -575,6 +575,9 @@ DEFINE_BITFIELD(fish_flags, list(
"FISH_DO_FLOP_ANIM" = FISH_DO_FLOP_ANIM,
"FISH_FLAG_PETTED" = FISH_FLAG_PETTED,
"FISH_FLAG_EXPERIMENT_SCANNABLE" = FISH_FLAG_EXPERIMENT_SCANNABLE,
+ "FISH_FLAG_UPDATING_SIZE_AND_WEIGHT" = FISH_FLAG_OVERPOPULATED,
+ "FISH_FLAG_SAFE_TEMPERATURE" = FISH_FLAG_SAFE_TEMPERATURE,
+ "FISH_FLAG_SAFE_FLUID" = FISH_FLAG_SAFE_FLUID,
))
DEFINE_BITFIELD(bot_mode_flags, list(
diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm
index d91eec6e1bc87..5ece846e84de3 100644
--- a/code/_globalvars/lists/mobs.dm
+++ b/code/_globalvars/lists/mobs.dm
@@ -59,7 +59,7 @@ GLOBAL_LIST_EMPTY(available_ai_shells)
GLOBAL_LIST_INIT(simple_animals, list(list(),list(),list())) // One for each AI_* status define
GLOBAL_LIST_EMPTY(spidermobs) //all sentient spider mobs
GLOBAL_LIST_EMPTY(bots_list)
-GLOBAL_LIST_EMPTY(aiEyes)
+GLOBAL_LIST_EMPTY(camera_eyes)
GLOBAL_LIST_EMPTY(suit_sensors_list) //all people with suit sensors on
/// All alive mobs with clients.
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 32929ccdb9f24..f2faf6ae81fe0 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -32,9 +32,13 @@ GLOBAL_LIST_EMPTY(deliverybeacontags)
GLOBAL_LIST_EMPTY_TYPED(singularities, /datum/component/singularity)
GLOBAL_LIST_EMPTY(item_to_design_list)
+
/// list of all surgeries by name, associated with their path.
GLOBAL_LIST_INIT(surgeries_list, init_surgeries())
+/// list of all surgery steps, associated by their path.
+GLOBAL_LIST_INIT(surgery_steps, init_subtypes_w_path_keys(/datum/surgery_step, list()))
+
/// Global list of all non-cooking related crafting recipes.
GLOBAL_LIST_EMPTY(crafting_recipes)
/// This is a global list of typepaths, these typepaths are atoms or reagents that are associated with crafting recipes.
@@ -80,3 +84,22 @@ GLOBAL_LIST_EMPTY(roundstart_station_borgcharger_areas)
/// List of area names of roundstart station mech rechargers, for the low charge/no charge mech screen alert tooltips.
GLOBAL_LIST_EMPTY(roundstart_station_mechcharger_areas)
+
+// List of organ typepaths that are not unit test-able, and shouldn't be spawned by some things, such as certain class prototypes.
+GLOBAL_LIST_INIT(prototype_organs, typecacheof(list(
+ /obj/item/organ,
+ /obj/item/organ/wings,
+ /obj/item/organ/wings/functional,
+ /obj/item/organ/wings/functional/moth,
+ /obj/item/organ/cyberimp,
+ /obj/item/organ/cyberimp/brain,
+ /obj/item/organ/cyberimp/mouth,
+ /obj/item/organ/cyberimp/arm,
+ /obj/item/organ/cyberimp/chest,
+ /obj/item/organ/cyberimp/eyes,
+ /obj/item/organ/alien,
+ /obj/item/organ/brain/dullahan,
+ /obj/item/organ/ears/dullahan,
+ /obj/item/organ/tongue/dullahan,
+ /obj/item/organ/eyes/dullahan,
+), only_root_path = TRUE))
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
index 399f12d91f551..f967b0b8bbca9 100644
--- a/code/_globalvars/traits/_traits.dm
+++ b/code/_globalvars/traits/_traits.dm
@@ -9,6 +9,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
/atom = list(
"TRAIT_AI_PAUSED" = TRAIT_AI_PAUSED,
"TRAIT_BANNED_FROM_CARGO_SHUTTLE" = TRAIT_BANNED_FROM_CARGO_SHUTTLE,
+ "TRAIT_BEAUTY_APPLIED" = TRAIT_BEAUTY_APPLIED,
"TRAIT_BEING_SHOCKED" = TRAIT_BEING_SHOCKED,
"TRAIT_CATCH_AND_RELEASE" = TRAIT_CATCH_AND_RELEASE,
"TRAIT_COMMISSIONED" = TRAIT_COMMISSIONED,
@@ -21,6 +22,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_FISHING_SPOT" = TRAIT_FISHING_SPOT,
"TRAIT_FOOD_CHEF_MADE" = TRAIT_FOOD_CHEF_MADE,
"TRAIT_FOOD_FRIED" = TRAIT_FOOD_FRIED,
+ "TRAIT_GOT_DAMPENED" = TRAIT_GOT_DAMPENED,
"TRAIT_QUALITY_FOOD_INGREDIENT" = TRAIT_QUALITY_FOOD_INGREDIENT,
"TRAIT_FOOD_SILVER" = TRAIT_FOOD_SILVER,
"TRAIT_KEEP_TOGETHER" = TRAIT_KEEP_TOGETHER,
@@ -35,8 +37,10 @@ GLOBAL_LIST_INIT(traits_by_type, list(
),
/atom/movable = list(
"TRAIT_ACTIVE_STORAGE" = TRAIT_ACTIVE_STORAGE,
+ "TRAIT_AQUARIUM_PANEL_OPEN" = TRAIT_AQUARIUM_PANEL_OPEN,
"TRAIT_AREA_SENSITIVE" = TRAIT_AREA_SENSITIVE,
"TRAIT_ASHSTORM_IMMUNE" = TRAIT_ASHSTORM_IMMUNE,
+ "TRAIT_BIOELECTRIC_GENERATOR" = TRAIT_BIOELECTRIC_GENERATOR,
"TRAIT_BLOCKING_EXPLOSIVES" = TRAIT_BLOCKING_EXPLOSIVES,
"TRAIT_BOULDER_BREAKER" = TRAIT_BOULDER_BREAKER,
"TRAIT_CASTABLE_LOC" = TRAIT_CASTABLE_LOC,
@@ -44,13 +48,13 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_COMBAT_MODE_SKIP_INTERACTION" = TRAIT_COMBAT_MODE_SKIP_INTERACTION,
"TRAIT_DEL_ON_SPACE_DUMP" = TRAIT_DEL_ON_SPACE_DUMP,
"TRAIT_VALID_DNA_INFUSION" = TRAIT_VALID_DNA_INFUSION,
- "TRAIT_FISH_CASE_COMPATIBILE" = TRAIT_FISH_CASE_COMPATIBILE,
"TRAIT_FROZEN" = TRAIT_FROZEN,
"TRAIT_HAS_LABEL" = TRAIT_HAS_LABEL,
"TRAIT_HEARING_SENSITIVE" = TRAIT_HEARING_SENSITIVE,
"TRAIT_HYPERSPACED" = TRAIT_HYPERSPACED,
"TRAIT_IMMERSED" = TRAIT_IMMERSED,
"TRAIT_IRRADIATED" = TRAIT_IRRADIATED,
+ "TRAIT_IS_AQUARIUM" = TRAIT_IS_AQUARIUM,
"TRAIT_LAVA_IMMUNE" = TRAIT_LAVA_IMMUNE,
"TRAIT_MOVE_FLOATING" = TRAIT_MOVE_FLOATING,
"TRAIT_MOVE_FLYING" = TRAIT_MOVE_FLYING,
@@ -72,6 +76,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_SECLUDED_LOCATION" = TRAIT_SECLUDED_LOCATION,
"TRAIT_SNOWSTORM_IMMUNE" = TRAIT_SNOWSTORM_IMMUNE,
"TRAIT_SPELLS_TRANSFER_TO_LOC" = TRAIT_SPELLS_TRANSFER_TO_LOC,
+ "TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH" = TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH,
"TRAIT_TELEKINESIS_CONTROLLED" = TRAIT_TELEKINESIS_CONTROLLED,
"TRAIT_UNDERFLOOR" = TRAIT_UNDERFLOOR,
"TRAIT_UNIQUE_IMMERSE" = TRAIT_UNIQUE_IMMERSE,
@@ -582,6 +587,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
),
/obj/item = list(
"TRAIT_APC_SHOCKING" = TRAIT_APC_SHOCKING,
+ "TRAIT_AQUARIUM_CONTENT" = TRAIT_AQUARIUM_CONTENT,
"TRAIT_BAIT_ALLOW_FISHING_DUD" = TRAIT_BAIT_ALLOW_FISHING_DUD,
"TRAIT_BAIT_UNCONSUMABLE" = TRAIT_BAIT_UNCONSUMABLE,
"TRAIT_BAKEABLE" = TRAIT_BAKEABLE,
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index c3fb19352ab05..73916264a8b3c 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -498,19 +498,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
"All Good Things Must End"
)
-/atom/movable/screen/alert/succumb/Initialize(mapload, datum/hud/hud_owner)
- . = ..()
- register_context()
-
-/atom/movable/screen/alert/succumb/add_context(atom/source, list/context, obj/item/held_item, mob/user)
- context[SCREENTIP_CONTEXT_LMB] = "Succumb With Last Words"
- context[SCREENTIP_CONTEXT_RMB] = "Succumb Silently"
- return CONTEXTUAL_SCREENTIP_SET
-
-#define FASTSUCCUMB_YES "Yes"
-#define FASTSUCCUMB_WAIT "Wait, I have last words!"
-#define FASTSUCCUMB_NO "No"
-
/atom/movable/screen/alert/succumb/Click(location, control, params)
. = ..()
if(!.)
@@ -521,17 +508,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
var/title = pick(death_titles)
- if(LAZYACCESS(params2list(params), RIGHT_CLICK))
- //Succumbing without a message
- var/choice = tgui_alert(living_owner, "Are you sure you want to succumb?", title, list(FASTSUCCUMB_YES, FASTSUCCUMB_WAIT, FASTSUCCUMB_NO))
- switch(choice)
- if(FASTSUCCUMB_NO, null)
- return
- if(FASTSUCCUMB_YES)
- living_owner.succumb()
- return
- //if(FASTSUCCUMB_WAIT), we continue to last words
-
//Succumbing with a message
var/last_whisper = tgui_input_text(usr, "Do you have any last words?", title, max_length = CHAT_MESSAGE_MAX_LENGTH, encode = FALSE) // saycode already handles sanitization
if(isnull(last_whisper))
@@ -540,9 +516,6 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
living_owner.say("#[last_whisper]")
living_owner.succumb(whispered = length(last_whisper) > 0)
-#undef FASTSUCCUMB_NO
-#undef FASTSUCCUMB_WAIT
-#undef FASTSUCCUMB_YES
//ALIENS
/atom/movable/screen/alert/alien_plas
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index d04dafefeb088..ab1e5fccfbb0d 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -206,6 +206,8 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
SIGNAL_HANDLER
update_parallax_pref() // If your eye changes z level, so should your parallax prefs
var/turf/eye_turf = get_turf(eye)
+ if(!eye_turf)
+ return
SEND_SIGNAL(src, COMSIG_HUD_Z_CHANGED, eye_turf.z)
var/new_offset = GET_TURF_PLANE_OFFSET(eye_turf)
if(current_plane_offset == new_offset)
diff --git a/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm b/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm
index acfa5ee274ca2..582253e0b926b 100644
--- a/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm
+++ b/code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm
@@ -362,7 +362,7 @@
/atom/movable/screen/plane_master/camera_static/proc/eye_changed(datum/hud/source, atom/old_eye, atom/new_eye)
SIGNAL_HANDLER
- if(!isaicamera(new_eye))
+ if(!iscameramob(new_eye))
if(!force_hidden)
hide_plane(source.mymob)
return
diff --git a/code/controllers/subsystem/dynamic/dynamic.dm b/code/controllers/subsystem/dynamic/dynamic.dm
index db9cc101b2add..fb690030d2b0b 100644
--- a/code/controllers/subsystem/dynamic/dynamic.dm
+++ b/code/controllers/subsystem/dynamic/dynamic.dm
@@ -626,7 +626,7 @@ SUBSYSTEM_DEF(dynamic)
failed = TRUE //AFK client
if(!failed && L.stat)
if(HAS_TRAIT(L, TRAIT_SUICIDED)) //Suicider
- msg += "[L.name] ([L.key]), the [L.job] ([span_boldannounce("Suicide")])\n"
+ msg += "[L.name] ([L.key]), the [L.job] ([span_bolddanger("Suicide")])\n"
failed = TRUE //Disconnected client
if(!failed && (L.stat == UNCONSCIOUS || L.stat == HARD_CRIT))
msg += "[L.name] ([L.key]), the [L.job] (Dying)\n"
@@ -640,7 +640,7 @@ SUBSYSTEM_DEF(dynamic)
if(D.mind && D.mind.current == L)
if(L.stat == DEAD)
if(HAS_TRAIT(L, TRAIT_SUICIDED)) //Suicider
- msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_boldannounce("Suicide")])\n"
+ msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_bolddanger("Suicide")])\n"
continue //Disconnected client
else
msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Dead)\n"
@@ -649,7 +649,7 @@ SUBSYSTEM_DEF(dynamic)
if(D.can_reenter_corpse)
continue //Adminghost, or cult/wizard ghost
else
- msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_boldannounce("Ghosted")])\n"
+ msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] ([span_bolddanger("Ghosted")])\n"
continue //Ghosted while alive
var/concatenated_message = msg.Join()
diff --git a/code/controllers/subsystem/pathfinder.dm b/code/controllers/subsystem/pathfinder.dm
index 17ee754718e5e..d95b3bff5388c 100644
--- a/code/controllers/subsystem/pathfinder.dm
+++ b/code/controllers/subsystem/pathfinder.dm
@@ -61,9 +61,9 @@ SUBSYSTEM_DEF(pathfinder)
currentmaps.len--
/// Initiates a pathfind. Returns true if we're good, FALSE if something's failed
-/datum/controller/subsystem/pathfinder/proc/pathfind(atom/movable/caller, atom/end, max_distance = 30, mintargetdist, access = list(), simulated_only = TRUE, turf/exclude, skip_first = TRUE, diagonal_handling = DIAGONAL_REMOVE_CLUNKY, list/datum/callback/on_finish)
+/datum/controller/subsystem/pathfinder/proc/pathfind(atom/movable/requester, atom/end, max_distance = 30, mintargetdist, access = list(), simulated_only = TRUE, turf/exclude, skip_first = TRUE, diagonal_handling = DIAGONAL_REMOVE_CLUNKY, list/datum/callback/on_finish)
var/datum/pathfind/jps/path = new()
- path.setup(caller, access, max_distance, simulated_only, exclude, on_finish, end, mintargetdist, skip_first, diagonal_handling)
+ path.setup(requester, access, max_distance, simulated_only, exclude, on_finish, end, mintargetdist, skip_first, diagonal_handling)
if(path.start())
active_pathing += path
return TRUE
@@ -71,21 +71,21 @@ SUBSYSTEM_DEF(pathfinder)
/// Initiates a swarmed pathfind. Returns TRUE if we're good, FALSE if something's failed
/// If a valid pathmap exists for the TARGET turf we'll use that, otherwise we have to build a new one
-/datum/controller/subsystem/pathfinder/proc/swarmed_pathfind(atom/movable/caller, atom/end, max_distance = 30, mintargetdist = 0, age = MAP_REUSE_INSTANT, access = list(), simulated_only = TRUE, turf/exclude, skip_first = TRUE, list/datum/callback/on_finish)
+/datum/controller/subsystem/pathfinder/proc/swarmed_pathfind(atom/movable/requester, atom/end, max_distance = 30, mintargetdist = 0, age = MAP_REUSE_INSTANT, access = list(), simulated_only = TRUE, turf/exclude, skip_first = TRUE, list/datum/callback/on_finish)
var/turf/target = get_turf(end)
- var/datum/can_pass_info/pass_info = new(caller, access)
+ var/datum/can_pass_info/pass_info = new(requester, access)
// If there's a map we can use already, use it
var/datum/path_map/valid_map = get_valid_map(pass_info, target, simulated_only, exclude, age, include_building = TRUE)
if(valid_map && valid_map.expand(max_distance))
- path_map_passalong(on_finish, get_turf(caller), mintargetdist, skip_first, valid_map)
+ path_map_passalong(on_finish, get_turf(requester), mintargetdist, skip_first, valid_map)
return TRUE
// Otherwise we're gonna make a new one, and turn it into a path for the callbacks passed into us
var/list/datum/callback/pass_in = list()
- pass_in += CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(path_map_passalong), on_finish, get_turf(caller), mintargetdist, skip_first)
+ pass_in += CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(path_map_passalong), on_finish, get_turf(requester), mintargetdist, skip_first)
// And to allow subsequent calls to reuse the same map, we'll put a placeholder in the cache, and fill it up when the pathing finishes
var/datum/path_map/empty = new()
- empty.pass_info = new(caller, access)
+ empty.pass_info = new(requester, access)
empty.start = target
empty.pass_space = simulated_only
empty.avoid = exclude
@@ -133,9 +133,9 @@ SUBSYSTEM_DEF(pathfinder)
source_to_maps[target] -= same_target
/// Initiates a SSSP run. Returns true if we're good, FALSE if something's failed
-/datum/controller/subsystem/pathfinder/proc/build_map(atom/movable/caller, turf/source, max_distance = 30, access = list(), simulated_only = TRUE, turf/exclude, list/datum/callback/on_finish)
+/datum/controller/subsystem/pathfinder/proc/build_map(atom/movable/requester, turf/source, max_distance = 30, access = list(), simulated_only = TRUE, turf/exclude, list/datum/callback/on_finish)
var/datum/pathfind/sssp/path = new()
- path.setup(caller, access, source, max_distance, simulated_only, exclude, on_finish)
+ path.setup(requester, access, source, max_distance, simulated_only, exclude, on_finish)
if(path.start())
active_pathing += path
return TRUE
@@ -160,7 +160,7 @@ SUBSYSTEM_DEF(pathfinder)
/// Optionally takes a max age to accept (defaults to 0 seconds) and a minimum acceptable range
/// If include_building is true and we can only find a building path, we'll use that instead. tho we will wait for it to finish first
/datum/controller/subsystem/pathfinder/proc/get_valid_map(datum/can_pass_info/pass_info, turf/target, simulated_only = TRUE, turf/exclude, age = MAP_REUSE_INSTANT, min_range = -INFINITY, include_building = FALSE)
- // Walk all the maps that match our caller's turf OR our target's
+ // Walk all the maps that match our requester's turf OR our target's
// Then hold onto em. If their cache time is short we can reuse/expand them, if not we'll have to make a new one
var/oldest_time = world.time - age
/// Backup return value used if no finished pathmaps are found
@@ -189,7 +189,7 @@ SUBSYSTEM_DEF(pathfinder)
/// Takes a set of pathfind info, returns all valid pathmaps that would work
/// Takes an optional minimum range arg
/datum/controller/subsystem/pathfinder/proc/get_valid_maps(datum/can_pass_info/pass_info, turf/target, simulated_only = TRUE, turf/exclude, age = MAP_REUSE_INSTANT, min_range = -INFINITY, include_building = FALSE)
- // Walk all the maps that match our caller's turf OR our target's
+ // Walk all the maps that match our requester's turf OR our target's
// Then hold onto em. If their cache time is short we can reuse/expand them, if not we'll have to make a new one
var/list/valid_maps = list()
var/oldest_time = world.time - age
diff --git a/code/controllers/subsystem/processing/projectiles.dm b/code/controllers/subsystem/processing/projectiles.dm
index 48d465dd0fdaf..0124296a3a23b 100644
--- a/code/controllers/subsystem/processing/projectiles.dm
+++ b/code/controllers/subsystem/processing/projectiles.dm
@@ -3,21 +3,18 @@ PROCESSING_SUBSYSTEM_DEF(projectiles)
wait = 1
stat_tag = "PP"
flags = SS_NO_INIT|SS_TICKER
- var/global_max_tick_moves = 10
- var/global_pixel_speed = 2
- var/global_iterations_per_move = 16
-
-/datum/controller/subsystem/processing/projectiles/proc/set_pixel_speed(new_speed)
- global_pixel_speed = new_speed
- for(var/i in processing)
- var/obj/projectile/P = i
- if(istype(P)) //there's non projectiles on this too.
- P.set_pixel_speed(new_speed)
-
-/datum/controller/subsystem/processing/projectiles/vv_edit_var(var_name, var_value)
- switch(var_name)
- if(NAMEOF(src, global_pixel_speed))
- set_pixel_speed(var_value)
- return TRUE
- else
- return ..()
+ /*
+ * Maximum amount of pixels a projectile can pass per tick *unless* its a hitscan projectile.
+ * This prevents projectiles from turning into essentially hitscans if SSprojectiles starts chugging
+ * and projectiles accumulate a bunch of overtime they try to process next tick to fly through half the map.
+ * Shouldn't really be increased past 5 tiles per tick because this maxes out at 100 FPS (recommended as of now)
+ * and making a projectile faster than that will make it look jumpy because it'll be passing inconsistent
+ * amounts of pixels per tick.
+ */
+ var/max_pixels_per_tick = ICON_SIZE_ALL * 5
+ /*
+ * How many pixels a projectile with a speed value of 1 passes in a tick. Currently all speed values
+ * assume that 1 speed = 1 tile per decisecond, but this is a variable so that admins/debuggers can edit
+ * in order to debug projectile behavior by evenly slowing or speeding all of them up.
+ */
+ var/pixels_per_decisecond = ICON_SIZE_ALL
diff --git a/code/datums/actions/mobs/create_legion_turrets.dm b/code/datums/actions/mobs/create_legion_turrets.dm
index 71427893f43da..34a0c6852d6c7 100644
--- a/code/datums/actions/mobs/create_legion_turrets.dm
+++ b/code/datums/actions/mobs/create_legion_turrets.dm
@@ -78,8 +78,7 @@
return
//Now we generate the tracer.
var/angle = get_angle(our_turf, target_turf)
- var/datum/point/vector/V = new(our_turf.x, our_turf.y, our_turf.z, 0, 0, angle)
- generate_tracer_between_points(V, V.return_vector_after_increments(6), /obj/effect/projectile/tracer/legion/tracer, 0, shot_delay, 0, 0, 0, null)
+ our_turf.Beam(target_turf, 'icons/effects/beam.dmi', "blood_light", time = shot_delay)
playsound(src, 'sound/machines/airlock/airlockopen.ogg', 100, TRUE)
addtimer(CALLBACK(src, PROC_REF(fire_beam), angle), shot_delay)
@@ -105,11 +104,6 @@
hitscan = TRUE
projectile_piercing = ALL
-/// Used for the legion turret tracer.
-/obj/effect/projectile/tracer/legion/tracer
- icon = 'icons/effects/beam.dmi'
- icon_state = "blood_light"
-
/// Used for the legion turret beam.
/obj/effect/projectile/tracer/legion
icon = 'icons/effects/beam.dmi'
diff --git a/code/datums/actions/mobs/fire_breath.dm b/code/datums/actions/mobs/fire_breath.dm
index 11ad04fa0df20..e407dafd7cffe 100644
--- a/code/datums/actions/mobs/fire_breath.dm
+++ b/code/datums/actions/mobs/fire_breath.dm
@@ -91,7 +91,7 @@
/datum/action/cooldown/mob_cooldown/fire_breath/mass_fire
name = "Mass Fire"
button_icon = 'icons/effects/fire.dmi'
- button_icon_state = "1"
+ button_icon_state = "light"
desc = "Breathe flames in all directions."
cooldown_time = 10.5 SECONDS
click_to_activate = FALSE
diff --git a/code/datums/actions/mobs/projectileattack.dm b/code/datums/actions/mobs/projectileattack.dm
index 933f94d0025f3..f833e05dde2e5 100644
--- a/code/datums/actions/mobs/projectileattack.dm
+++ b/code/datums/actions/mobs/projectileattack.dm
@@ -49,7 +49,7 @@
if(!isnum(speed_multiplier))
speed_multiplier = projectile_speed_multiplier
our_projectile.speed *= speed_multiplier
- our_projectile.preparePixelProjectile(endloc, startloc, null, projectile_spread)
+ our_projectile.aim_projectile(endloc, startloc, null, projectile_spread)
our_projectile.firer = firer
if(target)
our_projectile.original = target
@@ -224,7 +224,7 @@
cooldown_time = 10 SECONDS
projectile_type = /obj/projectile/colossus/wendigo_shockwave
shot_angles = list(-20, -10, 0, 10, 20)
- projectile_speed_multiplier = 4
+ projectile_speed_multiplier = 0.25
/datum/action/cooldown/mob_cooldown/projectile_attack/shotgun_blast/colossus
@@ -378,7 +378,7 @@
if(enraged)
projectile_speed_multiplier = 1
else
- projectile_speed_multiplier = 1.5
+ projectile_speed_multiplier = 0.66
var/shots_per = 24
for(var/shoot_times in 1 to 8)
var/offset = shoot_times % 2
diff --git a/code/datums/ai/basic_mobs/base_basic_controller.dm b/code/datums/ai/basic_mobs/base_basic_controller.dm
index eb1c38437e3be..d222cc1ef6d05 100644
--- a/code/datums/ai/basic_mobs/base_basic_controller.dm
+++ b/code/datums/ai/basic_mobs/base_basic_controller.dm
@@ -35,7 +35,7 @@
var/mob/living/living_pawn = pawn
if(!(ai_traits & CAN_ACT_WHILE_DEAD))
// Unroll for flags here
- if (ai_traits & CAN_ACT_IN_STASIS && (living_pawn.stat || INCAPACITATED_IGNORING(living_pawn, INCAPABLE_STASIS)))
+ if((ai_traits & CAN_ACT_IN_STASIS) && (living_pawn.stat || INCAPACITATED_IGNORING(living_pawn, INCAPABLE_STASIS)))
return AI_UNABLE_TO_RUN
if(IS_DEAD_OR_INCAP(living_pawn))
return AI_UNABLE_TO_RUN
diff --git a/code/datums/ai/monkey/monkey_behaviors.dm b/code/datums/ai/monkey/monkey_behaviors.dm
index 126c08daa1e8b..229460228401d 100644
--- a/code/datums/ai/monkey/monkey_behaviors.dm
+++ b/code/datums/ai/monkey/monkey_behaviors.dm
@@ -125,7 +125,7 @@
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
/datum/ai_behavior/monkey_attack_mob
- behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_MOVE_AND_PERFORM //performs to increase frustration
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_MOVE_AND_PERFORM | AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION //performs to increase frustration
/datum/ai_behavior/monkey_attack_mob/setup(datum/ai_controller/controller, target_key)
. = ..()
@@ -134,104 +134,76 @@
/datum/ai_behavior/monkey_attack_mob/perform(seconds_per_tick, datum/ai_controller/controller, target_key)
var/mob/living/target = controller.blackboard[target_key]
var/mob/living/living_pawn = controller.pawn
+ var/datum/targeting_strategy/strategy = GET_TARGETING_STRATEGY(controller.blackboard[BB_TARGETING_STRATEGY])
- if(!target || target.stat != CONSCIOUS) //Target == owned
+ if(QDELETED(target) || !strategy.can_attack(living_pawn, target)) //Target == owned
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
- if(!isturf(target.loc) || IS_DEAD_OR_INCAP(living_pawn)) // Check if they're a valid target
- return AI_BEHAVIOR_DELAY
// check if target has a weapon
- var/obj/item/W
- for(var/obj/item/I in target.held_items)
- if(!(I.item_flags & ABSTRACT))
- W = I
+ var/holding_weapon
+ for(var/obj/item/potential_weapon in target.held_items)
+ if(!(potential_weapon.item_flags & ABSTRACT))
+ holding_weapon = potential_weapon
break
- // if the target has a weapon, chance to disarm them
- var/perform_flags = NONE
- if(W && SPT_PROB(MONKEY_ATTACK_DISARM_PROB, seconds_per_tick))
- perform_flags = monkey_attack(controller, target, seconds_per_tick, TRUE)
- else
- perform_flags = monkey_attack(controller, target, seconds_per_tick, FALSE)
- return AI_BEHAVIOR_DELAY | perform_flags
+ var/attack_results = monkey_attack(controller, target, seconds_per_tick, holding_weapon && SPT_PROB(MONKEY_ATTACK_DISARM_PROB, seconds_per_tick), holding_weapon)
+
+ if(!attack_results || controller.blackboard[BB_MONKEY_AGGRESSIVE])
+ return AI_BEHAVIOR_DELAY
+
+ //check if we can de-aggro on the enemy...
+ var/hatred_value = controller.blackboard[BB_MONKEY_ENEMIES][target]
+
+ if(isnull(hatred_value))
+ hatred_value = 1
+ controller.set_blackboard_key_assoc(BB_MONKEY_ENEMIES, target, hatred_value)
+
+ if(!SPT_PROB(MONKEY_HATRED_REDUCTION_PROB, seconds_per_tick))
+ return AI_BEHAVIOR_DELAY
+
+ //we decrease our hatred value to them by 1
+ hatred_value--
+ if(hatred_value <= 0)
+ controller.remove_thing_from_blackboard_key(BB_MONKEY_ENEMIES, target)
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
+
+ controller.set_blackboard_key_assoc(BB_MONKEY_ENEMIES, target, hatred_value)
+ return AI_BEHAVIOR_DELAY
/datum/ai_behavior/monkey_attack_mob/finish_action(datum/ai_controller/controller, succeeded, target_key)
. = ..()
- var/mob/living/living_pawn = controller.pawn
controller.clear_blackboard_key(target_key)
- if(QDELETED(living_pawn)) // pawn can be null at this point
- return
- GLOB.move_manager.stop_looping(living_pawn)
/// attack using a held weapon otherwise bite the enemy, then if we are angry there is a chance we might calm down a little
-/datum/ai_behavior/monkey_attack_mob/proc/monkey_attack(datum/ai_controller/controller, mob/living/target, seconds_per_tick, disarm)
+/datum/ai_behavior/monkey_attack_mob/proc/monkey_attack(datum/ai_controller/controller, mob/living/target, seconds_per_tick, disarm, holding_weapon)
var/mob/living/living_pawn = controller.pawn
if(living_pawn.next_move > world.time)
- return NONE
-
- living_pawn.changeNext_move(CLICK_CD_MELEE) //We play fair
-
- var/obj/item/weapon = locate(/obj/item) in living_pawn.held_items
-
- living_pawn.face_atom(target)
-
- living_pawn.set_combat_mode(TRUE)
-
- if(isnull(controller.blackboard[BB_MONKEY_GUN_WORKED]))
- controller.set_blackboard_key(BB_MONKEY_GUN_WORKED, TRUE)
-
- // attack with weapon if we have one
- if(living_pawn.CanReach(target, weapon))
- if(weapon)
- weapon.melee_attack_chain(living_pawn, target)
- else
- controller.ai_interact(target = target, modifiers = disarm ? list(RIGHT_CLICK = TRUE) : null)
- controller.set_blackboard_key(BB_MONKEY_GUN_WORKED, TRUE) // We reset their memory of the gun being 'broken' if they accomplish some other attack
- else if(weapon)
- var/atom/real_target = target
- if(prob(10)) // Artificial miss
- real_target = pick(oview(2, target))
-
- var/obj/item/gun/gun = locate() in living_pawn.held_items
- var/can_shoot = gun?.can_shoot() || FALSE
- if(gun && controller.blackboard[BB_MONKEY_GUN_WORKED] && prob(95))
- // We attempt to attack even if we can't shoot so we get the effects of pulling the trigger
- gun.interact_with_atom(real_target, living_pawn)
- controller.set_blackboard_key(BB_MONKEY_GUN_WORKED, can_shoot ? TRUE : prob(80)) // Only 20% likely to notice it didn't work
- if(can_shoot)
- controller.set_blackboard_key(BB_MONKEY_GUN_NEURONS_ACTIVATED, TRUE)
- else
- living_pawn.throw_item(real_target)
- controller.set_blackboard_key(BB_MONKEY_GUN_WORKED, TRUE) // 'worked'
-
- // no de-aggro
- if(controller.blackboard[BB_MONKEY_AGGRESSIVE])
- return NONE
-
- // we've queued up a monkey attack on a mob which isn't already an enemy, so give them 1 threat to start
- // note they might immediately reduce threat and drop from the list.
- // this is fine, we're just giving them a love tap then leaving them alone.
- // unless they fight back, then we retaliate
-
- // Some mobs delete on death. If the target is no longer alive, go back to idle
- if(QDELETED(target))
- finish_action(controller, TRUE)
- return
+ return FALSE
- if(isnull(controller.blackboard[BB_MONKEY_ENEMIES][target]))
- controller.set_blackboard_key_assoc(BB_MONKEY_ENEMIES, target, 1)
+ //are we holding a gun? can we shoot it? if so, FIRE
+ var/obj/item/gun/gun_to_shoot = locate() in living_pawn.held_items
+ if(gun_to_shoot?.can_shoot())
+ if(gun_to_shoot != living_pawn.get_active_held_item())
+ living_pawn.swap_hand(living_pawn.get_inactive_hand_index())
+ controller.ai_interact(target = target, combat_mode = TRUE)
+ return TRUE
- /// mob refs are uids, so this is safe
- if(SPT_PROB(MONKEY_HATRED_REDUCTION_PROB, seconds_per_tick))
- controller.add_blackboard_key_assoc(BB_MONKEY_ENEMIES, target, -1)
+ //look for any potential weapons we're holding
+ var/obj/item/potential_weapon = locate() in living_pawn.held_items
+ if(!living_pawn.CanReach(target, potential_weapon))
+ return FALSE
- // if we are not angry at our target, go back to idle
- if(controller.blackboard[BB_MONKEY_ENEMIES][target] <= 0)
- controller.remove_thing_from_blackboard_key(BB_MONKEY_ENEMIES, target)
- if(controller.blackboard[BB_MONKEY_CURRENT_ATTACK_TARGET] == target)
- return AI_BEHAVIOR_SUCCEEDED
- return NONE
+ if(isnull(potential_weapon))
+ controller.ai_interact(target = target, modifiers = disarm ? list(RIGHT_CLICK = TRUE) : null, combat_mode = TRUE)
+ if(!isnull(holding_weapon))
+ controller.remove_thing_from_blackboard_key(BB_MONKEY_BLACKLISTITEMS, holding_weapon) //lets try to pickpocket it again!
+ return TRUE
+
+ if(potential_weapon != living_pawn.get_active_held_item())
+ living_pawn.swap_hand(living_pawn.get_inactive_hand_index())
+ controller.ai_interact(target = target, combat_mode = TRUE)
+ return TRUE
/datum/ai_behavior/disposal_mob
behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_MOVE_AND_PERFORM //performs to increase frustration
diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm
index 0074d206983b3..8b753b9c1ccc9 100644
--- a/code/datums/ai/monkey/monkey_controller.dm
+++ b/code/datums/ai/monkey/monkey_controller.dm
@@ -15,6 +15,7 @@ have ways of interacting with a specific mob and control it.
/datum/ai_planning_subtree/monkey_shenanigans,
)
blackboard = list(
+ BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/monkey,
BB_MONKEY_AGGRESSIVE = FALSE,
BB_MONKEY_BEST_FORCE_FOUND = 0,
BB_MONKEY_ENEMIES = list(),
@@ -22,12 +23,18 @@ have ways of interacting with a specific mob and control it.
BB_MONKEY_PICKPOCKETING = FALSE,
BB_MONKEY_DISPOSING = FALSE,
BB_MONKEY_GUN_NEURONS_ACTIVATED = FALSE,
- BB_MONKEY_GUN_WORKED = TRUE,
BB_SONG_LINES = MONKEY_SONG,
BB_RESISTING = FALSE,
)
idle_behavior = /datum/idle_behavior/idle_monkey
+/datum/targeting_strategy/basic/monkey
+
+/datum/targeting_strategy/basic/monkey/faction_check(datum/ai_controller/controller, mob/living/living_mob, mob/living/the_target)
+ if(controller.blackboard[BB_MONKEY_ENEMIES][the_target])
+ return FALSE
+ return ..()
+
/datum/ai_controller/monkey/process(seconds_per_tick)
var/mob/living/living_pawn = src.pawn
diff --git a/code/datums/ai/monkey/monkey_subtrees.dm b/code/datums/ai/monkey/monkey_subtrees.dm
index 572eeb6b56e92..1210fe44ba11f 100644
--- a/code/datums/ai/monkey/monkey_subtrees.dm
+++ b/code/datums/ai/monkey/monkey_subtrees.dm
@@ -53,6 +53,8 @@
if(controller.blackboard[BB_MONKEY_RECRUIT_COOLDOWN] < world.time)
controller.queue_behavior(/datum/ai_behavior/recruit_monkeys, BB_MONKEY_CURRENT_ATTACK_TARGET)
+ return
+
controller.queue_behavior(/datum/ai_behavior/battle_screech/monkey)
controller.queue_behavior(/datum/ai_behavior/monkey_attack_mob, BB_MONKEY_CURRENT_ATTACK_TARGET)
return SUBTREE_RETURN_FINISH_PLANNING
diff --git a/code/datums/ai/movement/_ai_movement.dm b/code/datums/ai/movement/_ai_movement.dm
index 33b7e4e214f6b..1e27b33b2dbd9 100644
--- a/code/datums/ai/movement/_ai_movement.dm
+++ b/code/datums/ai/movement/_ai_movement.dm
@@ -28,29 +28,32 @@
/datum/ai_movement/proc/reset_pathing_failures(datum/ai_controller/controller)
controller.consecutive_pathing_attempts = 0
-///Should the movement be allowed to happen? return TRUE if it can, FALSE otherwise
/datum/ai_movement/proc/allowed_to_move(datum/move_loop/source)
SHOULD_BE_PURE(TRUE)
var/atom/movable/pawn = source.moving
var/datum/ai_controller/controller = source.extra_info
- var/can_move = TRUE
if((controller.ai_traits & STOP_MOVING_WHEN_PULLED) && pawn.pulledby) //Need to store more state. Annoying.
- can_move = FALSE
+ return FALSE
if(!isturf(pawn.loc)) //No moving if not on a turf
- can_move = FALSE
+ return FALSE
if(isliving(pawn))
var/mob/living/pawn_mob = pawn
if(!(pawn_mob.mobility_flags & MOBILITY_MOVE))
- can_move = FALSE
+ return FALSE
+ // Bandaid fix: AI controllers don't call /Process_Grab because it's a client proc,
+ // and thus, we need to check that grabbed mobs cuffed/crit can't move
+ // That proc should probably be moved onto the mob instead of clients
+ if(INCAPACITATED_IGNORING(pawn_mob, INCAPABLE_STASIS) && pawn.pulledby)
+ return FALSE
if(HAS_TRAIT(pawn, TRAIT_NO_TRANSFORM))
- can_move = FALSE
+ return FALSE
- return can_move
+ return TRUE
///Anything to do before moving; any checks if the pawn should be able to move should be placed in allowed_to_move() and called by this proc
/datum/ai_movement/proc/pre_move(datum/move_loop/source)
diff --git a/code/datums/ai/movement/ai_movement_basic_avoidance.dm b/code/datums/ai/movement/ai_movement_basic_avoidance.dm
index ac231e075ed14..6659da244f3da 100644
--- a/code/datums/ai/movement/ai_movement_basic_avoidance.dm
+++ b/code/datums/ai/movement/ai_movement_basic_avoidance.dm
@@ -14,10 +14,10 @@
RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move))
/datum/ai_movement/basic_avoidance/allowed_to_move(datum/move_loop/has_target/dist_bound/source)
- . = ..()
var/turf/target_turf = get_step_towards(source.moving, source.target)
if(!target_turf?.can_cross_safely(source.moving))
return FALSE
+ return ..()
/// Move immediately and don't update our facing
/datum/ai_movement/basic_avoidance/backstep
diff --git a/code/datums/ai/movement/ai_movement_dumb.dm b/code/datums/ai/movement/ai_movement_dumb.dm
index 2de85046a941f..001501bcbd93d 100644
--- a/code/datums/ai/movement/ai_movement_dumb.dm
+++ b/code/datums/ai/movement/ai_movement_dumb.dm
@@ -12,7 +12,7 @@
RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move))
/datum/ai_movement/dumb/allowed_to_move(datum/move_loop/has_target/source)
- . = ..()
var/turf/target_turf = get_step_towards(source.moving, source.target)
if(!target_turf?.can_cross_safely(source.moving))
return FALSE
+ return ..()
diff --git a/code/datums/ai/movement/ai_movement_jps.dm b/code/datums/ai/movement/ai_movement_jps.dm
index ddae792b31c86..3781dd7f5dc79 100644
--- a/code/datums/ai/movement/ai_movement_jps.dm
+++ b/code/datums/ai/movement/ai_movement_jps.dm
@@ -52,7 +52,7 @@
/datum/ai_movement/jps/bot/travel_to_beacon
maximum_length = AI_BOT_PATH_LENGTH
- max_pathing_attempts = 20
+ max_pathing_attempts = 10
/datum/ai_movement/jps/modsuit
maximum_length = MOD_AI_RANGE
diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm
index 195d33c4b4b8d..cef20687a84d5 100644
--- a/code/datums/brain_damage/split_personality.dm
+++ b/code/datums/brain_damage/split_personality.dm
@@ -265,6 +265,10 @@
/datum/brain_trauma/severe/split_personality/blackout/on_gain()
. = ..()
+
+ if(QDELETED(src))
+ return
+
RegisterSignal(owner, COMSIG_ATOM_SPLASHED, PROC_REF(on_splashed))
notify_ghosts(
"[owner] is blacking out!",
diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index 3efa4a4a884a5..869e93371871a 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -50,6 +50,8 @@
var/animate_start = 0
/// Our animation lifespan, how long this message will last
var/animate_lifespan = 0
+ /// Callback to finish_image_generation passed to SSrunechat
+ var/datum/callback/finish_callback
/**
* Constructs a chat message overlay
@@ -81,6 +83,10 @@
LAZYREMOVEASSOC(owned_by.seen_messages, message_loc, src)
owned_by.images.Remove(message)
+ if (finish_callback)
+ SSrunechat.message_queue -= finish_callback
+ finish_callback = null
+
owned_by = null
message_loc = null
message = null
@@ -188,13 +194,14 @@
if(!VERB_SHOULD_YIELD)
return finish_image_generation(mheight, target, owner, complete_text, lifespan)
- var/datum/callback/our_callback = CALLBACK(src, PROC_REF(finish_image_generation), mheight, target, owner, complete_text, lifespan)
- SSrunechat.message_queue += our_callback
+ finish_callback = CALLBACK(src, PROC_REF(finish_image_generation), mheight, target, owner, complete_text, lifespan)
+ SSrunechat.message_queue += finish_callback
return
///finishes the image generation after the MeasureText() call in generate_image().
///necessary because after that call the proc can resume at the end of the tick and cause overtime.
/datum/chatmessage/proc/finish_image_generation(mheight, atom/target, mob/owner, complete_text, lifespan)
+ finish_callback = null
var/rough_time = REALTIMEOFDAY
approx_lines = max(1, mheight / CHAT_MESSAGE_APPROX_LHEIGHT)
var/starting_height = target.maptext_height
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index f78e2af6be17d..85def333f4c26 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -17,15 +17,6 @@
*/
var/dupe_mode = COMPONENT_DUPE_HIGHLANDER
- /**
- * The type to check for duplication
- *
- * `null` means exact match on `type` (default)
- *
- * Any other type means that and all subtypes
- */
- var/dupe_type
-
/// The datum this components belongs to
var/datum/parent
@@ -57,7 +48,7 @@
qdel(src, TRUE, TRUE)
return
- _JoinParent(parent)
+ _JoinParent()
/**
* Called during component creation with the same arguments as in new excluding parent.
@@ -217,7 +208,7 @@
*
* Use this to do any special cleanup you might need to do before being deregged from an object
*/
-/datum/component/proc/PreTransfer()
+/datum/component/proc/PreTransfer(datum/new_parent)
return
/**
@@ -328,7 +319,6 @@
CRASH("[component_type] attempted instantiation!")
var/dupe_mode = initial(component_type.dupe_mode)
- var/dupe_type = initial(component_type.dupe_type)
var/uses_sources = (dupe_mode == COMPONENT_DUPE_SOURCES)
if(uses_sources && !source)
CRASH("Attempted to add a sourced component of type '[component_type]' to '[type]' without a source!")
@@ -339,10 +329,7 @@
raw_args[1] = src
if(dupe_mode != COMPONENT_DUPE_ALLOWED && dupe_mode != COMPONENT_DUPE_SELECTIVE && dupe_mode != COMPONENT_DUPE_SOURCES)
- if(!dupe_type)
- old_component = GetExactComponent(component_type)
- else
- old_component = GetComponent(dupe_type)
+ old_component = GetComponent(component_type)
if(old_component)
switch(dupe_mode)
@@ -434,11 +421,11 @@
* Removes the component from parent, ends up with a null parent
* Used as a helper proc by the component transfer proc, does not clean up the component like Destroy does
*/
-/datum/component/proc/ClearFromParent()
+/datum/component/proc/ClearFromParent(datum/new_parent)
if(!parent)
return
var/datum/old_parent = parent
- PreTransfer()
+ PreTransfer(new_parent)
_RemoveFromParent()
parent = null
SEND_SIGNAL(old_parent, COMSIG_COMPONENT_REMOVING, src)
@@ -455,16 +442,17 @@
if(!target || target.parent == src)
return
if(target.parent)
- target.ClearFromParent()
- target.parent = src
- var/result = target.PostTransfer()
+ target.ClearFromParent(src)
+ var/result = target.PostTransfer(src)
switch(result)
if(COMPONENT_INCOMPATIBLE)
var/c_type = target.type
qdel(target)
CRASH("Incompatible [c_type] transfer attempt to a [type]!")
- if(target == AddComponent(target))
+ AddComponent(target)
+ if(!QDELETED(target))
+ target.parent = src
target._JoinParent()
/**
diff --git a/code/datums/components/acid.dm b/code/datums/components/acid.dm
index 74fa1b1ae7f88..3bb06ab639dab 100644
--- a/code/datums/components/acid.dm
+++ b/code/datums/components/acid.dm
@@ -25,8 +25,10 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
var/turf_acid_ignores_mobs = FALSE
/// The ambient sound of acid eating away at the parent [/atom].
var/datum/looping_sound/acid/sizzle
- /// Particle holder for acid particles (sick)
+ /// Particle holder for acid particles (sick). Still utilized over shared holders because they're movable-only
var/obj/effect/abstract/particle_holder/particle_effect
+ /// Particle type we're using for cleaning up our shared holder
+ var/particle_type
/// The proc used to handle the parent [/atom] when processing. TODO: Unify damage and resistance flags so that this doesn't need to exist!
var/datum/callback/process_effect
@@ -68,8 +70,13 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
sizzle = new(atom_parent, TRUE)
if(acid_particles)
- // acid particles look pretty bad when they stack on mobs, so that behavior is not wanted for items
- particle_effect = new(atom_parent, acid_particles, isitem(atom_parent) ? NONE : PARTICLE_ATTACH_MOB)
+ if (ismovable(parent))
+ var/atom/movable/movable_parent = parent
+ movable_parent.add_shared_particles(acid_particles, "[acid_particles]_[isitem(parent)]", isitem(parent) ? NONE : PARTICLE_ATTACH_MOB)
+ particle_type = acid_particles
+ else
+ // acid particles look pretty bad when they stack on mobs, so that behavior is not wanted for items
+ particle_effect = new(atom_parent, acid_particles, isitem(atom_parent) ? NONE : PARTICLE_ATTACH_MOB)
START_PROCESSING(SSacid, src)
/datum/component/acid/Destroy(force)
@@ -78,6 +85,9 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
QDEL_NULL(sizzle)
if(particle_effect)
QDEL_NULL(particle_effect)
+ if (ismovable(parent) && particle_type)
+ var/atom/movable/movable_parent = parent
+ movable_parent.remove_shared_particles("[particle_type]_[isitem(parent)]")
process_effect = null
return ..()
diff --git a/code/datums/components/aquarium.dm b/code/datums/components/aquarium.dm
new file mode 100644
index 0000000000000..e0ef6d8c04aa9
--- /dev/null
+++ b/code/datums/components/aquarium.dm
@@ -0,0 +1,565 @@
+///Defines that clamp the beauty of the aquarium, to prevent it from making most areas great or horrid all by itself.
+#define MIN_AQUARIUM_BEAUTY -3500
+#define MAX_AQUARIUM_BEAUTY 6000
+
+/**
+ * The component that manages the aquariums UI, fluid, temperature, the current fish inside the parent object, as well as beauty,
+ * and a few other common aquarium features.
+ */
+/datum/component/aquarium
+ dupe_mode = COMPONENT_DUPE_UNIQUE
+ can_transfer = TRUE
+ /// list of fishes inside the parent object, sorted by type - does not include things with aquarium visuals that are not fish
+ var/list/tracked_fish_by_type
+
+ ///The current type of fluid of the aquarium
+ var/fluid_type = AQUARIUM_FLUID_FRESHWATER
+ ///The current temperature of the fluid of the aquarium
+ var/fluid_temp = DEFAULT_AQUARIUM_TEMP
+
+ ///A lazy list of key instances and assoc vals representing how much beauty they contribute to the aquarium
+ var/list/beauty_by_content
+
+ ///The default beauty of the aquarium when empty.
+ var/default_beauty
+
+ ///A list of layers that are currently being used for the various overlays of the aquarium (from aquarium_content comp)
+ var/list/used_layers = list()
+
+ ///The minimum pixel x of the area where vis overlays should be displayed
+ var/aquarium_zone_min_px
+ ///The maximum pixel x of the area where vis overlays should be displayed
+ var/aquarium_zone_max_px
+ ///The minimum pixel y of the area where vis overlays should be displayed
+ var/aquarium_zone_min_py
+ ///The maximum pixel y of the area where vis overlays should be displayed
+ var/aquarium_zone_max_py
+
+ ///While the feed (reagent) storage is not empty, this is the interval which the fish are fed.
+ var/feeding_interval = 3 MINUTES
+ ///The last time fishes were fed by the acquarium itsef.
+ var/last_feeding
+
+ ///The minimum fluid temperature that can be reached by this aquarium
+ var/min_fluid_temp = MIN_AQUARIUM_TEMP
+ ///The maximum fluid temperature that can be reached by this aquarium
+ var/max_fluid_temp = MAX_AQUARIUM_TEMP
+
+ ///static list of available fluid types.
+ var/static/list/fluid_types = list(
+ AQUARIUM_FLUID_SALTWATER,
+ AQUARIUM_FLUID_FRESHWATER,
+ AQUARIUM_FLUID_SULPHWATEVER,
+ AQUARIUM_FLUID_AIR,
+ )
+
+ ///The size of the reagents holder which will store fish feed.
+ var/reagents_size
+
+/datum/component/aquarium/Initialize(
+ min_px,
+ max_px,
+ min_py,
+ max_py,
+ default_beauty = 0,
+ reagents_size = 6,
+ min_fluid_temp = MIN_AQUARIUM_TEMP,
+ max_fluid_temp = MAX_AQUARIUM_TEMP,
+)
+
+ if(!ismovable(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ src.default_beauty = default_beauty
+ src.reagents_size = reagents_size
+
+ aquarium_zone_min_px = min_px
+ aquarium_zone_max_px = max_px
+ aquarium_zone_min_py = min_py
+ aquarium_zone_max_py = max_py
+
+ src.min_fluid_temp = min_fluid_temp
+ src.max_fluid_temp = max_fluid_temp
+ fluid_temp = clamp(fluid_temp, min_fluid_temp, max_fluid_temp)
+
+/datum/component/aquarium/RegisterWithParent()
+ if(default_beauty)
+ update_aquarium_beauty(0)
+
+ RegisterSignals(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON), PROC_REF(on_entered))
+ RegisterSignal(parent, COMSIG_ATOM_EXITED, PROC_REF(on_exited))
+
+ RegisterSignal(parent, COMSIG_AQUARIUM_GET_REPRODUCTION_CANDIDATES, PROC_REF(get_candidates))
+ RegisterSignal(parent, COMSIG_AQUARIUM_CHECK_EVOLUTION_CONDITIONS, PROC_REF(check_evolution))
+
+ RegisterSignal(parent, COMSIG_AQUARIUM_SET_VISUAL, PROC_REF(set_visual))
+ RegisterSignal(parent, COMSIG_AQUARIUM_REMOVE_VISUAL, PROC_REF(remove_visual))
+
+ var/atom/movable/movable = parent
+
+ ADD_KEEP_TOGETHER(movable, AQUARIUM_TRAIT) //render the fish on the same layer of the aquarium.
+
+ if(reagents_size > 0)
+ RegisterSignal(movable.reagents, COMSIG_REAGENTS_NEW_REAGENT, PROC_REF(start_autofeed))
+ if(!movable.reagents)
+ movable.create_reagents(reagents_size, SEALED_CONTAINER)
+ else if(movable.reagents.total_volume)
+ start_autofeed(movable.reagents)
+ RegisterSignal(movable, COMSIG_PLUNGER_ACT, PROC_REF(on_plunger_act))
+
+ RegisterSignal(movable, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_interaction))
+ RegisterSignal(movable, COMSIG_CLICK_ALT, PROC_REF(on_click_alt))
+ RegisterSignal(movable, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
+
+ if(isitem(movable))
+ RegisterSignal(movable, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact))
+ RegisterSignals(movable, list(COMSIG_ATOM_ATTACK_ROBOT_SECONDARY, COMSIG_ATOM_ATTACK_HAND_SECONDARY), PROC_REF(on_secondary_attack_hand))
+ else
+ RegisterSignal(movable, COMSIG_ATOM_UI_INTERACT, PROC_REF(interact))
+
+ movable.AddElement(/datum/element/relay_attackers)
+
+ for(var/atom/movable/content as anything in movable.contents)
+ if(content.flags_1 & INITIALIZED_1)
+ on_entered(movable, content)
+
+ ADD_TRAIT(movable, TRAIT_IS_AQUARIUM, AQUARIUM_TRAIT)
+
+/datum/component/aquarium/UnregisterFromParent()
+ var/atom/movable/movable = parent
+ UnregisterSignal(movable, list(
+ COMSIG_ATOM_ENTERED,
+ COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON,
+ COMSIG_ATOM_EXITED,
+ COMSIG_AQUARIUM_GET_REPRODUCTION_CANDIDATES,
+ COMSIG_AQUARIUM_CHECK_EVOLUTION_CONDITIONS,
+ COMSIG_AQUARIUM_SET_VISUAL,
+ COMSIG_AQUARIUM_REMOVE_VISUAL,
+ COMSIG_PLUNGER_ACT,
+ COMSIG_ATOM_ITEM_INTERACTION,
+ COMSIG_CLICK_ALT,
+ COMSIG_ATOM_EXAMINE,
+ COMSIG_ITEM_ATTACK_SELF,
+ COMSIG_ATOM_ATTACK_ROBOT_SECONDARY,
+ COMSIG_ATOM_ATTACK_HAND_SECONDARY,
+ COMSIG_ATOM_UI_INTERACT,
+ ))
+ if(movable.reagents)
+ UnregisterSignal(movable, COMSIG_REAGENTS_NEW_REAGENT)
+ STOP_PROCESSING(SSobj, src)
+ beauty_by_content = null
+ tracked_fish_by_type = null
+ movable.remove_traits(list(TRAIT_IS_AQUARIUM, TRAIT_AQUARIUM_PANEL_OPEN, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH), AQUARIUM_TRAIT)
+ REMOVE_KEEP_TOGETHER(movable, AQUARIUM_TRAIT)
+
+/datum/component/aquarium/PreTransfer(atom/movable/new_parent)
+ if(!istype(new_parent))
+ return
+ if(HAS_TRAIT(parent, TRAIT_AQUARIUM_PANEL_OPEN))
+ ADD_TRAIT(new_parent, TRAIT_AQUARIUM_PANEL_OPEN, AQUARIUM_TRAIT)
+ if(HAS_TRAIT_FROM(parent, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH, AQUARIUM_TRAIT))
+ ADD_TRAIT(new_parent, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH, AQUARIUM_TRAIT)
+ var/atom/movable/movable = parent
+ for(var/atom/movable/moving as anything in movable.contents)
+ if(HAS_TRAIT(moving, TRAIT_AQUARIUM_CONTENT))
+ moving.forceMove(new_parent)
+ if(reagents_size)
+ if(!new_parent.reagents)
+ new_parent.create_reagents(reagents_size, SEALED_CONTAINER)
+ movable.reagents.trans_to(new_parent, movable.reagents.total_volume)
+
+/datum/component/aquarium/PostTransfer(datum/new_parent)
+ if(!ismovable(new_parent))
+ return COMPONENT_INCOMPATIBLE
+
+/datum/component/aquarium/InheritComponent(datum/component/aquarium/new_comp, i_am_original)
+ fluid_temp = clamp(new_comp.fluid_temp, min_fluid_temp, max_fluid_temp)
+ set_fluid_type(new_comp.fluid_type)
+ feeding_interval = new_comp.feeding_interval
+ last_feeding = new_comp.last_feeding
+ var/atom/movable/movable = parent
+ movable.update_appearance()
+
+/datum/component/aquarium/proc/on_click_alt(atom/movable/source, mob/living/user)
+ SIGNAL_HANDLER
+ var/closing = HAS_TRAIT(parent, TRAIT_AQUARIUM_PANEL_OPEN)
+ if(closing)
+ REMOVE_TRAIT(parent, TRAIT_AQUARIUM_PANEL_OPEN, AQUARIUM_TRAIT)
+ source.reagents.flags &= ~(TRANSPARENT|REFILLABLE)
+ SStgui.close_uis(src)
+ else
+ ADD_TRAIT(parent, TRAIT_AQUARIUM_PANEL_OPEN, AQUARIUM_TRAIT)
+ source.reagents.flags |= TRANSPARENT|REFILLABLE
+
+ source.balloon_alert(user, "panel [closing ? "closed" : "open"]")
+ source.update_appearance()
+ return CLICK_ACTION_SUCCESS
+
+///This proc handles feeding the aquarium and inserting aquarium content.
+/datum/component/aquarium/proc/on_item_interaction(atom/movable/source, mob/living/user, obj/item/item, modifiers)
+ SIGNAL_HANDLER
+
+ if(istype(item, /obj/item/reagent_containers/cup/fish_feed))
+ if(source.reagents && HAS_TRAIT(source, TRAIT_AQUARIUM_PANEL_OPEN))
+ return //don't block, we'll be transferring reagents to the feed storage.
+ if(!item.reagents.total_volume)
+ source.balloon_alert(user, "[item] is empty!")
+ return ITEM_INTERACT_BLOCKING
+ var/list/fishes = get_fishes()
+ if(!length(fishes))
+ source.balloon_alert(user, "no fish to feed!")
+ return ITEM_INTERACT_BLOCKING
+ for(var/obj/item/fish/fish as anything in fishes)
+ fish.feed(item.reagents)
+ source.balloon_alert(user, "fed the fish")
+ return ITEM_INTERACT_SUCCESS
+
+ if(!HAS_TRAIT(item, TRAIT_AQUARIUM_CONTENT))
+ return //proceed with normal interactions
+
+ var/broken = source.get_integrity_percentage() <= source.integrity_failure
+ if(!can_insert(source, item, user))
+ return ITEM_INTERACT_BLOCKING
+ if(broken)
+ source.balloon_alert(user, "aquarium is broken!")
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(item, source))
+ user.balloon_alert(user, "stuck to your hand!")
+ return ITEM_INTERACT_BLOCKING
+ source.balloon_alert(user, "added to aquarium")
+ source.update_appearance()
+ return ITEM_INTERACT_SUCCESS
+
+///Called when the feed storage is no longer empty.
+/datum/component/aquarium/proc/start_autofeed(atom/movable/source, new_reagent, amount, reagtemp, data, no_react)
+ SIGNAL_HANDLER
+ START_PROCESSING(SSobj, src)
+ UnregisterSignal(source.reagents, COMSIG_REAGENTS_NEW_REAGENT)
+
+///Feed the fish at defined intervals until the feed storage is empty.
+/datum/component/aquarium/process(seconds_per_tick)
+ var/atom/movable/movable = parent
+ if(!movable.reagents?.total_volume)
+ if(movable.reagents)
+ RegisterSignal(movable.reagents, COMSIG_REAGENTS_NEW_REAGENT, PROC_REF(start_autofeed))
+ return PROCESS_KILL
+ if(world.time < last_feeding + feeding_interval)
+ return
+ last_feeding = world.time
+ var/list/fishes = get_fishes()
+ for(var/obj/item/fish/fish as anything in fishes)
+ fish.feed(movable.reagents)
+
+/datum/component/aquarium/proc/on_plunger_act(atom/movable/source, obj/item/plunger/plunger, mob/living/user, reinforced)
+ SIGNAL_HANDLER
+ if(!HAS_TRAIT(source, TRAIT_AQUARIUM_PANEL_OPEN))
+ return
+ INVOKE_ASYNC(src, PROC_REF(do_plunging), source, user)
+ return COMPONENT_NO_AFTERATTACK
+
+/datum/component/aquarium/proc/do_plunging(atom/movable/source, mob/living/user)
+ user.balloon_alert_to_viewers("plunging...")
+ if(do_after(user, 3 SECONDS, target = source))
+ user.balloon_alert_to_viewers("finished plunging")
+ source.reagents.expose(get_turf(source), TOUCH) //splash on the floor
+ source.reagents.clear_reagents()
+
+/datum/component/aquarium/proc/on_examine(atom/movable/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+ var/panel_open = HAS_TRAIT(source, TRAIT_AQUARIUM_PANEL_OPEN)
+ examine_list += span_notice("Alt-click to [panel_open ? "close" : "open"] the control and feed panel.")
+ if(panel_open && source.reagents.total_volume)
+ examine_list += span_notice("You can use a plunger to empty the feed storage.")
+
+///Check if an item can be inserted into the aquarium
+/datum/component/aquarium/proc/can_insert(atom/movable/source, obj/item/item, mob/living/user)
+ var/return_value = SEND_SIGNAL(src, COMSIG_AQUARIUM_CAN_INSERT, item, user)
+ if(return_value & COMSIG_CANNOT_INSERT_IN_AQUARIUM)
+ return FALSE
+ if(return_value & COMSIG_CAN_INSERT_IN_AQUARIUM)
+ return TRUE
+
+ if(HAS_TRAIT(item, TRAIT_UNIQUE_AQUARIUM_CONTENT))
+ for(var/atom/movable/content as anything in source)
+ if(content == item)
+ continue
+ if(content.type == item.type)
+ source.balloon_alert(user, "cannot add to aquarium!")
+ return FALSE
+ return TRUE
+
+///Handles aquarium content insertion
+/datum/component/aquarium/proc/on_entered(atom/movable/source, atom/movable/entered)
+ SIGNAL_HANDLER
+ get_content_beauty(entered)
+ if(!isfish(entered))
+ return
+ var/obj/item/fish/fish = entered
+ LAZYADDASSOCLIST(tracked_fish_by_type, entered.type, entered)
+ if(fish.stable_population < length(tracked_fish_by_type[fish.type]))
+ for(var/obj/item/fish/anyfin as anything in tracked_fish_by_type[entered.type])
+ anyfin.fish_flags |= FISH_FLAG_OVERPOPULATED
+ check_fluid_and_temperature(fish)
+ RegisterSignal(fish, COMSIG_FISH_STATUS_CHANGED, PROC_REF(on_fish_status_changed))
+
+///update the beauty_by_content of a 'beauty_by_content' key and then recalculate the beauty.
+/datum/component/aquarium/proc/get_content_beauty(atom/movable/content)
+ var/list/beauty_holder = list()
+ SEND_SIGNAL(content, COMSIG_MOVABLE_GET_AQUARIUM_BEAUTY, beauty_holder)
+ var/beauty = beauty_holder[1]
+ if(!beauty)
+ return
+ var/old_beauty = default_beauty
+ for(var/key in beauty_by_content)
+ old_beauty += beauty_by_content[key]
+ LAZYSET(beauty_by_content, content, beauty)
+ update_aquarium_beauty(old_beauty)
+
+///Handles aquarium content removal.
+/datum/component/aquarium/proc/on_exited(atom/movable/source, atom/movable/gone)
+ SIGNAL_HANDLER
+ var/beauty = beauty_by_content?[gone]
+ if(beauty)
+ var/old_beauty = default_beauty
+ for(var/key in beauty_by_content)
+ old_beauty += beauty_by_content[key]
+ LAZYREMOVE(beauty_by_content, gone)
+ update_aquarium_beauty(old_beauty)
+ if(!isfish(gone))
+ return
+ var/obj/item/fish/fish = gone
+ if(fish.stable_population == length(tracked_fish_by_type[fish.type]))
+ for(var/obj/item/fish/anyfin as anything in tracked_fish_by_type[fish.type])
+ anyfin.fish_flags &= ~FISH_FLAG_OVERPOPULATED
+ LAZYREMOVEASSOC(tracked_fish_by_type, fish.type, fish)
+ fish.fish_flags &= ~(FISH_FLAG_SAFE_TEMPERATURE|FISH_FLAG_SAFE_FLUID)
+ UnregisterSignal(gone, COMSIG_FISH_STATUS_CHANGED, PROC_REF(on_fish_status_changed))
+
+///Return a list of fish which our fishie can reproduce with (including itself if self-reproducing)
+/datum/component/aquarium/proc/get_candidates(atom/movable/source, obj/item/fish/fish, list/candidates)
+ SIGNAL_HANDLER
+ var/list/types_to_mate_with = tracked_fish_by_type
+ if(!HAS_TRAIT(fish, TRAIT_FISH_CROSSBREEDER))
+ var/list/types_to_check = list(fish.type)
+ if(fish.compatible_types)
+ types_to_check |= fish.compatible_types
+ types_to_mate_with = types_to_mate_with & types_to_check
+
+ for(var/obj/item/fish/fish_type as anything in types_to_mate_with)
+ var/list/type_fishes = types_to_mate_with[fish_type]
+ if(length(type_fishes) >= initial(fish_type.stable_population))
+ continue
+ candidates += type_fishes
+
+///Check if an offspring of two fish (or one if self-reproducing) can evolve.
+/datum/component/aquarium/proc/check_evolution(atom/movable/source, obj/item/fish/fish, obj/item/fish/mate, datum/fish_evolution/evolution)
+ SIGNAL_HANDLER
+ //chances are halved if only one parent has this evolution.
+ var/real_probability = (mate && (evolution.type in mate.evolution_types)) ? evolution.probability : evolution.probability * 0.5
+ if(HAS_TRAIT(fish, TRAIT_FISH_MUTAGENIC) || (mate && HAS_TRAIT(mate, TRAIT_FISH_MUTAGENIC)))
+ real_probability *= 3
+ if(!prob(real_probability))
+ return NONE
+ if(!ISINRANGE(fluid_temp, evolution.required_temperature_min, evolution.required_temperature_max))
+ return NONE
+ return COMPONENT_ALLOW_EVOLUTION
+
+/**
+ * Toggles a couple flags that determine if the fish is in safe waters so that we won't have to use signals or
+ * access this comp in multiple places just to confirm that.
+ */
+/datum/component/aquarium/proc/check_fluid_and_temperature(obj/item/fish/fish)
+ if(compatible_fluid_type(fish.required_fluid_type, fluid_type) || (fluid_type == AQUARIUM_FLUID_AIR && HAS_TRAIT(fish, TRAIT_FISH_AMPHIBIOUS)))
+ fish.fish_flags |= FISH_FLAG_SAFE_FLUID
+ else
+ fish.fish_flags &= ~FISH_FLAG_SAFE_FLUID
+ if(ISINRANGE(fluid_temp, fish.required_temperature_min, fish.required_temperature_max))
+ fish.fish_flags |= FISH_FLAG_SAFE_TEMPERATURE
+ else
+ fish.fish_flags &= ~FISH_FLAG_SAFE_TEMPERATURE
+
+///Fish beauty changes when they're dead, so we need to update the beauty of the aquarium too.
+/datum/component/aquarium/proc/on_fish_status_changed(obj/item/fish/fish)
+ get_content_beauty(fish)
+
+/datum/component/aquarium/proc/update_aquarium_beauty(old_beauty)
+ if(QDELETED(parent))
+ return
+ old_beauty = clamp(old_beauty, MIN_AQUARIUM_BEAUTY, MAX_AQUARIUM_BEAUTY)
+ var/new_beauty = 0
+ for(var/key in beauty_by_content)
+ new_beauty += beauty_by_content[key]
+ new_beauty = clamp(new_beauty, MIN_AQUARIUM_BEAUTY, MAX_AQUARIUM_BEAUTY)
+ if(new_beauty == old_beauty)
+ return
+ if(old_beauty)
+ parent.RemoveElement(/datum/element/beauty, old_beauty)
+ if(new_beauty)
+ parent.AddElement(/datum/element/beauty, new_beauty)
+
+///Remove a visual overlay from an aquarium_content comp
+/datum/component/aquarium/proc/remove_visual(atom/movable/source, obj/effect/aquarium/visual)
+ SIGNAL_HANDLER
+ source.vis_contents -= visual
+ used_layers -= visual.layer
+
+///set values for a visual overlay for an aquarium_content comp
+/datum/component/aquarium/proc/set_visual(atom/movable/source, obj/effect/aquarium/visual)
+ SIGNAL_HANDLER
+ used_layers -= visual.layer
+ visual.layer = request_layer(visual.layer_mode)
+ visual.aquarium_zone_min_px = aquarium_zone_min_px
+ visual.aquarium_zone_max_px = aquarium_zone_max_px
+ visual.aquarium_zone_min_py = aquarium_zone_min_py
+ visual.aquarium_zone_max_py = aquarium_zone_max_py
+ visual.fluid_type = fluid_type
+
+/datum/component/aquarium/proc/request_layer(layer_type)
+ var/atom/movable/movable = parent
+ switch(layer_type)
+ if(AQUARIUM_LAYER_MODE_BEHIND_GLASS)
+ return movable.layer + AQUARIUM_BELOW_GLASS_LAYER
+ if(AQUARIUM_LAYER_MODE_BOTTOM)
+ return movable.layer + AQUARIUM_MIN_OFFSET
+ if(AQUARIUM_LAYER_MODE_TOP)
+ return movable.layer + AQUARIUM_MAX_OFFSET
+ if(AQUARIUM_LAYER_MODE_AUTO)
+ var/chosen_layer = AQUARIUM_MIN_OFFSET + AQUARIUM_LAYER_STEP
+ while((chosen_layer in used_layers) && (chosen_layer <= AQUARIUM_MAX_OFFSET))
+ chosen_layer += AQUARIUM_LAYER_STEP
+ used_layers += chosen_layer
+ return movable.layer + chosen_layer
+
+/datum/component/aquarium/proc/get_fishes()
+ var/list/fishes = list()
+ for(var/key in tracked_fish_by_type)
+ fishes += tracked_fish_by_type[key]
+ return fishes
+
+/datum/component/aquarium/proc/interact(atom/movable/source, mob/user)
+ SIGNAL_HANDLER
+
+ if(HAS_TRAIT(source, TRAIT_AQUARIUM_PANEL_OPEN))
+ INVOKE_ASYNC(src, PROC_REF(ui_interact), user)
+ else if(!isitem(source))
+ INVOKE_ASYNC(src, PROC_REF(admire), user)
+
+/datum/component/aquarium/proc/on_secondary_attack_hand(obj/item/source, mob/living/user)
+ SIGNAL_HANDLER
+ INVOKE_ASYNC(src, PROC_REF(admire), user)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/datum/component/aquarium/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ var/atom/movable/movable = parent
+ ui = new(user, src, "Aquarium", movable.name)
+ ui.open()
+
+/datum/component/aquarium/ui_data(mob/user)
+ . = ..()
+ var/atom/movable/aquarium = parent
+ .["fluidType"] = fluid_type
+ .["temperature"] = fluid_temp
+ .["allowBreeding"] = HAS_TRAIT_FROM(aquarium, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH, AQUARIUM_TRAIT)
+ .["fishData"] = list()
+ .["feedingInterval"] = feeding_interval / (1 MINUTES)
+ .["propData"] = list()
+ for(var/atom/movable/item as anything in aquarium.contents)
+ if(isfish(item))
+ var/obj/item/fish/fish = item
+ .["fishData"] += list(list(
+ "fish_ref" = REF(fish),
+ "fish_name" = uppertext(fish.name),
+ "fish_happiness" = fish.get_happiness_value(),
+ "fish_icon" = fish::icon,
+ "fish_icon_state" = fish::icon_state,
+ "fish_health" = fish.health,
+ ))
+ continue
+ .["propData"] += list(list(
+ "prop_ref" = REF(item),
+ "prop_name" = item.name,
+ "prop_icon" = item::icon,
+ "prop_icon_state" = item::icon_state,
+ ))
+
+/datum/component/aquarium/ui_static_data(mob/user)
+ . = ..()
+ //I guess these should depend on the fluid so lava critters can get high or stuff below water freezing point but let's keep it simple for now.
+ .["minTemperature"] = min_fluid_temp
+ .["maxTemperature"] = max_fluid_temp
+ .["fluidTypes"] = fluid_types
+ .["heartIcon"] = 'icons/effects/effects.dmi'
+
+/datum/component/aquarium/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+ var/mob/user = usr
+ var/atom/movable/movable = parent
+ switch(action)
+ if("temperature")
+ var/temperature = params["temperature"]
+ if(isnum(temperature) && temperature != fluid_temp)
+ fluid_temp = clamp(temperature, min_fluid_temp, max_fluid_temp)
+ for(var/obj/item/fish/fish as anything in get_fishes())
+ check_fluid_and_temperature(fish)
+ . = TRUE
+ if("fluid")
+ if(params["fluid"] != fluid_type && (params["fluid"] in fluid_types))
+ set_fluid_type(params["fluid"])
+ . = TRUE
+ if("allow_breeding")
+ if(HAS_TRAIT(movable, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH))
+ REMOVE_TRAIT(movable, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH, AQUARIUM_TRAIT)
+ else
+ ADD_TRAIT(movable, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH, AQUARIUM_TRAIT)
+ . = TRUE
+ if("feeding_interval")
+ feeding_interval = params["feeding_interval"] MINUTES
+ . = TRUE
+ if("pet_fish")
+ var/obj/item/fish/fish = locate(params["fish_reference"]) in movable.contents
+ fish?.pet_fish(user)
+ if("remove_item")
+ var/atom/movable/item = locate(params["item_reference"]) in movable.contents
+ item?.forceMove(movable.drop_location())
+ to_chat(user, span_notice("You take out [item] from [movable]."))
+ if("rename_fish")
+ var/new_name = sanitize_name(params["chosen_name"])
+ var/atom/movable/fish = locate(params["fish_reference"]) in movable.contents
+ if(!fish || !new_name || new_name == fish.name)
+ return
+ fish.AddComponent(/datum/component/rename, new_name, fish.desc)
+
+/datum/component/aquarium/proc/set_fluid_type(new_fluid_type)
+ var/atom/movable/movable = parent
+ fluid_type = new_fluid_type
+ SEND_SIGNAL(movable, COMSIG_AQUARIUM_FLUID_CHANGED, fluid_type)
+ for(var/obj/item/fish/fish as anything in get_fishes())
+ check_fluid_and_temperature(fish)
+
+/datum/component/aquarium/proc/admire(atom/movable/source, mob/living/user)
+ source.balloon_alert(user, "admiring aquarium...")
+ if(!do_after(user, 5 SECONDS, target = source))
+ return
+ var/alive_fish = 0
+ var/dead_fish = 0
+ for(var/obj/item/fish/fish as anything in get_fishes())
+ if(fish.status == FISH_ALIVE)
+ alive_fish++
+ else
+ dead_fish++
+
+ var/morb = HAS_MIND_TRAIT(user, TRAIT_MORBID)
+ //Check if there are live fish - good mood
+ //All fish dead - bad mood.
+ //No fish - nothing.
+ if(alive_fish > 0)
+ user.add_mood_event("aquarium", morb ? /datum/mood_event/morbid_aquarium_bad : /datum/mood_event/aquarium_positive)
+ else if(dead_fish > 0)
+ user.add_mood_event("aquarium", morb ? /datum/mood_event/morbid_aquarium_good : /datum/mood_event/aquarium_negative)
+
+#undef MIN_AQUARIUM_BEAUTY
+#undef MAX_AQUARIUM_BEAUTY
diff --git a/code/datums/components/aquarium_content.dm b/code/datums/components/aquarium_content.dm
index 1307cb45fbbc3..87cd34571d401 100644
--- a/code/datums/components/aquarium_content.dm
+++ b/code/datums/components/aquarium_content.dm
@@ -1,18 +1,5 @@
-///Malus to the beauty value if the fish content is dead
-#define DEAD_FISH_BEAUTY -500
-///Prevents more impressive fishes from providing a positive beauty even when dead.
-#define MAX_DEAD_FISH_BEAUTY -200
-///Some fish are already so ugly, they can't get much worse when dead
-#define MIN_DEAD_FISH_BEAUTY -600
-
-///Defines that clamp the beauty of the aquarium, to prevent it from making most areas great or horrid all by itself.
-#define MIN_AQUARIUM_BEAUTY -3500
-#define MAX_AQUARIUM_BEAUTY 6000
-
/// Allows movables to be inserted/displayed in aquariums.
/datum/component/aquarium_content
- /// Keeps track of our current aquarium.
- var/obj/structure/aquarium/current_aquarium
//This is visual effect holder that will end up in aquarium's vis_contents
var/obj/effect/aquarium/vc_obj
@@ -32,161 +19,103 @@
/// Does this behviour need additional processing in aquarium, will be added to SSobj processing on insertion
var/processing = FALSE
- /// Signals of the parent that will trigger animation update
- var/animation_update_signals
-
- /// The current beauty this component gives to the aquarium it's in
- var/beauty
+ /// Signals for the aquarium we're in that trigger an animation update
+ var/list/animation_update_signals
- /// The original value of the beauty this component had when initialized
- var/original_beauty
-
-/datum/component/aquarium_content/Initialize(animation_update_signals, beauty)
- if(!ismovable(parent))
+/datum/component/aquarium_content/Initialize(animation_update_signals)
+ if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
- src.animation_update_signals = animation_update_signals
- src.beauty = original_beauty = beauty
- if(animation_update_signals)
- RegisterSignals(parent, animation_update_signals, PROC_REF(generate_animation))
+ src.animation_update_signals = islist(animation_update_signals) ? animation_update_signals : list(animation_update_signals)
- ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src))
- RegisterSignal(parent, COMSIG_TRY_INSERTING_IN_AQUARIUM, PROC_REF(is_ready_to_insert))
+ ADD_TRAIT(parent, TRAIT_AQUARIUM_CONTENT, REF(src))
RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(enter_aquarium))
- if(isfish(parent))
- RegisterSignal(parent, COMSIG_FISH_STATUS_CHANGED, PROC_REF(on_fish_status_changed))
-
//If component is added to something already in aquarium at the time initialize it properly.
var/atom/movable/movable_parent = parent
- if(istype(movable_parent.loc, /obj/structure/aquarium))
+ if(movable_parent.loc && HAS_TRAIT(movable_parent.loc, TRAIT_IS_AQUARIUM))
on_inserted(movable_parent.loc)
-/datum/component/aquarium_content/proc/on_fish_status_changed(obj/item/fish/source)
- SIGNAL_HANDLER
- var/old_beauty = beauty
- beauty = original_beauty
- if(source.status == FISH_DEAD)
- beauty = clamp(beauty + DEAD_FISH_BEAUTY, MIN_DEAD_FISH_BEAUTY, MAX_DEAD_FISH_BEAUTY)
- if(current_aquarium)
- change_aquarium_beauty(beauty - old_beauty)
- generate_animation()
-
-/datum/component/aquarium_content/PreTransfer()
- . = ..()
- REMOVE_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src))
-
/datum/component/aquarium_content/Destroy(force)
- if(current_aquarium)
- remove_from_aquarium()
+ var/atom/movable/movable = parent
+ if(movable.loc && HAS_TRAIT(movable.loc, TRAIT_IS_AQUARIUM))
+ remove_from_aquarium(movable.loc)
QDEL_NULL(vc_obj)
+ REMOVE_TRAIT(parent, TRAIT_AQUARIUM_CONTENT, REF(src))
return ..()
/datum/component/aquarium_content/proc/enter_aquarium(datum/source, OldLoc, Dir, Forced)
SIGNAL_HANDLER
var/atom/movable/movable_parent = parent
- if(istype(movable_parent.loc, /obj/structure/aquarium))
+ if(HAS_TRAIT(movable_parent.loc, TRAIT_IS_AQUARIUM))
on_inserted(movable_parent.loc)
-/datum/component/aquarium_content/proc/is_ready_to_insert(datum/source, obj/structure/aquarium/aquarium)
- SIGNAL_HANDLER
- if(HAS_TRAIT(parent, TRAIT_UNIQUE_AQUARIUM_CONTENT))
- for(var/atom/movable/content as anything in aquarium)
- if(content == parent)
- continue
- if(content.type == parent.type)
- return COMSIG_CANNOT_INSERT_IN_AQUARIUM
- return COMSIG_CAN_INSERT_IN_AQUARIUM
-
-/datum/component/aquarium_content/proc/on_inserted(atom/aquarium)
- current_aquarium = aquarium
- RegisterSignal(current_aquarium, COMSIG_ATOM_EXITED, PROC_REF(on_removed))
- RegisterSignal(current_aquarium, COMSIG_AQUARIUM_SURFACE_CHANGED, PROC_REF(on_surface_changed))
- RegisterSignal(current_aquarium, COMSIG_AQUARIUM_FLUID_CHANGED, PROC_REF(on_fluid_changed))
+/datum/component/aquarium_content/proc/on_inserted(atom/movable/aquarium)
+ RegisterSignal(aquarium, COMSIG_ATOM_EXITED, PROC_REF(on_removed))
+ RegisterSignal(aquarium, COMSIG_AQUARIUM_FLUID_CHANGED, PROC_REF(on_fluid_changed))
+ RegisterSignals(aquarium, animation_update_signals, PROC_REF(animation_update_signal_proc))
if(processing)
START_PROCESSING(SSobj, src)
//If we don't have vc object yet build it
if(!vc_obj)
- generate_base_vc()
+ generate_base_vc(aquarium)
//Set default position and layer
set_vc_base_position()
generate_animation(reset = TRUE)
//Finally add it to to objects vis_contents
- current_aquarium.vis_contents |= vc_obj
+ aquarium.vis_contents |= vc_obj
- change_aquarium_beauty(beauty)
-
-///Modifies the beauty of the aquarium when content is added or removed, or when fishes die or live again somehow.
-/datum/component/aquarium_content/proc/change_aquarium_beauty(change)
- if(QDELETED(current_aquarium) || !change)
- return
- var/old_clamped_beauty = clamp(current_aquarium.current_beauty, MIN_AQUARIUM_BEAUTY, MAX_AQUARIUM_BEAUTY)
- current_aquarium.current_beauty += change
- var/new_clamped_beauty = clamp(current_aquarium.current_beauty, MIN_AQUARIUM_BEAUTY, MAX_AQUARIUM_BEAUTY)
- if(new_clamped_beauty == old_clamped_beauty)
- return
- if(current_aquarium.current_beauty)
- current_aquarium.RemoveElement(/datum/element/beauty, current_aquarium.current_beauty)
- if(current_aquarium.current_beauty)
- current_aquarium.AddElement(/datum/element/beauty, current_aquarium.current_beauty)
-
-/// Aquarium surface changed in some way, we need to recalculate base position and aninmation
-/datum/component/aquarium_content/proc/on_surface_changed()
+/datum/component/aquarium_content/proc/on_fluid_changed(datum/source, new_fluid_type)
SIGNAL_HANDLER
- set_vc_base_position()
- generate_animation(reset = TRUE) //our animation start point changed, gotta redo
+ vc_obj.fluid_type = new_fluid_type
+ generate_animation()
-/datum/component/aquarium_content/proc/on_fluid_changed()
- SIGNAL_HANDLER
+///Called when one of the signals in the 'animation_update_signals' is sent
+/datum/component/aquarium_content/proc/animation_update_signal_proc(datum/source)
generate_animation()
///Sends a signal to the parent to get them to update the aquarium animation of the visual object
-/datum/component/aquarium_content/proc/generate_animation(reset=FALSE)
- if(!current_aquarium)
- return
- SEND_SIGNAL(parent, COMSIG_AQUARIUM_CONTENT_DO_ANIMATION, reset ? null : current_animation, current_aquarium, vc_obj)
-
-/datum/component/aquarium_content/proc/remove_visual_from_aquarium()
- current_aquarium.vis_contents -= vc_obj
- if(vc_obj.layer)
- current_aquarium.free_layer(vc_obj.layer)
+/datum/component/aquarium_content/proc/generate_animation(reset = FALSE)
+ var/atom/movable/movable = parent
+ SEND_SIGNAL(movable, COMSIG_AQUARIUM_CONTENT_DO_ANIMATION, reset ? null : current_animation, vc_obj)
/// Generates common visual object, propeties that don't depend on aquarium surface
-/datum/component/aquarium_content/proc/generate_base_vc()
+/datum/component/aquarium_content/proc/generate_base_vc(atom/movable/aquarium)
vc_obj = new
vc_obj.vis_flags |= VIS_INHERIT_ID | VIS_INHERIT_PLANE //plane so it shows properly in containers on inventory ui for handheld cases
- SEND_SIGNAL(parent, COMSIG_AQUARIUM_CONTENT_GENERATE_APPEARANCE, vc_obj)
+ SEND_SIGNAL(parent, COMSIG_AQUARIUM_CONTENT_GENERATE_APPEARANCE, vc_obj, aquarium)
/datum/component/aquarium_content/proc/set_vc_base_position()
- SEND_SIGNAL(parent, AQUARIUM_CONTENT_RANDOMIZE_POSITION, current_aquarium, vc_obj)
- if(vc_obj.layer)
- current_aquarium.free_layer(vc_obj.layer)
- vc_obj.layer = current_aquarium.request_layer(vc_obj.layer_mode)
+ var/atom/movable/movable = parent
+ SEND_SIGNAL(movable.loc, COMSIG_AQUARIUM_SET_VISUAL, vc_obj) //set the necessary layer as well as the pixel bounds first
+ SEND_SIGNAL(movable, COMSIG_AQUARIUM_CONTENT_RANDOMIZE_POSITION, movable.loc, vc_obj)
-/datum/component/aquarium_content/proc/on_removed(obj/structure/aquarium/source, atom/movable/gone, direction)
+/datum/component/aquarium_content/proc/on_removed(atom/movable/aquarium, atom/movable/gone, direction)
SIGNAL_HANDLER
if(parent != gone)
return
- remove_from_aquarium()
+ remove_from_aquarium(aquarium)
-/datum/component/aquarium_content/proc/remove_from_aquarium()
- change_aquarium_beauty(-beauty)
- UnregisterSignal(current_aquarium, list(COMSIG_AQUARIUM_SURFACE_CHANGED, COMSIG_AQUARIUM_FLUID_CHANGED, COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_EXITED))
- remove_visual_from_aquarium()
- current_aquarium = null
+/datum/component/aquarium_content/proc/remove_from_aquarium(atom/movable/aquarium)
+ UnregisterSignal(aquarium, list(COMSIG_AQUARIUM_FLUID_CHANGED, COMSIG_ATOM_EXITED) + animation_update_signals)
+ SEND_SIGNAL(aquarium, COMSIG_AQUARIUM_REMOVE_VISUAL, vc_obj)
-///The visual overlay of the aquarium content. It can hold a couple vars that we can modify through signal procs.
+///The visual overlay of the aquarium content. It can hold a few vars with values about the component of the aquarium it's in.
/obj/effect/aquarium
layer = 0 //set on set_vc_base_position
/// How the visual will be layered
var/layer_mode = AQUARIUM_LAYER_MODE_AUTO
-
-#undef DEAD_FISH_BEAUTY
-#undef MIN_DEAD_FISH_BEAUTY
-#undef MAX_DEAD_FISH_BEAUTY
-#undef MIN_AQUARIUM_BEAUTY
-#undef MAX_AQUARIUM_BEAUTY
+ ///minimum pixel x, inherited from the aquarium
+ var/aquarium_zone_min_px
+ ///maximum pixel x, inherited from the aquarium
+ var/aquarium_zone_max_px
+ ///minimum pixel y, inherited from the aquarium
+ var/aquarium_zone_min_py
+ ///maximum pixel y, inherited from the aquarium
+ var/aquarium_zone_max_py
+ ///The current fluid type, inherited fom the aquarium
+ var/fluid_type
diff --git a/code/datums/components/blob_minion.dm b/code/datums/components/blob_minion.dm
index 78bff449317ce..8366a65b51160 100644
--- a/code/datums/components/blob_minion.dm
+++ b/code/datums/components/blob_minion.dm
@@ -150,6 +150,6 @@
SIGNAL_HANDLER
overmind?.assume_direct_control(replacement)
-/datum/component/blob_minion/PostTransfer()
- if(!isliving(parent))
+/datum/component/blob_minion/PostTransfer(datum/new_parent)
+ if(!isliving(new_parent))
return COMPONENT_INCOMPATIBLE
diff --git a/code/datums/components/burning.dm b/code/datums/components/burning.dm
index 2535a5b6f904c..fa60b3ecbcedc 100644
--- a/code/datums/components/burning.dm
+++ b/code/datums/components/burning.dm
@@ -8,8 +8,10 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e
/datum/component/burning
/// Fire overlay appearance we apply
var/fire_overlay
- /// Particle holder for fire particles, if any
+ /// Particle holder for fire particles, if any. Still utilized over shared holders because they're movable-only
var/obj/effect/abstract/particle_holder/particle_effect
+ /// Particle type we're using for cleaning up our shared holder
+ var/particle_type
/datum/component/burning/Initialize(fire_overlay = GLOB.fire_overlay, fire_particles = /particles/smoke/burning)
if(!isatom(parent))
@@ -25,9 +27,14 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e
return
src.fire_overlay = fire_overlay
- if(fire_particles)
- // burning particles look pretty bad when they stack on mobs, so that behavior is not wanted for items
- particle_effect = new(atom_parent, fire_particles, isitem(atom_parent) ? NONE : PARTICLE_ATTACH_MOB)
+ if (fire_particles)
+ if(ismovable(parent))
+ var/atom/movable/movable_parent = parent
+ // burning particles look pretty bad when they stack on mobs, so that behavior is not wanted for items
+ movable_parent.add_shared_particles(fire_particles, "[fire_particles]_[isitem(parent)]", isitem(parent) ? NONE : PARTICLE_ATTACH_MOB)
+ particle_type = fire_particles
+ else
+ particle_effect = new(atom_parent, fire_particles)
START_PROCESSING(SSburning, src)
/datum/component/burning/Destroy(force)
@@ -35,6 +42,9 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e
fire_overlay = null
if(particle_effect)
QDEL_NULL(particle_effect)
+ if (ismovable(parent) && particle_type)
+ var/atom/movable/movable_parent = parent
+ movable_parent.remove_shared_particles("[particle_type]_[isitem(parent)]")
return ..()
/datum/component/burning/RegisterWithParent()
diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm
index 0d65d2840f3c8..c281addacc231 100644
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -49,7 +49,7 @@
//otherwise don't do anything because turfs and areas are initialized before movables.
if(!mapload)
addtimer(CALLBACK(src, PROC_REF(drop_stuff)), 0)
- parent.AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/chasm)
+ parent.AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[/datum/fish_source/chasm])
/datum/component/chasm/UnregisterFromParent()
storage = null
diff --git a/code/datums/components/crafting/furniture.dm b/code/datums/components/crafting/furniture.dm
index 39f5a25a19f8f..c3f6557f89a2b 100644
--- a/code/datums/components/crafting/furniture.dm
+++ b/code/datums/components/crafting/furniture.dm
@@ -22,12 +22,22 @@
result = /obj/structure/aquarium
time = 10 SECONDS
reqs = list(
- /obj/item/stack/sheet/iron = 15,
+ /obj/item/stack/sheet/iron = 10,
/obj/item/stack/sheet/glass = 10,
/obj/item/aquarium_kit = 1,
)
category = CAT_FURNITURE
+/datum/crafting_recipe/fish_tank
+ name = "Portable Fish Tank"
+ result = /obj/item/fish_tank
+ time = 10 SECONDS
+ reqs = list(
+ /obj/item/stack/sheet/plastic = 5,
+ /obj/item/aquarium_kit = 1,
+ )
+ category = CAT_FURNITURE
+
/datum/crafting_recipe/mirror
name = "Mirror"
result = /obj/item/wallframe/mirror
diff --git a/code/datums/components/customizable_reagent_holder.dm b/code/datums/components/customizable_reagent_holder.dm
index fd1b8a2ac6479..fda64d6c2568b 100644
--- a/code/datums/components/customizable_reagent_holder.dm
+++ b/code/datums/components/customizable_reagent_holder.dm
@@ -82,10 +82,10 @@
))
REMOVE_TRAIT(parent, TRAIT_CUSTOMIZABLE_REAGENT_HOLDER, REF(src))
-/datum/component/customizable_reagent_holder/PostTransfer()
- if(!isatom(parent))
+/datum/component/customizable_reagent_holder/PostTransfer(datum/new_parent)
+ if(!isatom(new_parent))
return COMPONENT_INCOMPATIBLE
- var/atom/atom_parent = parent
+ var/atom/atom_parent = new_parent
if (!atom_parent.reagents)
return COMPONENT_INCOMPATIBLE
diff --git a/code/datums/components/dart_insert.dm b/code/datums/components/dart_insert.dm
index ad869903051d2..459da9d217cbe 100644
--- a/code/datums/components/dart_insert.dm
+++ b/code/datums/components/dart_insert.dm
@@ -135,8 +135,6 @@
/datum/component/dart_insert/proc/apply_var_modifiers(obj/projectile/projectile)
var_modifiers = istype(modifier_getter) ? modifier_getter.Invoke() : list()
projectile.damage += var_modifiers["damage"]
- if(var_modifiers["speed"])
- var_modifiers["speed"] = reciprocal_add(projectile.speed, var_modifiers["speed"]) - projectile.speed
projectile.speed += var_modifiers["speed"]
projectile.armour_penetration += var_modifiers["armour_penetration"]
projectile.wound_bonus += var_modifiers["wound_bonus"]
diff --git a/code/datums/components/fishing_spot.dm b/code/datums/components/fishing_spot.dm
index 982b0da2df71a..3dc99cd8067de 100644
--- a/code/datums/components/fishing_spot.dm
+++ b/code/datums/components/fishing_spot.dm
@@ -13,7 +13,6 @@
else
return COMPONENT_INCOMPATIBLE
fish_source.on_fishing_spot_init(src)
- RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(handle_attackby))
RegisterSignal(parent, COMSIG_FISHING_ROD_CAST, PROC_REF(handle_cast))
RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examined))
RegisterSignal(parent, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examined_more))
@@ -36,12 +35,6 @@
return FISHING_ROD_CAST_HANDLED
return NONE
-/datum/component/fishing_spot/proc/handle_attackby(datum/source, obj/item/item, mob/user, params)
- SIGNAL_HANDLER
- if(try_start_fishing(item,user))
- return COMPONENT_NO_AFTERATTACK
- return NONE
-
///If the fish source has fishes that are shown in the
/datum/component/fishing_spot/proc/on_examined(datum/source, mob/user, list/examine_text)
SIGNAL_HANDLER
diff --git a/code/datums/components/food/decomposition.dm b/code/datums/components/food/decomposition.dm
index a3850ab39a6bc..c883f82f658f4 100644
--- a/code/datums/components/food/decomposition.dm
+++ b/code/datums/components/food/decomposition.dm
@@ -27,8 +27,6 @@
var/produce_ants = FALSE
/// Stink particle type, if we are supposed to create stink particles
var/stink_particles
- /// Stink particle holder
- var/obj/effect/abstract/particle_holder/particle_effect
/datum/component/decomposition/Initialize(mapload, decomp_req_handle, decomp_flags = NONE, decomp_result, ant_attracting = FALSE, custom_time = 0, stink_particles = /particles/stink)
if(!ismovable(parent) || !HAS_TRAIT(parent, TRAIT_GERM_SENSITIVE))
@@ -52,9 +50,11 @@
src.stink_particles = stink_particles
/datum/component/decomposition/Destroy()
- . = ..()
- if(particle_effect)
- QDEL_NULL(particle_effect)
+ remove_timer()
+ if (stink_particles)
+ var/atom/movable/movable_parent = parent
+ movable_parent.remove_shared_particles("[stink_particles]_[isitem(parent)]")
+ return ..()
/datum/component/decomposition/RegisterWithParent()
RegisterSignal(parent, COMSIG_ATOM_GERM_EXPOSED, PROC_REF(start_timer))
@@ -78,17 +78,13 @@
// If all other checks fail, then begin decomposition.
decomp_timerid = addtimer(CALLBACK(src, PROC_REF(decompose)), time_remaining, TIMER_STOPPABLE | TIMER_UNIQUE)
- // Also start the stinking timer, if have stink particles and aren't stinking yet
- if(!stink_particles || particle_effect)
+ // Also start the stinking timer, if have stink particles
+ if(!stink_particles)
return
var/stink_time = max(0, time_remaining - (original_time * 0.5))
stink_timerid = addtimer(CALLBACK(src, PROC_REF(stink_up)), stink_time, TIMER_STOPPABLE | TIMER_UNIQUE)
-/datum/component/decomposition/Destroy()
- remove_timer()
- return ..()
-
/// Returns the time remaining in decomp, either from our potential timer or our own value, whichever is more useful
/datum/component/decomposition/proc/get_time()
if(!decomp_timerid)
@@ -108,11 +104,12 @@
/datum/component/decomposition/proc/stink_up()
stink_timerid = null
- // Neither should happen, but to be sure
- if(particle_effect || !stink_particles)
+ // Shouldn't happen, but to be sure
+ if(!stink_particles)
return
// we don't want stink lines on mobs (even though it'd be quite funny)
- particle_effect = new(parent, stink_particles, isitem(parent) ? NONE : PARTICLE_ATTACH_MOB)
+ var/atom/movable/movable_parent = parent
+ movable_parent.add_shared_particles(stink_particles, "[stink_particles]_[isitem(parent)]", isitem(parent) ? NONE : PARTICLE_ATTACH_MOB)
/datum/component/decomposition/proc/decompose()
decomp_timerid = null
diff --git a/code/datums/components/irradiated.dm b/code/datums/components/irradiated.dm
index a798124528c06..6df77dbfdc9fd 100644
--- a/code/datums/components/irradiated.dm
+++ b/code/datums/components/irradiated.dm
@@ -181,10 +181,10 @@
if (isliving(source))
var/mob/living/living_source = source
- to_chat(user, span_boldannounce("[icon2html(geiger_counter, user)] Subject is irradiated. Contamination traces back to roughly [DisplayTimeText(world.time - beginning_of_irradiation, 5)] ago. Current toxin levels: [living_source.getToxLoss()]."))
+ to_chat(user, span_bolddanger("[icon2html(geiger_counter, user)] Subject is irradiated. Contamination traces back to roughly [DisplayTimeText(world.time - beginning_of_irradiation, 5)] ago. Current toxin levels: [living_source.getToxLoss()]."))
else
// In case the green wasn't obvious enough...
- to_chat(user, span_boldannounce("[icon2html(geiger_counter, user)] Target is irradiated."))
+ to_chat(user, span_bolddanger("[icon2html(geiger_counter, user)] Target is irradiated."))
return COMSIG_GEIGER_COUNTER_SCAN_SUCCESSFUL
diff --git a/code/datums/components/itempicky.dm b/code/datums/components/itempicky.dm
index bda8b1ae13881..f8e4e2256d857 100644
--- a/code/datums/components/itempicky.dm
+++ b/code/datums/components/itempicky.dm
@@ -27,8 +27,8 @@
/datum/component/itempicky/UnregisterFromParent()
UnregisterSignal(parent, COMSIG_LIVING_TRY_PUT_IN_HAND)
-/datum/component/itempicky/PostTransfer()
- if(!ismob(parent))
+/datum/component/itempicky/PostTransfer(datum/new_parent)
+ if(!ismob(new_parent))
return COMPONENT_INCOMPATIBLE
/datum/component/itempicky/InheritComponent(datum/component/itempicky/friend, i_am_original, list/arguments)
diff --git a/code/datums/components/jetpack.dm b/code/datums/components/jetpack.dm
index fd49aa2b67b6a..0a52d2250be93 100644
--- a/code/datums/components/jetpack.dm
+++ b/code/datums/components/jetpack.dm
@@ -167,7 +167,7 @@
if (get_dir(source, backup) == movement_dir || source.loc == backup.loc)
return
- if (!source.client.intended_direction || (source.client.intended_direction & get_dir(source, backup)))
+ if (!source.client?.intended_direction || (source.client.intended_direction & get_dir(source, backup)))
return
if (!should_trigger(source) || !check_on_move.Invoke(FALSE))
diff --git a/code/datums/components/mirv.dm b/code/datums/components/mirv.dm
index 52b4053babb5a..ead33d476d459 100644
--- a/code/datums/components/mirv.dm
+++ b/code/datums/components/mirv.dm
@@ -32,12 +32,12 @@
var/turf/target_turf = get_turf(target)
for(var/turf/shootat_turf in RANGE_TURFS(radius, target) - RANGE_TURFS(radius-1, target))
- var/obj/projectile/P = new projectile_type(target_turf)
+ var/obj/projectile/proj = new projectile_type(target_turf)
//Shooting Code:
- P.range = radius+1
+ proj.range = radius+1
if(override_projectile_range)
- P.range = override_projectile_range
- P.preparePixelProjectile(shootat_turf, target)
- P.firer = firer // don't hit ourself that would be really annoying
- P.impacted = list(WEAKREF(target) = TRUE) // don't hit the target we hit already with the flak
- P.fire()
+ proj.range = override_projectile_range
+ proj.aim_projectile(shootat_turf, target)
+ proj.firer = firer // don't hit ourself that would be really annoying
+ proj.impacted = list(WEAKREF(target) = TRUE) // don't hit the target we hit already with the flak
+ proj.fire()
diff --git a/code/datums/components/multiple_lives.dm b/code/datums/components/multiple_lives.dm
index ce2c4a5053f1e..f374b3e37750d 100644
--- a/code/datums/components/multiple_lives.dm
+++ b/code/datums/components/multiple_lives.dm
@@ -51,6 +51,6 @@
/datum/component/multiple_lives/InheritComponent(datum/component/multiple_lives/new_comp , lives_left)
src.lives_left += new_comp ? new_comp.lives_left : lives_left
-/datum/component/multiple_lives/PostTransfer()
- if(!isliving(parent))
+/datum/component/multiple_lives/PostTransfer(datum/new_parent)
+ if(!isliving(new_parent))
return COMPONENT_INCOMPATIBLE
diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm
index 71f391e599ad8..74a59301e7339 100644
--- a/code/datums/components/orbiter.dm
+++ b/code/datums/components/orbiter.dm
@@ -56,10 +56,10 @@
orbiter_list += newcomp.orbiter_list
newcomp.orbiter_list = null
-/datum/component/orbiter/PostTransfer()
- if(!isatom(parent) || isarea(parent) || !get_turf(parent))
+/datum/component/orbiter/PostTransfer(datum/new_parent)
+ if(!isatom(parent) || isarea(new_parent) || !get_turf(new_parent))
return COMPONENT_INCOMPATIBLE
- move_react(parent)
+ move_react(new_parent)
/datum/component/orbiter/proc/begin_orbit(atom/movable/orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
if(orbiter.orbiting)
diff --git a/code/datums/components/parry.dm b/code/datums/components/parry.dm
index 2486796d378bb..e24bb4d2480df 100644
--- a/code/datums/components/parry.dm
+++ b/code/datums/components/parry.dm
@@ -23,7 +23,7 @@
/// Callback for special effects upon parrying
var/datum/callback/parry_callback
-/datum/component/parriable_projectile/Initialize(parry_speed_mult = 0.8, parry_damage_mult = 1.15, boost_speed_mult = 0.6, boost_damage_mult = 1.5, parry_trait = TRAIT_MINING_PARRYING, grace_period = 0.25 SECONDS, datum/callback/parry_callback = null)
+/datum/component/parriable_projectile/Initialize(parry_speed_mult = 1.25, parry_damage_mult = 1.15, boost_speed_mult = 1.6, boost_damage_mult = 1.5, parry_trait = TRAIT_MINING_PARRYING, grace_period = 0.25 SECONDS, datum/callback/parry_callback = null)
if(!isprojectile(parent))
return COMPONENT_INCOMPATIBLE
src.parry_speed_mult = parry_speed_mult
@@ -41,13 +41,13 @@
. = ..()
/datum/component/parriable_projectile/RegisterWithParent()
- RegisterSignal(parent, COMSIG_PROJECTILE_PIXEL_STEP, PROC_REF(on_moved))
+ RegisterSignal(parent, COMSIG_PROJECTILE_MOVE_PROCESS_STEP, PROC_REF(on_moved))
RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(before_move))
RegisterSignal(parent, COMSIG_PROJECTILE_BEFORE_MOVE, PROC_REF(before_move))
RegisterSignal(parent, COMSIG_PROJECTILE_SELF_PREHIT, PROC_REF(before_hit))
/datum/component/parriable_projectile/UnregisterFromParent()
- UnregisterSignal(parent, list(COMSIG_PROJECTILE_PIXEL_STEP, COMSIG_MOVABLE_MOVED, COMSIG_PROJECTILE_BEFORE_MOVE, COMSIG_PROJECTILE_SELF_PREHIT))
+ UnregisterSignal(parent, list(COMSIG_PROJECTILE_MOVE_PROCESS_STEP, COMSIG_MOVABLE_MOVED, COMSIG_PROJECTILE_BEFORE_MOVE, COMSIG_PROJECTILE_SELF_PREHIT))
/datum/component/parriable_projectile/proc/before_move(obj/projectile/source)
SIGNAL_HANDLER
@@ -71,7 +71,7 @@
/datum/component/parriable_projectile/proc/on_moved(obj/projectile/source)
SIGNAL_HANDLER
- if (!isturf(source.loc))
+ if (!isturf(source.loc) || parry_turfs[source.loc])
return
parry_turfs[source.loc] = world.time + grace_period
RegisterSignal(source.loc, COMSIG_CLICK, PROC_REF(on_turf_click))
@@ -95,6 +95,9 @@
attempt_parry(source, user)
/datum/component/parriable_projectile/proc/attempt_parry(obj/projectile/source, mob/user)
+ if (QDELETED(source) || source.deletion_queued)
+ return
+
if (SEND_SIGNAL(user, COMSIG_LIVING_PROJECTILE_PARRIED, source) & INTERCEPT_PARRY_EFFECTS)
return
diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm
index e9b7fad34fc20..41f18a6cb1809 100644
--- a/code/datums/components/pellet_cloud.dm
+++ b/code/datums/components/pellet_cloud.dm
@@ -224,10 +224,10 @@
break
///One of our pellets hit something, record what it was and check if we're done (terminated == num_pellets)
-/datum/component/pellet_cloud/proc/pellet_hit(obj/projectile/P, atom/movable/firer, atom/target, Angle, hit_zone)
+/datum/component/pellet_cloud/proc/pellet_hit(obj/projectile/proj, atom/movable/firer, atom/target, Angle, hit_zone)
SIGNAL_HANDLER
- pellets -= P
+ pellets -= proj
terminated++
hits++
var/obj/item/bodypart/hit_part
@@ -237,34 +237,34 @@
hit_part = hit_carbon.get_bodypart(hit_zone)
if(hit_part)
target = hit_part
- if(P.wound_bonus != CANT_WOUND) // handle wounding
+ if(proj.wound_bonus != CANT_WOUND) // handle wounding
// unfortunately, due to how pellet clouds handle finalizing only after every pellet is accounted for, that also means there might be a short delay in dealing wounds if one pellet goes wide
// while buckshot may reach a target or miss it all in one tick, we also have to account for possible ricochets that may take a bit longer to hit the target
if(isnull(wound_info_by_part[hit_part]))
wound_info_by_part[hit_part] = list(0, 0, 0)
- wound_info_by_part[hit_part][CLOUD_POSITION_DAMAGE] += P.damage // these account for decay
- wound_info_by_part[hit_part][CLOUD_POSITION_W_BONUS] += P.wound_bonus
- wound_info_by_part[hit_part][CLOUD_POSITION_BW_BONUS] += P.bare_wound_bonus
- P.wound_bonus = CANT_WOUND // actual wounding will be handled aggregate
+ wound_info_by_part[hit_part][CLOUD_POSITION_DAMAGE] += proj.damage // these account for decay
+ wound_info_by_part[hit_part][CLOUD_POSITION_W_BONUS] += proj.wound_bonus
+ wound_info_by_part[hit_part][CLOUD_POSITION_BW_BONUS] += proj.bare_wound_bonus
+ proj.wound_bonus = CANT_WOUND // actual wounding will be handled aggregate
else if(isobj(target))
var/obj/hit_object = target
- if(hit_object.damage_deflection > P.damage || !P.damage)
+ if(hit_object.damage_deflection > proj.damage || !proj.damage)
damage = FALSE
LAZYADDASSOC(targets_hit[target], "hits", 1)
LAZYSET(targets_hit[target], "damage", damage)
if(targets_hit[target]["hits"] == 1)
- RegisterSignal(target, COMSIG_QDELETING, PROC_REF(on_target_qdel), override=TRUE)
- UnregisterSignal(P, list(COMSIG_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT))
+ RegisterSignal(target, COMSIG_QDELETING, PROC_REF(on_target_qdel), override = TRUE)
+ UnregisterSignal(proj, list(COMSIG_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT))
if(terminated == num_pellets)
finalize()
///One of our pellets disappeared due to hitting their max range (or just somehow got qdel'd), remove it from our list and check if we're done (terminated == num_pellets)
-/datum/component/pellet_cloud/proc/pellet_range(obj/projectile/P)
+/datum/component/pellet_cloud/proc/pellet_range(obj/projectile/proj)
SIGNAL_HANDLER
- pellets -= P
+ pellets -= proj
terminated++
- UnregisterSignal(P, list(COMSIG_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT))
+ UnregisterSignal(proj, list(COMSIG_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT))
if(terminated == num_pellets)
finalize()
@@ -279,18 +279,18 @@
pellet.firer = parent // don't hit ourself that would be really annoying
pellet.impacted = list(WEAKREF(parent) = TRUE) // don't hit the target we hit already with the flak
pellet.suppressed = SUPPRESSED_VERY // set the projectiles to make no message so we can do our own aggregate message
- pellet.preparePixelProjectile(target, parent)
+ pellet.aim_projectile(target, parent)
RegisterSignal(pellet, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(pellet_hit))
RegisterSignals(pellet, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_QDELETING), PROC_REF(pellet_range))
pellets += pellet
pellet.fire()
if(landmine_victim)
- pellet.process_hit_loop(target)
+ pellet.impact(target)
///All of our pellets are accounted for, time to go target by target and tell them how many things they got hit by.
/datum/component/pellet_cloud/proc/finalize()
- var/obj/projectile/P = projectile_type
- var/proj_name = initial(P.name)
+ var/obj/projectile/proj_type = projectile_type
+ var/proj_name = initial(proj_type.name)
for(var/atom/target in targets_hit)
var/num_hits = targets_hit[target]["hits"]
@@ -303,24 +303,24 @@
hit_part = null //so the visible_message later on doesn't generate extra text.
else
target = hit_part.owner
- if(wound_info_by_part[hit_part] && (initial(P.damage_type) == BRUTE || initial(P.damage_type) == BURN)) // so a cloud of disablers that deal stamina don't inadvertently end up causing burn wounds)
+ if(wound_info_by_part[hit_part] && (initial(proj_type.damage_type) == BRUTE || initial(proj_type.damage_type) == BURN)) // so a cloud of disablers that deal stamina don't inadvertently end up causing burn wounds)
var/damage_dealt = wound_info_by_part[hit_part][CLOUD_POSITION_DAMAGE]
var/w_bonus = wound_info_by_part[hit_part][CLOUD_POSITION_W_BONUS]
var/bw_bonus = wound_info_by_part[hit_part][CLOUD_POSITION_BW_BONUS]
- var/wounding_type = (initial(P.damage_type) == BRUTE) ? WOUND_BLUNT : WOUND_BURN // sharpness is handled in the wound rolling
+ var/wounding_type = (initial(proj_type.damage_type) == BRUTE) ? WOUND_BLUNT : WOUND_BURN // sharpness is handled in the wound rolling
wound_info_by_part -= hit_part
// technically this only checks armor worn the moment that all the pellets resolve rather than as each one hits you,
// but this isn't important enough to warrant all the extra loops of mostly redundant armor checks
var/mob/living/carbon/hit_carbon = target
- var/armor_factor = hit_carbon.getarmor(hit_part, initial(P.armor_flag))
+ var/armor_factor = hit_carbon.getarmor(hit_part, initial(proj_type.armor_flag))
armor_factor = min(ARMOR_MAX_BLOCK, armor_factor) //cap damage reduction at 90%
if(armor_factor > 0)
- if(initial(P.weak_against_armour) && armor_factor >= 0)
+ if(initial(proj_type.weak_against_armour) && armor_factor >= 0)
armor_factor *= ARMOR_WEAKENED_MULTIPLIER
damage_dealt *= max(0, 1 - armor_factor*0.01)
- hit_part.painless_wound_roll(wounding_type, damage_dealt, w_bonus, bw_bonus, initial(P.sharpness))
+ hit_part.painless_wound_roll(wounding_type, damage_dealt, w_bonus, bw_bonus, initial(proj_type.sharpness))
var/limb_hit_text = ""
if(hit_part)
diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm
index 40df294af12a8..16d7bddec8708 100644
--- a/code/datums/components/rotation.dm
+++ b/code/datums/components/rotation.dm
@@ -28,7 +28,7 @@
RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item))
return ..()
-/datum/component/simple_rotation/PostTransfer()
+/datum/component/simple_rotation/PostTransfer(datum/new_parent)
//Because of the callbacks which we don't track cleanly we can't transfer this
//item cleanly, better to let the new of the new item create a new rotation datum
//instead (there's no real state worth transferring)
diff --git a/code/datums/components/shell.dm b/code/datums/components/shell.dm
index 9c74920a8628b..feb6e572bfd0f 100644
--- a/code/datums/components/shell.dm
+++ b/code/datums/components/shell.dm
@@ -346,7 +346,11 @@
))
if(attached_circuit.loc == parent || (!QDELETED(attached_circuit) && attached_circuit.loc == null))
var/atom/parent_atom = parent
- attached_circuit.forceMove(parent_atom.drop_location())
+ var/drop_location = parent_atom.drop_location()
+ if(drop_location)
+ attached_circuit.forceMove(drop_location)
+ else
+ attached_circuit.moveToNullspace()
for(var/obj/item/circuit_component/to_remove as anything in unremovable_circuit_components)
attached_circuit.remove_component(to_remove)
diff --git a/code/datums/components/shy.dm b/code/datums/components/shy.dm
index a9b50a07efb26..a6303b87a0328 100644
--- a/code/datums/components/shy.dm
+++ b/code/datums/components/shy.dm
@@ -59,7 +59,7 @@
COMSIG_TRY_ALT_ACTION,
))
-/datum/component/shy/PostTransfer()
+/datum/component/shy/PostTransfer(datum/new_parent)
if(!ismob(parent))
return COMPONENT_INCOMPATIBLE
diff --git a/code/datums/components/shy_in_room.dm b/code/datums/components/shy_in_room.dm
index 4e0c2421561e7..d4eeeb108d93f 100644
--- a/code/datums/components/shy_in_room.dm
+++ b/code/datums/components/shy_in_room.dm
@@ -31,7 +31,7 @@
COMSIG_TRY_ALT_ACTION,
))
-/datum/component/shy_in_room/PostTransfer()
+/datum/component/shy_in_room/PostTransfer(datum/new_parent)
if(!ismob(parent))
return COMPONENT_INCOMPATIBLE
diff --git a/code/datums/components/spill.dm b/code/datums/components/spill.dm
index 9112706046c44..6c84299f68938 100644
--- a/code/datums/components/spill.dm
+++ b/code/datums/components/spill.dm
@@ -25,7 +25,7 @@
dropsound = _dropsound
drop_memory = _drop_memory
-/datum/component/spill/PostTransfer()
+/datum/component/spill/PostTransfer(datum/new_parent)
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
diff --git a/code/datums/components/splat.dm b/code/datums/components/splat.dm
index d22613204bbbd..0ae407166abff 100644
--- a/code/datums/components/splat.dm
+++ b/code/datums/components/splat.dm
@@ -48,9 +48,9 @@
/datum/component/splat/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_MOVABLE_IMPACT, COMSIG_PROJECTILE_SELF_ON_HIT))
-/datum/component/splat/proc/projectile_splat(obj/projectile/source, atom/firer, atom/target, angle, hit_limb_zone, blocked)
+/datum/component/splat/proc/projectile_splat(obj/projectile/source, atom/firer, atom/target, angle, hit_limb_zone, blocked, pierce_hit)
SIGNAL_HANDLER
- if(blocked != 100)
+ if(blocked != 100 && !pierce_hit)
splat(source, target)
/datum/component/splat/proc/throw_splat(atom/movable/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught)
diff --git a/code/datums/components/supermatter_crystal.dm b/code/datums/components/supermatter_crystal.dm
index e8e6f00ed2f6d..14183e4beb63e 100644
--- a/code/datums/components/supermatter_crystal.dm
+++ b/code/datums/components/supermatter_crystal.dm
@@ -107,7 +107,7 @@
if(iscyborg(user) && atom_source.Adjacent(user))
dust_mob(source, user, cause = "cyborg attack")
return
- if(isaicamera(user))
+ if(iscameramob(user))
return
if(islarva(user))
dust_mob(source, user, cause = "larva attack")
diff --git a/code/datums/components/technointrovert.dm b/code/datums/components/technointrovert.dm
index c6f51f8041653..0797d24cb4868 100644
--- a/code/datums/components/technointrovert.dm
+++ b/code/datums/components/technointrovert.dm
@@ -20,7 +20,7 @@
/datum/component/technointrovert/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_TRY_USE_MACHINE, COMSIG_TRY_WIRES_INTERACT))
-/datum/component/technointrovert/PostTransfer()
+/datum/component/technointrovert/PostTransfer(datum/new_parent)
if(!ismob(parent))
return COMPONENT_INCOMPATIBLE
diff --git a/code/datums/components/technoshy.dm b/code/datums/components/technoshy.dm
index e8d4441a287f3..168f6d61ab5a9 100644
--- a/code/datums/components/technoshy.dm
+++ b/code/datums/components/technoshy.dm
@@ -26,7 +26,7 @@
/datum/component/technoshy/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_TRY_USE_MACHINE, COMSIG_TRY_WIRES_INTERACT))
-/datum/component/technoshy/PostTransfer()
+/datum/component/technoshy/PostTransfer(datum/new_parent)
if(!ismob(parent))
return COMPONENT_INCOMPATIBLE
diff --git a/code/datums/components/tug_towards.dm b/code/datums/components/tug_towards.dm
new file mode 100644
index 0000000000000..f34cc05bc97fe
--- /dev/null
+++ b/code/datums/components/tug_towards.dm
@@ -0,0 +1,135 @@
+/// "Tugs" an atom towards another atom. That is to say, it will visually
+/// pixel offset to look like it is close to the point it's tugging to,
+/// but not actually move position.
+/datum/component/tug_towards
+ // If multiple are specified, will tug in between them.
+ dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+
+ VAR_PRIVATE
+ /// atom -> strength
+ list/list/tugging_to_targets = list()
+
+
+ current_tug_offset_x = 0
+ current_tug_offset_y = 0
+
+/datum/component/tug_towards/Initialize(
+ /// The atom we are tugging towards.
+ atom/tugging_to,
+
+ /// Strength of the tug, as a number 0 through 1.
+ /// 0 means no tug, 1 means that if you're on an adjacent tile
+ /// you will be directly at the corner of the tugging_to_target.
+ /// Default is 0.8, which provides a healthy amount of
+ /// distance.
+ strength
+)
+ if (!isatom(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ ASSERT(istype(tugging_to))
+
+ add_tugging_to_target(tugging_to, strength)
+
+ RegisterSignals(parent, list(
+ COMSIG_MOVABLE_MOVED,
+ COMSIG_MOB_BUCKLED,
+ COMSIG_MOB_UNBUCKLED,
+ ), PROC_REF(update_tug))
+
+/datum/component/tug_towards/Destroy(force)
+ tugging_to_targets.Cut()
+
+ animate(
+ parent,
+ pixel_x = -current_tug_offset_x,
+ pixel_y = -current_tug_offset_y,
+ time = 0.2 SECONDS,
+ flags = ANIMATION_RELATIVE
+ )
+
+ return ..()
+
+/datum/component/tug_towards/InheritComponent(
+ datum/component/tug_towards/new_tug_towards,
+ i_am_original,
+
+ atom/tugging_to,
+ strength,
+)
+ add_tugging_to_target(tugging_to, strength)
+
+/datum/component/tug_towards/proc/remove_tug_target(atom/target)
+ tugging_to_targets -= target
+
+ if (tugging_to_targets.len == 0)
+ qdel(src)
+ else
+ update_tug()
+
+/datum/component/tug_towards/proc/add_tugging_to_target(
+ atom/tugging_to,
+ strength = 0.8,
+)
+ PRIVATE_PROC(TRUE)
+
+ tugging_to_targets[tugging_to] = strength
+ RegisterSignal(tugging_to, COMSIG_PREQDELETED, PROC_REF(on_tugging_to_qdeleting))
+ RegisterSignal(tugging_to, COMSIG_MOVABLE_MOVED, PROC_REF(update_tug))
+
+ update_tug()
+
+/datum/component/tug_towards/proc/on_tugging_to_qdeleting(datum/target)
+ SIGNAL_HANDLER
+ PRIVATE_PROC(TRUE)
+
+ tugging_to_targets -= target
+ if (tugging_to_targets.len == 0)
+ qdel(src)
+ else
+ update_tug()
+
+/datum/component/tug_towards/proc/update_tug()
+ SIGNAL_HANDLER
+ PRIVATE_PROC(TRUE)
+
+ var/atom/atom_parent = parent
+ var/mob/mob_parent = parent
+
+ var/total_tug_x = 0
+ var/total_tug_y = 0
+
+ if (!istype(mob_parent) || !mob_parent.buckled)
+ var/tuggers = 0
+
+ for (var/atom/target as anything in tugging_to_targets)
+ if (target.z != atom_parent.z)
+ continue
+
+ tuggers += 1
+ var/strength = tugging_to_targets[target]
+ total_tug_x += SIGN(target.x - atom_parent.x) * strength
+ total_tug_y += SIGN(target.y - atom_parent.y) * strength
+
+ // Intentionally not trig--something at a corner with a strength of 1 should have
+ // you at the corner, rather than root(2).
+ total_tug_x /= tuggers
+ total_tug_y /= tuggers
+
+ var/half_size = world.icon_size * 0.5
+ total_tug_x *= half_size
+ total_tug_y *= half_size
+
+ if (total_tug_x == current_tug_offset_x && total_tug_y == current_tug_offset_y)
+ return
+
+ animate(
+ atom_parent,
+ pixel_x = -current_tug_offset_x + total_tug_x,
+ pixel_y = -current_tug_offset_y + total_tug_y,
+ time = 0.2 SECONDS,
+ flags = ANIMATION_RELATIVE
+ )
+
+ current_tug_offset_x = total_tug_x
+ current_tug_offset_y = total_tug_y
diff --git a/code/datums/components/wet_floor.dm b/code/datums/components/wet_floor.dm
index d1f5b0fb1b86e..f362359f3cde5 100644
--- a/code/datums/components/wet_floor.dm
+++ b/code/datums/components/wet_floor.dm
@@ -159,14 +159,14 @@
for(var/i in time_left_list)
. |= text2num(i)
-/datum/component/wet_floor/PreTransfer()
+/datum/component/wet_floor/PreTransfer(datum/new_parent)
var/turf/O = parent
O.cut_overlay(current_overlay)
//That turf is no longer slippery, we're out of here
//Slippery components don't transfer due to callbacks
qdel(O.GetComponent(/datum/component/slippery))
-/datum/component/wet_floor/PostTransfer()
+/datum/component/wet_floor/PostTransfer(datum/new_parent)
if(!isopenturf(parent))
return COMPONENT_INCOMPATIBLE
var/turf/T = parent
diff --git a/code/datums/diseases/chronic_illness.dm b/code/datums/diseases/chronic_illness.dm
index 617cfde763d11..be4525fd5a411 100644
--- a/code/datums/diseases/chronic_illness.dm
+++ b/code/datums/diseases/chronic_illness.dm
@@ -60,7 +60,7 @@
affected_mob.visible_message(span_warning("[affected_mob] collapses!"))
if(prob(30))
to_chat(affected_mob, span_danger("Your vision blurs as you faint!"))
- affected_mob.AdjustSleeping(10)
+ affected_mob.AdjustSleeping(1 SECONDS)
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_danger("[pick("You feel as though your atoms are accelerating in place.", "You feel like you're being torn apart!")]"))
affected_mob.emote("scream")
diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm
index 2a77195e311c4..4b01ef804af29 100644
--- a/code/datums/diseases/tuberculosis.dm
+++ b/code/datums/diseases/tuberculosis.dm
@@ -51,7 +51,7 @@
if(SPT_PROB(5, seconds_per_tick))
need_mob_update += affected_mob.adjustStaminaLoss(100, updating_stamina = FALSE)
affected_mob.visible_message(span_warning("[affected_mob] faints!"), span_userdanger("You surrender yourself and feel at peace..."))
- affected_mob.AdjustSleeping(100)
+ affected_mob.AdjustSleeping(10 SECONDS)
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_userdanger("You feel your mind relax and your thoughts drift!"))
affected_mob.adjust_confusion_up_to(8 SECONDS, 100 SECONDS)
diff --git a/code/datums/diseases/weightlessness.dm b/code/datums/diseases/weightlessness.dm
new file mode 100644
index 0000000000000..c561b3c9205ec
--- /dev/null
+++ b/code/datums/diseases/weightlessness.dm
@@ -0,0 +1,43 @@
+/datum/disease/weightlessness
+ name = "Localized Weightloss Malfunction"
+ max_stages = 4
+ spread_text = "On Contact"
+ spread_flags = DISEASE_SPREAD_BLOOD | DISEASE_SPREAD_CONTACT_SKIN | DISEASE_SPREAD_CONTACT_FLUIDS
+ cure_text = "Liquid dark matter"
+ cures = list(/datum/reagent/liquid_dark_matter)
+ agent = "Sub-quantum DNA Repulsion"
+ viable_mobtypes = list(/mob/living/carbon/human)
+ disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
+ spreading_modifier = 0.5
+ cure_chance = 4
+ desc = "This disease results in a low level rewrite of the patient's bio-electric signature, causing them to reject the phenomena of \"weight\". Injestion of liquid dark matter tends to stabilize the field."
+ severity = DISEASE_SEVERITY_MEDIUM
+ infectable_biotypes = MOB_ORGANIC
+
+
+/datum/disease/weightlessness/stage_act(seconds_per_tick, times_fired)
+ . = ..()
+ if(!.)
+ return
+
+ switch(stage)
+ if(1)
+ if(SPT_PROB(1, seconds_per_tick))
+ to_chat(affected_mob, span_danger("You almost lose your balance for a second."))
+ if(2)
+ if(SPT_PROB(3, seconds_per_tick) && !HAS_TRAIT_FROM(affected_mob, TRAIT_MOVE_FLOATING, NO_GRAVITY_TRAIT))
+ to_chat(affected_mob, span_danger("You feel yourself lift off the ground."))
+ affected_mob.reagents.add_reagent(/datum/reagent/gravitum, 1)
+
+ if(4)
+ if(SPT_PROB(3, seconds_per_tick) && !affected_mob.has_quirk(/datum/quirk/spacer_born))
+ to_chat(affected_mob, span_danger("You feel sick as the world starts moving around you."))
+ affected_mob.adjust_confusion(3 SECONDS)
+ if(SPT_PROB(8, seconds_per_tick) && !HAS_TRAIT_FROM(affected_mob, TRAIT_MOVE_FLOATING, NO_GRAVITY_TRAIT))
+ to_chat(affected_mob, span_danger("You suddenly lift off the ground."))
+ affected_mob.reagents.add_reagent(/datum/reagent/gravitum, 5)
+
+/datum/disease/weightlessness/cure(add_resistance)
+ . = ..()
+ affected_mob.vomit(VOMIT_CATEGORY_DEFAULT, lost_nutrition = 95, purge_ratio = 0.4)
+ to_chat(affected_mob, span_danger("You fall to the floor as your body stops rejecting gravity."))
diff --git a/code/datums/elements/beauty.dm b/code/datums/elements/beauty.dm
index ddd3a8f5eabe5..8bfa298c1a725 100644
--- a/code/datums/elements/beauty.dm
+++ b/code/datums/elements/beauty.dm
@@ -20,57 +20,76 @@
src.beauty = beauty
- if(!beauty_counter[target] && ismovable(target))
+ var/area/current_area = get_area(target)
+ var/beauty_active = TRUE
+ if(ismovable(target))
var/atom/movable/mov_target = target
- mov_target.become_area_sensitive(BEAUTY_ELEMENT_TRAIT)
- RegisterSignal(mov_target, COMSIG_ENTER_AREA, PROC_REF(enter_area))
- RegisterSignal(mov_target, COMSIG_EXIT_AREA, PROC_REF(exit_area))
+ var/is_item = isitem(mov_target)
+ beauty_active = !is_item || isturf(mov_target.loc)
+ if(!beauty_counter[target])
+ if(is_item)
+ RegisterSignal(mov_target, COMSIG_MOVABLE_MOVED, PROC_REF(on_item_moved))
+ if(beauty_active)
+ mov_target.become_area_sensitive(BEAUTY_ELEMENT_TRAIT)
+ RegisterSignal(mov_target, COMSIG_ENTER_AREA, PROC_REF(enter_area))
+ RegisterSignal(mov_target, COMSIG_EXIT_AREA, PROC_REF(exit_area))
beauty_counter[target]++
- var/area/current_area = get_area(target)
- if(current_area && !current_area.outdoors)
+ if(current_area && !current_area.outdoors && beauty_active)
current_area.totalbeauty += beauty
current_area.update_beauty()
/datum/element/beauty/proc/enter_area(datum/source, area/new_area)
SIGNAL_HANDLER
- if(new_area.outdoors)
+ if(new_area.outdoors || HAS_TRAIT(source, TRAIT_BEAUTY_APPLIED))
return
new_area.totalbeauty += beauty * beauty_counter[source]
new_area.update_beauty()
+ ADD_TRAIT(source, TRAIT_BEAUTY_APPLIED, INNATE_TRAIT)
/datum/element/beauty/proc/exit_area(datum/source, area/old_area)
SIGNAL_HANDLER
- if(old_area.outdoors)
+ if(old_area.outdoors || !HAS_TRAIT(source, TRAIT_BEAUTY_APPLIED))
return
old_area.totalbeauty -= beauty * beauty_counter[source]
old_area.update_beauty()
+ REMOVE_TRAIT(source, TRAIT_BEAUTY_APPLIED, INNATE_TRAIT)
-/datum/element/beauty/Detach(datum/source)
+///Items only contribute to beauty while not inside other objects or mobs (e.g on the floor, on a table etc.).
+/datum/element/beauty/proc/on_item_moved(obj/item/source, atom/old_loc, direction, forced)
+ SIGNAL_HANDLER
+
+ var/is_old_turf = isturf(old_loc)
+ if(!is_old_turf && isturf(source.loc))
+ source.become_area_sensitive(BEAUTY_ELEMENT_TRAIT)
+ RegisterSignal(source, COMSIG_ENTER_AREA, PROC_REF(enter_area), TRUE)
+ RegisterSignal(source, COMSIG_EXIT_AREA, PROC_REF(exit_area), TRUE)
+ enter_area(source, get_area(source.loc))
+ else if(is_old_turf && !isturf(source.loc))
+ source.lose_area_sensitivity(BEAUTY_ELEMENT_TRAIT)
+ UnregisterSignal(source, list(COMSIG_ENTER_AREA, COMSIG_EXIT_AREA))
+ exit_area(source, get_area(old_loc))
+
+/datum/element/beauty/Detach(atom/source)
if(!beauty_counter[source])
return ..()
- var/area/current_area = get_area(source)
- if(QDELETED(source))
- . = ..()
- UnregisterSignal(source, list(COMSIG_ENTER_AREA, COMSIG_EXIT_AREA))
- if(current_area)
- exit_area(source, current_area)
- beauty_counter -= source
- var/atom/movable/movable_source = source
- if(istype(movable_source))
- movable_source.lose_area_sensitivity(BEAUTY_ELEMENT_TRAIT)
- else //lower the 'counter' down by one, update the area, and call parent if it's reached zero.
+
+ var/area/current_area = (!isitem(source) || isturf(source.loc)) ? get_area(source) : null
+ if(!QDELETED(source))//lower the 'counter' down by one, update the area, and call parent if it's reached zero.
beauty_counter[source]--
if(current_area && !current_area.outdoors)
current_area.totalbeauty -= beauty
current_area.update_beauty()
- if(!beauty_counter[source])
- . = ..()
- UnregisterSignal(source, list(COMSIG_ENTER_AREA, COMSIG_EXIT_AREA))
- beauty_counter -= source
- var/atom/movable/movable_source = source
- if(istype(movable_source))
- movable_source.lose_area_sensitivity(BEAUTY_ELEMENT_TRAIT)
+ if(beauty_counter[source])
+ return
+ else if(current_area)
+ exit_area(source, current_area)
+
+ UnregisterSignal(source, list(COMSIG_ENTER_AREA, COMSIG_EXIT_AREA, COMSIG_MOVABLE_MOVED))
+ beauty_counter -= source
+ var/atom/movable/movable_source = source
+ if(istype(movable_source))
+ movable_source.lose_area_sensitivity(BEAUTY_ELEMENT_TRAIT)
diff --git a/code/datums/elements/chewable.dm b/code/datums/elements/chewable.dm
index d520597f4310b..fb1d1e995b2b6 100644
--- a/code/datums/elements/chewable.dm
+++ b/code/datums/elements/chewable.dm
@@ -22,6 +22,10 @@
var/obj/item/target_item = target
if (metabolization_amount)
+ // this prevents microdosing which causes the reagent to enter and then delete itself before it can be processed
+ if(metabolization_amount < REAGENTS_METABOLISM)
+ CRASH("Attatching /datum/element/chewable to [target] requires metabolization_amount to be higher than [REAGENTS_METABOLISM]u. The amount used was [metabolization_amount]u!")
+
src.metabolization_amount = metabolization_amount
src.slots_to_check = slots_to_check || target_item.slot_flags
diff --git a/code/datums/elements/embed.dm b/code/datums/elements/embed.dm
index fbaf638bdd520..90787f8581798 100644
--- a/code/datums/elements/embed.dm
+++ b/code/datums/elements/embed.dm
@@ -98,12 +98,16 @@
* That's awful, and it'll limit us to drop-deletable shrapnels in the worry of stuff like
* arrows and harpoons being embeddable even when not let loose by their weapons.
*/
-/datum/element/embed/proc/check_embed_projectile(obj/projectile/source, atom/movable/firer, atom/hit, angle, hit_zone, blocked)
+/datum/element/embed/proc/check_embed_projectile(obj/projectile/source, atom/movable/firer, atom/hit, angle, hit_zone, blocked, pierce_hit)
SIGNAL_HANDLER
+ if (pierce_hit)
+ return
+
if(!source.can_embed_into(hit) || blocked)
Detach(source)
return // we don't care
+
var/payload_type = source.shrapnel_type
var/obj/item/payload = new payload_type(get_turf(hit))
payload.set_embed(source.get_embed())
diff --git a/code/datums/elements/footstep.dm b/code/datums/elements/footstep.dm
index 698f7896a70b4..77a06dcdc4e96 100644
--- a/code/datums/elements/footstep.dm
+++ b/code/datums/elements/footstep.dm
@@ -1,5 +1,3 @@
-#define SHOULD_DISABLE_FOOTSTEPS(source) ((SSlag_switch.measures[DISABLE_FOOTSTEPS] && !(HAS_TRAIT(source, TRAIT_BYPASS_MEASURES))) || HAS_TRAIT(source, TRAIT_SILENT_FOOTSTEPS))
-
///Footstep element. Plays footsteps at parents location when it is appropriate.
/datum/element/footstep
element_flags = ELEMENT_DETACH_ON_HOST_DESTROY|ELEMENT_BESPOKE
@@ -231,5 +229,3 @@
return
playsound(source_loc, footstep_sounds, 50, falloff_distance = 1, vary = sound_vary)
-
-#undef SHOULD_DISABLE_FOOTSTEPS
diff --git a/code/datums/elements/immerse.dm b/code/datums/elements/immerse.dm
index d50ae906c0a55..4c57c40a79113 100644
--- a/code/datums/elements/immerse.dm
+++ b/code/datums/elements/immerse.dm
@@ -1,3 +1,10 @@
+/// A list of movables that shouldn't be affected by the element, either because it'd look bad or barely perceptible
+GLOBAL_LIST_INIT(immerse_ignored_movable, typecacheof(list(
+ /obj/effect,
+ /mob/dead,
+ /obj/projectile,
+)))
+
/**
* A visual element that makes movables entering the attached turfs look immersed into that turf.
*
@@ -9,11 +16,6 @@
///An association list of turfs that have this element attached and their affected contents.
var/list/attached_turfs_and_movables = list()
- /**
- * A list of movables that shouldn't be affected by the element, either because it'd look bad
- * or barely perceptible.
- */
- var/static/list/movables_to_ignore
///A list of icons generated from a target and a mask, later used as appearances for the overlays.
var/static/list/generated_immerse_icons = list()
///A list of instances of /atom/movable/immerse_overlay then used as visual overlays for the immersed movables.
@@ -32,16 +34,6 @@
if(!isturf(target) || !icon || !icon_state || !mask_icon)
return ELEMENT_INCOMPATIBLE
- if(isnull(movables_to_ignore))
- movables_to_ignore = typecacheof(list(
- /obj/effect,
- /mob/dead,
- /obj/projectile,
- ))
-
- movables_to_ignore += GLOB.WALLITEMS_INTERIOR
- movables_to_ignore += GLOB.WALLITEMS_EXTERIOR
-
src.icon = icon
src.icon_state = icon_state
src.color = color
@@ -109,11 +101,15 @@
SIGNAL_HANDLER
if(QDELETED(movable))
return
- if(HAS_TRAIT(movable, TRAIT_IMMERSED))
+ if(HAS_TRAIT(movable, TRAIT_IMMERSED) || HAS_TRAIT(movable, TRAIT_WALLMOUNTED))
+ return
+ if(!ISINRANGE(movable.plane, MUTATE_PLANE(FLOOR_PLANE, source), MUTATE_PLANE(GAME_PLANE, source)))
return
- if(movable.layer >= ABOVE_ALL_MOB_LAYER || !ISINRANGE(movable.plane, MUTATE_PLANE(FLOOR_PLANE, source), MUTATE_PLANE(GAME_PLANE, source)))
+ var/layer_to_check = IS_TOPDOWN_PLANE(source.plane) ? TOPDOWN_ABOVE_WATER_LAYER : ABOVE_ALL_MOB_LAYER
+ //First, floor plane objects use TOPDOWN_LAYER, second this check shouldn't apply to them anyway.
+ if(movable.layer >= layer_to_check)
return
- if(is_type_in_typecache(movable, movables_to_ignore))
+ if(is_type_in_typecache(movable, GLOB.immerse_ignored_movable))
return
var/atom/movable/buckled
@@ -145,7 +141,9 @@
var/width = icon_dimensions["width"] || ICON_SIZE_X
var/height = icon_dimensions["height"] || ICON_SIZE_Y
- var/is_below_water = movable.layer < WATER_LEVEL_LAYER ? "underwater-" : ""
+ ///This determines if the overlay should cover the entire surface of the object or not
+ var/layer_to_check = IS_TOPDOWN_PLANE(movable.plane) ? TOPDOWN_WATER_LEVEL_LAYER : WATER_LEVEL_LAYER
+ var/is_below_water = (movable.layer < layer_to_check) ? "underwater-" : ""
var/atom/movable/immerse_overlay/vis_overlay = generated_visual_overlays["[is_below_water][width]x[height]"]
diff --git a/code/datums/elements/lazy_fishing_spot.dm b/code/datums/elements/lazy_fishing_spot.dm
deleted file mode 100644
index 67edcea2e88ed..0000000000000
--- a/code/datums/elements/lazy_fishing_spot.dm
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Lazy fishing spot element so fisheable turfs do not have a component each since
- * they're usually pretty common on their respective maps (lava/water/etc)
- */
-/datum/element/lazy_fishing_spot
- element_flags = ELEMENT_BESPOKE | ELEMENT_DETACH_ON_HOST_DESTROY // Detach for turfs
- argument_hash_start_idx = 2
- var/configuration
-
-/datum/element/lazy_fishing_spot/Attach(datum/target, configuration)
- . = ..()
- if(!isatom(target))
- return ELEMENT_INCOMPATIBLE
- if(!ispath(configuration, /datum/fish_source) || configuration == /datum/fish_source)
- CRASH("Lazy fishing spot has incorrect configuration passed in: [configuration].")
- src.configuration = configuration
- ADD_TRAIT(target, TRAIT_FISHING_SPOT, REF(src))
- RegisterSignal(target, COMSIG_PRE_FISHING, PROC_REF(create_fishing_spot))
- RegisterSignal(target, COMSIG_NPC_FISHING, PROC_REF(return_glob_fishing_spot))
- RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examined))
- RegisterSignal(target, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examined_more))
- RegisterSignal(target, COMSIG_ATOM_EX_ACT, PROC_REF(explosive_fishing))
- RegisterSignal(target, COMSIG_FISH_RELEASED_INTO, PROC_REF(fish_released))
- RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(link_to_fish_porter))
-
-/datum/element/lazy_fishing_spot/Detach(datum/target)
- UnregisterSignal(target, list(
- COMSIG_FISH_RELEASED_INTO,
- COMSIG_PRE_FISHING,
- COMSIG_NPC_FISHING,
- COMSIG_ATOM_EXAMINE,
- COMSIG_ATOM_EXAMINE_MORE,
- COMSIG_ATOM_EX_ACT,
- COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL),
- ))
- REMOVE_TRAIT(target, TRAIT_FISHING_SPOT, REF(src))
- return ..()
-
-/datum/element/lazy_fishing_spot/proc/create_fishing_spot(datum/source)
- SIGNAL_HANDLER
-
- source.AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[configuration])
- Detach(source)
-
-///If the fish source has fishes that are shown in the
-/datum/element/lazy_fishing_spot/proc/on_examined(datum/source, mob/user, list/examine_text)
- SIGNAL_HANDLER
- if(!HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT))
- return
-
- var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration]
-
- if(!fish_source.has_known_fishes())
- return
-
- examine_text += span_tinynoticeital("This is a fishing spot. You can look again to list its fishes...")
-
-/datum/element/lazy_fishing_spot/proc/on_examined_more(datum/source, mob/user, list/examine_text)
- SIGNAL_HANDLER
- if(!HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT))
- return
-
- var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration]
- fish_source.get_catchable_fish_names(user, source, examine_text)
-
-/datum/element/lazy_fishing_spot/proc/explosive_fishing(atom/location, severity)
- SIGNAL_HANDLER
- var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration]
- fish_source.spawn_reward_from_explosion(location, severity)
-
-/datum/element/lazy_fishing_spot/proc/return_glob_fishing_spot(datum/source, list/fish_spot_container)
- fish_spot_container[NPC_FISHING_SPOT] = GLOB.preset_fish_sources[configuration]
-
-/datum/element/lazy_fishing_spot/proc/link_to_fish_porter(atom/source, mob/user, obj/item/multitool/tool)
- SIGNAL_HANDLER
- if(!istype(tool.buffer, /obj/machinery/fishing_portal_generator))
- return
- var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration]
- var/obj/machinery/fishing_portal_generator/portal = tool.buffer
- return portal.link_fishing_spot(fish_source, source, user)
-
-/datum/element/lazy_fishing_spot/proc/fish_released(datum/source, obj/item/fish/fish, mob/living/releaser)
- SIGNAL_HANDLER
- var/datum/fish_source/fish_source = GLOB.preset_fish_sources[configuration]
- fish_source.readd_fish(fish, releaser)
diff --git a/code/datums/elements/projectile_drop.dm b/code/datums/elements/projectile_drop.dm
index 36e189d6c3aeb..0b1992ef56097 100644
--- a/code/datums/elements/projectile_drop.dm
+++ b/code/datums/elements/projectile_drop.dm
@@ -28,8 +28,10 @@
//Just to be safe, knowing it won't be spawned multiple times.
Detach(source)
-/datum/element/projectile_drop/proc/spawn_drop_if_not_embeddable(obj/projectile/source, atom/movable/firer, atom/hit, angle, hit_zone)
+/datum/element/projectile_drop/proc/spawn_drop_if_not_embeddable(obj/projectile/source, atom/movable/firer, atom/hit, angle, hit_zone, blocked, pierce_hit)
SIGNAL_HANDLER
+ if (pierce_hit)
+ return
if(source.can_embed_into(hit))
Detach(source)
return
diff --git a/code/datums/elements/selfknockback.dm b/code/datums/elements/selfknockback.dm
index d330b30debc1a..416240b7cfd33 100644
--- a/code/datums/elements/selfknockback.dm
+++ b/code/datums/elements/selfknockback.dm
@@ -47,15 +47,15 @@ clamping the Knockback_Force value below. */
usertarget.throw_at(move_target, knockback_force, knockback_speed)
usertarget.visible_message(span_warning("[usertarget] gets thrown back by the force of \the [I] impacting \the [attacktarget]!"), span_warning("The force of \the [I] impacting \the [attacktarget] sends you flying!"))
-/datum/element/selfknockback/proc/Projectile_SelfKnockback(obj/projectile/P)
+/datum/element/selfknockback/proc/Projectile_SelfKnockback(obj/projectile/proj)
SIGNAL_HANDLER
- if(!P.firer)
+ if(!proj.firer)
return
- var/knockback_force = Get_Knockback_Force(clamp(CEILING((P.damage / 10), 1), 1, 5))
+ var/knockback_force = Get_Knockback_Force(clamp(CEILING((proj.damage / 10), 1), 1, 5))
var/knockback_speed = Get_Knockback_Speed(clamp(knockback_force, 1, 5))
- var/atom/movable/knockback_target = P.firer
- var/move_target = get_edge_target_turf(knockback_target, angle2dir(P.original_angle+180))
+ var/atom/movable/knockback_target = proj.firer
+ var/move_target = get_edge_target_turf(knockback_target, angle2dir(proj.original_angle+180))
knockback_target.throw_at(move_target, knockback_force, knockback_speed)
diff --git a/code/datums/elements/watery_tile.dm b/code/datums/elements/watery_tile.dm
index 36e893fe0fc3c..878253a89692f 100644
--- a/code/datums/elements/watery_tile.dm
+++ b/code/datums/elements/watery_tile.dm
@@ -54,6 +54,6 @@
duration = STATUS_EFFECT_PERMANENT
status_type = STATUS_EFFECT_UNIQUE
-/datum/status_effect/washing_regen/tick(seconds_between_ticks)
+/datum/status_effect/watery_tile_wetness/tick(seconds_between_ticks)
. = ..()
owner.adjust_wet_stacks(1)
diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index 84889ad6bd931..ceaa53e045523 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -1,15 +1,16 @@
-/mob/eye/ai_eye/remote/holo/setLoc(turf/destination, force_update = FALSE)
+/mob/eye/camera/remote/holo/setLoc(turf/destination, force_update = FALSE)
// If we're moving outside the space of our projector, then just... don't
- var/obj/machinery/holopad/H = origin
- if(!H?.move_hologram(eye_user, destination))
+ var/obj/machinery/holopad/H = origin_ref?.resolve()
+ if(!H?.move_hologram(user_ref?.resolve(), destination))
sprint = initial(sprint) // Reset sprint so it doesn't balloon in our calling proc
return
return ..()
/obj/machinery/holopad/remove_eye_control(mob/living/user)
- if(user.client)
- user.reset_perspective(null)
- user.remote_control = null
+ var/mob/eye/camera/remote/eye = user.remote_control
+ if(!istype(eye))
+ CRASH("Attempted to remove eye control from non-camera eye. Something has gone horribly wrong.")
+ eye.assign_user(null)
//this datum manages its own references
@@ -24,7 +25,7 @@
var/list/dialed_holopads
///user's eye, once connected
- var/mob/eye/ai_eye/remote/holo/eye
+ var/mob/eye/camera/remote/holo/eye
///user's hologram, once connected
var/obj/effect/overlay/holo_pad_hologram/hologram
///hangup action
@@ -155,15 +156,8 @@
hologram = answering_holopad.activate_holo(user)
hologram.HC = src
- //eyeobj code is horrid, this is the best copypasta I could make
- eye = new
- eye.origin = answering_holopad
- eye.eye_initialized = TRUE
- eye.eye_user = user
- eye.name = "Camera Eye ([user.name])"
- user.remote_control = eye
- user.reset_perspective(eye)
- eye.setLoc(answering_holopad.loc)
+ eye = new(get_turf(answering_holopad), answering_holopad)
+ eye.assign_user(user)
hangup = new(eye, src)
hangup.Grant(user)
diff --git a/code/datums/looping_sounds/changeling_absorb.dm b/code/datums/looping_sounds/changeling_absorb.dm
new file mode 100644
index 0000000000000..418c2a8dacf54
--- /dev/null
+++ b/code/datums/looping_sounds/changeling_absorb.dm
@@ -0,0 +1,14 @@
+/datum/looping_sound/changeling_absorb
+ mid_sounds = list(
+ 'sound/effects/changeling_absorb/changeling_absorb1.ogg' = 1,
+ 'sound/effects/changeling_absorb/changeling_absorb2.ogg' = 1,
+ 'sound/effects/changeling_absorb/changeling_absorb3.ogg' = 1,
+ 'sound/effects/changeling_absorb/changeling_absorb4.ogg' = 1,
+ 'sound/effects/changeling_absorb/changeling_absorb5.ogg' = 1,
+ 'sound/effects/changeling_absorb/changeling_absorb6.ogg' = 1,
+ 'sound/effects/changeling_absorb/changeling_absorb7.ogg' = 1,
+ )
+ each_once = TRUE
+ mid_length = 3 SECONDS
+ volume = 80
+ ignore_walls = FALSE
diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm
index d3627167cb507..d32c35a6239c5 100644
--- a/code/datums/mutations/sight.dm
+++ b/code/datums/mutations/sight.dm
@@ -171,7 +171,7 @@
var/obj/projectile/beam/laser/laser_eyes/LE = new(source.loc)
LE.firer = source
LE.def_zone = ran_zone(source.zone_selected)
- LE.preparePixelProjectile(target, source, modifiers)
+ LE.aim_projectile(target, source, modifiers)
INVOKE_ASYNC(LE, TYPE_PROC_REF(/obj/projectile, fire))
playsound(source, 'sound/items/weapons/taser2.ogg', 75, TRUE)
diff --git a/code/datums/position_point_vector.dm b/code/datums/position_point_vector.dm
index b8b697c053bca..02281e2437a08 100644
--- a/code/datums/position_point_vector.dm
+++ b/code/datums/position_point_vector.dm
@@ -1,15 +1,11 @@
/proc/point_midpoint_points(datum/point/a, datum/point/b) //Obviously will not support multiZ calculations! Same for the two below.
- var/datum/point/P = new
- P.x = a.x + (b.x - a.x) * 0.5
- P.y = a.y + (b.y - a.y) * 0.5
- P.z = a.z
- return P
+ return new /datum/point(_z = a.z, _pixel_x = (a.return_px() + b.return_px()) * 0.5, _pixel_y = (a.return_py() + b.return_py()) * 0.5)
/proc/pixel_length_between_points(datum/point/a, datum/point/b)
- return sqrt(((b.x - a.x) ** 2) + ((b.y - a.y) ** 2))
+ return sqrt(((b.return_px() - a.return_px()) ** 2) + ((b.return_py() - a.return_py()) ** 2))
/proc/angle_between_points(datum/point/a, datum/point/b)
- return ATAN2((b.y - a.y), (b.x - a.x))
+ return ATAN2(b.return_py() - a.return_py(), b.return_px() - a.return_px())
/// For positions with map x/y/z and pixel x/y so you don't have to return lists. Could use addition/subtraction in the future I guess.
/datum/position
@@ -29,8 +25,8 @@
_x = T.x
_y = T.y
_z = T.z
- _pixel_x = P.return_px()
- _pixel_y = P.return_py()
+ _pixel_x = P.pixel_x
+ _pixel_y = P.pixel_y
else if(isatom(_x))
var/atom/A = _x
_x = A.x
@@ -61,6 +57,8 @@
var/x = 0
var/y = 0
var/z = 0
+ var/pixel_x = 0
+ var/pixel_y = 0
/datum/point/proc/valid()
return x && y && z
@@ -89,143 +87,88 @@
_pixel_y = A.pixel_y
initialize_location(_x, _y, _z, _pixel_x, _pixel_y)
-/datum/point/proc/initialize_location(tile_x, tile_y, tile_z, p_x = 0, p_y = 0)
+/datum/point/proc/initialize_location(tile_x, tile_y, tile_z, p_x, p_y)
if(!isnull(tile_x))
- x = ((tile_x - 1) * ICON_SIZE_X) + ICON_SIZE_X * 0.5 + p_x + 1
+ x = tile_x
if(!isnull(tile_y))
- y = ((tile_y - 1) * ICON_SIZE_Y) + ICON_SIZE_Y * 0.5 + p_y + 1
+ y = tile_y
if(!isnull(tile_z))
z = tile_z
+ if(!isnull(p_x))
+ var/x_offset = SIGNED_FLOOR_DIVISION(p_x, ICON_SIZE_X)
+ x += x_offset
+ pixel_x = p_x - x_offset * ICON_SIZE_X
+ if(!isnull(p_y))
+ var/y_offset = SIGNED_FLOOR_DIVISION(p_y, ICON_SIZE_Y)
+ y += y_offset
+ pixel_y = p_y - y_offset * ICON_SIZE_Y
+
+/datum/point/proc/increment(p_x, p_y)
+ var/x_offset = SIGNED_FLOOR_DIVISION(p_x, ICON_SIZE_X)
+ x += x_offset
+ pixel_x += p_x - x_offset * ICON_SIZE_X
+ var/y_offset = SIGNED_FLOOR_DIVISION(p_y, ICON_SIZE_Y)
+ y += y_offset
+ pixel_y += p_y - y_offset * ICON_SIZE_Y
/datum/point/proc/debug_out()
var/turf/T = return_turf()
- return "[text_ref(src)] aX [x] aY [y] aZ [z] pX [return_px()] pY [return_py()] mX [T.x] mY [T.y] mZ [T.z]"
+ return "[text_ref(src)] aX [x] aY [y] aZ [z] pX [pixel_x] pY [pixel_y] mX [T.x] mY [T.y] mZ [T.z]"
/datum/point/proc/move_atom_to_src(atom/movable/AM)
AM.forceMove(return_turf())
- AM.pixel_x = return_px()
- AM.pixel_y = return_py()
+ AM.pixel_x = pixel_x
+ AM.pixel_y = pixel_y
/datum/point/proc/return_turf()
- return locate(CEILING(x / ICON_SIZE_X, 1), CEILING(y / ICON_SIZE_Y, 1), z)
+ return locate(x + SIGNED_FLOOR_DIVISION(pixel_x, ICON_SIZE_X), y + SIGNED_FLOOR_DIVISION(pixel_y, ICON_SIZE_Y), z)
/datum/point/proc/return_coordinates() //[turf_x, turf_y, z]
- return list(CEILING(x / ICON_SIZE_X, 1), CEILING(y / ICON_SIZE_Y, 1), z)
+ return list(x + SIGNED_FLOOR_DIVISION(pixel_x, ICON_SIZE_X), y + SIGNED_FLOOR_DIVISION(pixel_y, ICON_SIZE_Y), z)
/datum/point/proc/return_position()
return new /datum/position(src)
/datum/point/proc/return_px()
- return MODULUS(x, ICON_SIZE_X) - (ICON_SIZE_X/2) - 1
+ return x * ICON_SIZE_X + pixel_x
/datum/point/proc/return_py()
- return MODULUS(y, ICON_SIZE_Y) - (ICON_SIZE_Y/2) - 1
+ return y * ICON_SIZE_Y + pixel_y
-/datum/point/vector
- /// Pixels per iteration
- var/speed = ICON_SIZE_ALL
- var/iteration = 0
+/datum/vector
+ var/magnitude = 1
var/angle = 0
- /// Calculated x movement amounts to prevent having to do trig every step.
- var/mpx = 0
- /// Calculated y movement amounts to prevent having to do trig every step.
- var/mpy = 0
- var/starting_x = 0 //just like before, pixels from EDGE of map! This is set in initialize_location().
- var/starting_y = 0
- var/starting_z = 0
-
-/datum/point/vector/New(_x, _y, _z, _pixel_x = 0, _pixel_y = 0, _angle, _speed, initial_increment = 0)
- ..()
- initialize_trajectory(_speed, _angle)
- if(initial_increment)
- increment(initial_increment)
-
-/datum/point/vector/initialize_location(tile_x, tile_y, tile_z, p_x = 0, p_y = 0)
- . = ..()
- starting_x = x
- starting_y = y
- starting_z = z
+ // Calculated coordinate amounts to prevent having to do trig every step.
+ var/pixel_x = 0
+ var/pixel_y = 0
+ var/total_x = 0
+ var/total_y = 0
-/// Same effect as initiliaze_location, but without setting the starting_x/y/z
-/datum/point/vector/proc/set_location(tile_x, tile_y, tile_z, p_x = 0, p_y = 0)
- if(!isnull(tile_x))
- x = ((tile_x - 1) * ICON_SIZE_X) + ICON_SIZE_X * 0.5 + p_x + 1
- if(!isnull(tile_y))
- y = ((tile_y - 1) * ICON_SIZE_Y) + ICON_SIZE_Y * 0.5 + p_y + 1
- if(!isnull(tile_z))
- z = tile_z
+/datum/vector/New(new_magnitude, new_angle)
+ . = ..()
+ initialize_trajectory(new_magnitude, new_angle)
-/datum/point/vector/copy_to(datum/point/vector/v = new)
- ..(v)
- v.speed = speed
- v.iteration = iteration
- v.angle = angle
- v.mpx = mpx
- v.mpy = mpy
- v.starting_x = starting_x
- v.starting_y = starting_y
- v.starting_z = starting_z
- return v
-
-/datum/point/vector/proc/initialize_trajectory(pixel_speed, new_angle)
- if(!isnull(pixel_speed))
- speed = pixel_speed
+/datum/vector/proc/initialize_trajectory(new_magnitude, new_angle)
+ if(!isnull(new_magnitude))
+ magnitude = new_magnitude
set_angle(new_angle)
/// Calculations use "byond angle" where north is 0 instead of 90, and south is 180 instead of 270.
-/datum/point/vector/proc/set_angle(new_angle)
+/datum/vector/proc/set_angle(new_angle)
if(isnull(angle))
return
angle = new_angle
update_offsets()
-/datum/point/vector/proc/update_offsets()
- mpx = sin(angle) * speed
- mpy = cos(angle) * speed
-
-/datum/point/vector/proc/set_speed(new_speed)
- if(isnull(new_speed) || speed == new_speed)
- return
- speed = new_speed
- update_offsets()
+/datum/vector/proc/update_offsets()
+ pixel_x = sin(angle)
+ pixel_y = cos(angle)
+ total_x = pixel_x * magnitude
+ total_y = pixel_y * magnitude
-/datum/point/vector/proc/increment(multiplier = 1)
- iteration++
- x += mpx * (multiplier)
- y += mpy * (multiplier)
-
-/datum/point/vector/proc/return_vector_after_increments(amount = 7, multiplier = 1, force_simulate = FALSE)
- var/datum/point/vector/v = copy_to()
- if(force_simulate)
- for(var/i in 1 to amount)
- v.increment(multiplier)
- else
- v.increment(multiplier * amount)
- return v
-
-/datum/point/vector/proc/on_z_change()
- return
-
-/datum/point/vector/processed //pixel_speed is per decisecond.
- var/last_process = 0
- var/last_move = 0
- var/paused = FALSE
-
-/datum/point/vector/processed/Destroy()
- STOP_PROCESSING(SSprojectiles, src)
- return ..()
-
-/datum/point/vector/processed/proc/start()
- last_process = world.time
- last_move = world.time
- START_PROCESSING(SSprojectiles, src)
-
-/datum/point/vector/processed/process()
- if(paused)
- last_move += world.time - last_process
- last_process = world.time
+/datum/vector/proc/set_speed(new_magnitude)
+ if(isnull(new_magnitude) || magnitude == new_magnitude)
return
- var/needed_time = world.time - last_move
- last_process = world.time
- last_move = world.time
- increment(needed_time / SSprojectiles.wait)
+ magnitude = new_magnitude
+ total_x = pixel_x * magnitude
+ total_y = pixel_y * magnitude
diff --git a/code/datums/proximity_monitor/fields/gravity.dm b/code/datums/proximity_monitor/fields/gravity.dm
index 745072d69e10a..51a73978886e7 100644
--- a/code/datums/proximity_monitor/fields/gravity.dm
+++ b/code/datums/proximity_monitor/fields/gravity.dm
@@ -80,6 +80,7 @@
alpha = 200
/// our emissive appearance
var/mutable_appearance/emissive
+ var/particles/particle_type
/obj/gravity_fluff_field/Initialize(mapload, strength)
. = ..()
@@ -89,20 +90,22 @@
QUEUE_SMOOTH_NEIGHBORS(src)
switch(strength)
if(2 to INFINITY)
- particles = new /particles/grav_field_down/strong()
+ particle_type = /particles/grav_field_down/strong
if(1 to 2)
- particles = new /particles/grav_field_down()
+ particle_type = /particles/grav_field_down
if(0 to 1)
- particles = new /particles/grav_field_float()
+ particle_type = /particles/grav_field_float
if(-INFINITY to -1)
- particles = new /particles/grav_field_up()
- color = particles.color
+ particle_type = /particles/grav_field_up
+ if (particle_type)
+ add_shared_particles(/particles/grav_field_down/strong)
+ color = particle_type::color
RegisterSignal(src, COMSIG_ATOM_SMOOTHED_ICON, PROC_REF(smoothed))
/obj/gravity_fluff_field/Destroy(force)
- . = ..()
- QDEL_NULL(particles)
+ remove_shared_particles(particle_type)
emissive = null
+ return ..()
/obj/gravity_fluff_field/proc/smoothed(datum/source)
SIGNAL_HANDLER
diff --git a/code/datums/proximity_monitor/fields/projectile_dampener.dm b/code/datums/proximity_monitor/fields/projectile_dampener.dm
deleted file mode 100644
index fe23fe0be33e5..0000000000000
--- a/code/datums/proximity_monitor/fields/projectile_dampener.dm
+++ /dev/null
@@ -1,117 +0,0 @@
-
-//Projectile dampening field that slows projectiles and lowers their damage for an energy cost deducted every 1/5 second.
-//Only use square radius for this!
-/datum/proximity_monitor/advanced/projectile_dampener
- var/static/image/edgeturf_south = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_south")
- var/static/image/edgeturf_north = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_north")
- var/static/image/edgeturf_west = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_west")
- var/static/image/edgeturf_east = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_east")
- var/static/image/northwest_corner = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_northwest")
- var/static/image/southwest_corner = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_southwest")
- var/static/image/northeast_corner = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_northeast")
- var/static/image/southeast_corner = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_southeast")
- var/static/image/generic_edge = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_generic")
- var/list/obj/projectile/tracked = list()
- var/list/obj/projectile/staging = list()
- // lazylist that keeps track of the overlays added to the edge of the field
- var/list/edgeturf_effects
-
-/datum/proximity_monitor/advanced/projectile_dampener/New(atom/_host, range, _ignore_if_not_on_turf = TRUE, atom/projector)
- ..()
- RegisterSignal(projector, COMSIG_QDELETING, PROC_REF(on_projector_del))
- recalculate_field(full_recalc = TRUE)
- START_PROCESSING(SSfastprocess, src)
-
-/datum/proximity_monitor/advanced/projectile_dampener/Destroy()
- STOP_PROCESSING(SSfastprocess, src)
- for(var/obj/projectile/projectile in tracked)
- release_projectile(projectile)
- return ..()
-
-/datum/proximity_monitor/advanced/projectile_dampener/recalculate_field(full_recalc)
- full_recalc = TRUE // We always perform a full recalc because we need to update ALL the sprites
- return ..()
-
-/datum/proximity_monitor/advanced/projectile_dampener/process()
- var/list/ranged = list()
- for(var/obj/projectile/projectile in range(current_range, get_turf(host)))
- ranged += projectile
- for(var/obj/projectile/projectile in tracked)
- if(!(projectile in ranged) || !projectile.loc)
- release_projectile(projectile)
-
-/datum/proximity_monitor/advanced/projectile_dampener/setup_edge_turf(turf/target)
- . = ..()
- var/image/overlay = get_edgeturf_overlay(get_edgeturf_direction(target))
- var/obj/effect/abstract/effect = new(target) // Makes the field visible to players.
- effect.icon = overlay.icon
- effect.icon_state = overlay.icon_state
- effect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- effect.layer = ABOVE_ALL_MOB_LAYER
- SET_PLANE(effect, ABOVE_GAME_PLANE, target)
- LAZYSET(edgeturf_effects, target, effect)
-
-/datum/proximity_monitor/advanced/projectile_dampener/on_z_change(datum/source)
- recalculate_field(full_recalc = TRUE)
-
-/datum/proximity_monitor/advanced/projectile_dampener/cleanup_edge_turf(turf/target)
- . = ..()
- var/obj/effect/abstract/effect = LAZYACCESS(edgeturf_effects, target)
- LAZYREMOVE(edgeturf_effects, target)
- if(effect)
- qdel(effect)
-
-/datum/proximity_monitor/advanced/projectile_dampener/proc/get_edgeturf_overlay(direction)
- switch(direction)
- if(NORTH)
- return edgeturf_north
- if(SOUTH)
- return edgeturf_south
- if(EAST)
- return edgeturf_east
- if(WEST)
- return edgeturf_west
- if(NORTHEAST)
- return northeast_corner
- if(NORTHWEST)
- return northwest_corner
- if(SOUTHEAST)
- return southeast_corner
- if(SOUTHWEST)
- return southwest_corner
- else
- return generic_edge
-
-/datum/proximity_monitor/advanced/projectile_dampener/proc/capture_projectile(obj/projectile/projectile)
- if(projectile in tracked)
- return
- SEND_SIGNAL(src, COMSIG_DAMPENER_CAPTURE, projectile)
- tracked += projectile
-
-/datum/proximity_monitor/advanced/projectile_dampener/proc/release_projectile(obj/projectile/projectile)
- SEND_SIGNAL(src, COMSIG_DAMPENER_RELEASE, projectile)
- tracked -= projectile
-
-/datum/proximity_monitor/advanced/projectile_dampener/proc/on_projector_del(datum/source)
- SIGNAL_HANDLER
- qdel(src)
-
-/datum/proximity_monitor/advanced/projectile_dampener/field_edge_uncrossed(atom/movable/movable, turf/old_location, turf/new_location)
- if(isprojectile(movable) && get_dist(movable, host) > current_range)
- if(movable in tracked)
- release_projectile(movable)
-
-/datum/proximity_monitor/advanced/projectile_dampener/field_edge_crossed(atom/movable/movable, turf/location, turf/old_location)
- if(isprojectile(movable))
- capture_projectile(movable)
-
-/datum/proximity_monitor/advanced/projectile_dampener/peaceborg/process(seconds_per_tick)
- for(var/mob/living/silicon/robot/borg in range(current_range, get_turf(host)))
- if(!borg.has_buckled_mobs())
- continue
- for(var/mob/living/buckled_mob in borg.buckled_mobs)
- buckled_mob.visible_message(span_warning("[buckled_mob] is knocked off of [borg] by the charge in [borg]'s chassis induced by the hyperkinetic dampener field!")) //I know it's bad.
- buckled_mob.Paralyze(1 SECONDS)
- borg.unbuckle_mob(buckled_mob)
- do_sparks(5, 0, buckled_mob)
- ..()
diff --git a/code/datums/proximity_monitor/fields/projectile_dampener/projectile_dampener.dm b/code/datums/proximity_monitor/fields/projectile_dampener/projectile_dampener.dm
new file mode 100644
index 0000000000000..3185872efad4a
--- /dev/null
+++ b/code/datums/proximity_monitor/fields/projectile_dampener/projectile_dampener.dm
@@ -0,0 +1,238 @@
+#define CHANGING_OFFSET "changing_offset"
+#define OVERLAY_DATA "overlay_data"
+#define STARTING_POSITION "starting_position"
+#define ANIMATE_DAMPENER_TIME 1.5 SECONDS
+
+//Projectile dampening field that slows projectiles and lowers their damage for an energy cost deducted every 1/5 second.
+//Only use square radius for this!
+/datum/proximity_monitor/advanced/projectile_dampener
+ edge_is_a_field = TRUE
+ var/static/list/effect_direction_images = list(
+ "[SOUTH]" = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_south"),
+ "[NORTH]" = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_north"),
+ "[WEST]" = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_west"),
+ "[EAST]" = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_east"),
+ "[NORTHWEST]" = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_northwest"),
+ "[SOUTHWEST]" = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_southwest"),
+ "[NORTHEAST]" = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_northeast"),
+ "[SOUTHEAST]" = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_southeast"),
+ )
+ var/static/image/generic_edge = image('icons/effects/fields.dmi', icon_state = "projectile_dampen_generic")
+ ///overlay we apply to caught bullets
+ var/static/image/new_bullet_overlay= image('icons/effects/fields.dmi', "projectile_dampen_effect")
+ ///list of all the visual effects we keep track of
+ var/list/edgeturf_effects = list()
+ ///atom that contains all the fields in its vis_contents
+ var/atom/movable/field_effect_holder/my_movable
+ /// datum that holds the effects we apply on caught bullets
+ var/datum/dampener_projectile_effects/bullet_effects
+
+/datum/proximity_monitor/advanced/projectile_dampener/New(atom/_host, range, _ignore_if_not_on_turf = TRUE, atom/projector, datum/dampener_projectile_effects/effects_typepath)
+ ..()
+ RegisterSignal(projector, COMSIG_QDELETING, PROC_REF(on_projector_del))
+ var/atom/movable/movable_host = _host
+ my_movable = new(get_turf(_host))
+ my_movable.transform = my_movable.transform.Scale(current_range, current_range)
+ my_movable.set_glide_size(movable_host.glide_size)
+ bullet_effects = effects_typepath ? new effects_typepath() : new
+ draw_effect()
+
+/datum/proximity_monitor/advanced/projectile_dampener/on_moved(atom/movable/source, atom/old_loc)
+ . = ..()
+ my_movable.Move(source.loc, get_dir(my_movable.loc, source.loc), source.glide_size)
+
+/datum/proximity_monitor/advanced/projectile_dampener/on_z_change(datum/source)
+ recalculate_field(full_recalc = TRUE)
+
+/datum/proximity_monitor/advanced/projectile_dampener/field_edge_crossed(atom/movable/movable, turf/location, turf/old_location)
+ . = ..()
+ if(!isprojectile(movable))
+ return
+ determine_wobble(location)
+
+/datum/proximity_monitor/advanced/projectile_dampener/field_edge_uncrossed(atom/movable/movable, turf/old_location, turf/new_location)
+ . = ..()
+ if(!isprojectile(movable))
+ return
+ determine_wobble(old_location)
+
+/datum/proximity_monitor/advanced/projectile_dampener/field_turf_crossed(atom/movable/movable, turf/old_location, turf/new_location)
+ if(!isprojectile(movable) || HAS_TRAIT_FROM(movable, TRAIT_GOT_DAMPENED, REF(src)))
+ return
+ catch_bullet_effect(movable)
+
+/datum/proximity_monitor/advanced/projectile_dampener/field_turf_uncrossed(atom/movable/movable, turf/old_location, turf/new_location)
+ if(!isprojectile(movable) || get_dist(new_location, host) <= current_range)
+ return
+ release_bullet_effect(movable)
+
+/datum/proximity_monitor/advanced/projectile_dampener/setup_field_turf(turf/target)
+ for(var/atom/possible_projectile in target)
+ if(isprojectile(possible_projectile))
+ catch_bullet_effect(possible_projectile)
+
+/datum/proximity_monitor/advanced/projectile_dampener/cleanup_field_turf(turf/target)
+ for(var/atom/possible_projectile in target)
+ if(isprojectile(possible_projectile) && HAS_TRAIT_FROM(possible_projectile, TRAIT_GOT_DAMPENED, REF(src)))
+ release_bullet_effect(possible_projectile)
+
+///proc that applies the wobbly effect on point of bullet entry
+/datum/proximity_monitor/advanced/projectile_dampener/proc/determine_wobble(turf/location)
+ var/coord_x = location.x - host.x
+ var/coord_y = location.y - host.y
+ var/obj/effect/overlay/vis/field/my_field = edgeturf_effects["[coord_x],[coord_y]"]
+ my_field?.set_wobbly(0.15 SECONDS)
+
+/datum/proximity_monitor/advanced/projectile_dampener/proc/projectile_overlay_updated(atom/source, list/overlays)
+ SIGNAL_HANDLER
+
+ if(!isnull(new_bullet_overlay) && HAS_TRAIT_FROM(source, TRAIT_GOT_DAMPENED, REF(src)))
+ overlays += new_bullet_overlay
+
+///a bullet has entered our field, apply the dampening effects to it
+/datum/proximity_monitor/advanced/projectile_dampener/proc/catch_bullet_effect(obj/projectile/bullet)
+ ADD_TRAIT(bullet,TRAIT_GOT_DAMPENED, REF(src))
+ RegisterSignal(bullet, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(projectile_overlay_updated))
+ SEND_SIGNAL(src, COMSIG_DAMPENER_CAPTURE, bullet)
+ bullet_effects.apply_effects(bullet)
+ bullet.update_appearance()
+
+///removing the effects after it has exited our field
+/datum/proximity_monitor/advanced/projectile_dampener/proc/release_bullet_effect(obj/projectile/bullet)
+ REMOVE_TRAIT(bullet, TRAIT_GOT_DAMPENED, REF(src))
+ SEND_SIGNAL(src, COMSIG_DAMPENER_RELEASE, bullet)
+ bullet_effects.remove_effects(bullet)
+ bullet.update_appearance()
+ UnregisterSignal(bullet, COMSIG_ATOM_UPDATE_OVERLAYS)
+
+///rendering all the field visuals. first we render the corners, then we connect them
+/datum/proximity_monitor/advanced/projectile_dampener/proc/draw_effect()
+ var/max_pixel_offset = current_range * ICON_SIZE_ALL
+ var/top_right_corner = list(effect_direction_images["[NORTHEAST]"], max_pixel_offset, max_pixel_offset)
+ var/top_left_corner = list(effect_direction_images["[NORTHWEST]"], -max_pixel_offset, max_pixel_offset)
+ var/bottom_left_corner = list(effect_direction_images["[SOUTHWEST]"], -max_pixel_offset, -max_pixel_offset)
+ var/bottom_right_corner = list(effect_direction_images["[SOUTHEAST]"], max_pixel_offset, -max_pixel_offset)
+
+ var/list/corners = list(top_right_corner, top_left_corner, bottom_left_corner, bottom_right_corner)
+ for(var/corner in corners)
+ draw_corner(corner)
+
+ var/list/corners_to_connect = list(
+ list(OVERLAY_DATA = effect_direction_images["[NORTH]"], CHANGING_OFFSET = "x_offset", STARTING_POSITION = max_pixel_offset),
+ list(OVERLAY_DATA = effect_direction_images["[SOUTH]"], CHANGING_OFFSET = "x_offset", STARTING_POSITION = -max_pixel_offset),
+ list(OVERLAY_DATA = effect_direction_images["[WEST]"], CHANGING_OFFSET = "y_offset", STARTING_POSITION = -max_pixel_offset),
+ list(OVERLAY_DATA = effect_direction_images["[EAST]"], CHANGING_OFFSET = "y_offset", STARTING_POSITION = max_pixel_offset),
+ )
+ for(var/direction in corners_to_connect)
+ draw_edge(direction, max_pixel_offset)
+
+///rendering the corners
+/datum/proximity_monitor/advanced/projectile_dampener/proc/draw_corner(list/corner_data)
+ var/obj/effect/overlay/vis/field/corner_effect = new()
+ var/image/image_overlay = corner_data[1]
+ corner_effect.icon = image_overlay.icon
+ corner_effect.icon_state = image_overlay.icon_state
+ corner_effect.alpha = 0
+ corner_effect.pixel_x = corner_data[2]
+ corner_effect.pixel_y = corner_data[3]
+ add_effect_to_host(corner_effect)
+
+///connecting the corners to one another
+/datum/proximity_monitor/advanced/projectile_dampener/proc/draw_edge(list/edge_data, target_offset)
+ var/starting_offset = edge_data[STARTING_POSITION]
+ var/current_offset = (-1 * target_offset) + ICON_SIZE_ALL
+ var/image/overlay = edge_data[OVERLAY_DATA]
+ while(current_offset != target_offset)
+ var/obj/effect/overlay/vis/field/edge_effect = new()
+ edge_effect.alpha = 0
+ edge_effect.icon = overlay.icon
+ edge_effect.icon_state = overlay.icon_state
+
+ if(edge_data[CHANGING_OFFSET] == "x_offset")
+ edge_effect.pixel_y = starting_offset
+ edge_effect.pixel_x = current_offset
+ else
+ edge_effect.pixel_x = starting_offset
+ edge_effect.pixel_y = current_offset
+ add_effect_to_host(edge_effect)
+ current_offset += ICON_SIZE_ALL
+
+///handles adding the visual effect's data
+/datum/proximity_monitor/advanced/projectile_dampener/proc/add_effect_to_host(obj/effect/overlay/vis/field/effect_to_add)
+ my_movable.vis_contents += effect_to_add
+ var/coordinate_x = effect_to_add.pixel_x / ICON_SIZE_ALL
+ var/coordinate_y = effect_to_add.pixel_y / ICON_SIZE_ALL
+ effect_to_add.transform = effect_to_add.transform.Scale(1 / current_range, 1 / current_range)
+ edgeturf_effects["[coordinate_x],[coordinate_y]"] = effect_to_add
+ effect_to_add.set_wobbly(wobble_duration = ANIMATE_DAMPENER_TIME)
+ animate(effect_to_add, alpha = 255, time = ANIMATE_DAMPENER_TIME, flags = ANIMATION_PARALLEL)
+
+/datum/proximity_monitor/advanced/projectile_dampener/proc/on_projector_del(datum/source)
+ SIGNAL_HANDLER
+ qdel(src)
+
+/datum/proximity_monitor/advanced/projectile_dampener/Destroy()
+ for(var/coordinates in edgeturf_effects)
+ var/obj/effect/overlay/vis/field/effect_to_remove = edgeturf_effects[coordinates]
+ edgeturf_effects -= coordinates
+ effect_to_remove.set_wobbly(wobble_duration = ANIMATE_DAMPENER_TIME)
+ animate(effect_to_remove, alpha = 0, time = ANIMATE_DAMPENER_TIME, flags = ANIMATION_PARALLEL)
+ QDEL_IN(my_movable, ANIMATE_DAMPENER_TIME)
+ my_movable = null
+ bullet_effects = null
+ return ..()
+
+/datum/proximity_monitor/advanced/projectile_dampener/peaceborg
+
+/datum/proximity_monitor/advanced/projectile_dampener/peaceborg/field_turf_crossed(atom/movable/movable, turf/old_location, turf/new_location)
+ . = ..()
+ if(!iscyborg(movable) || !HAS_TRAIT_FROM(movable, TRAIT_GOT_DAMPENED, REF(src)))
+ ADD_TRAIT(movable, TRAIT_GOT_DAMPENED, REF(src))
+
+/datum/proximity_monitor/advanced/projectile_dampener/peaceborg/field_turf_uncrossed(atom/movable/movable, turf/old_location, turf/new_location)
+ if(!iscyborg(movable) || get_dist(new_location, host) <= current_range)
+ return
+ REMOVE_TRAIT(movable, TRAIT_GOT_DAMPENED, REF(src))
+
+/datum/proximity_monitor/advanced/projectile_dampener/peaceborg/setup_field_turf(turf/target)
+ for(var/atom/interesting_atom as anything in target)
+ if(iscyborg(interesting_atom))
+ ADD_TRAIT(interesting_atom, TRAIT_GOT_DAMPENED, REF(src))
+ if(isprojectile(interesting_atom))
+ catch_bullet_effect(interesting_atom)
+
+/datum/proximity_monitor/advanced/projectile_dampener/peaceborg/cleanup_field_turf(turf/target)
+ for(var/atom/interesting_atom as anything in target)
+ if(iscyborg(interesting_atom))
+ REMOVE_TRAIT(interesting_atom, TRAIT_GOT_DAMPENED, REF(src))
+ if(isprojectile(interesting_atom))
+ release_bullet_effect(interesting_atom)
+
+/obj/effect/overlay/vis/field
+ appearance_flags = PIXEL_SCALE|LONG_GLIDE
+ vis_flags = parent_type::vis_flags | VIS_INHERIT_PLANE
+ ///are we currently WOBBLING
+ var/wobbling_effect = FALSE
+
+/obj/effect/overlay/vis/field/proc/set_wobbly(wobble_duration)
+ if(wobbling_effect)
+ return
+ wobbling_effect = TRUE
+ apply_wibbly_filters(src)
+ addtimer(CALLBACK(src, PROC_REF(remove_wobbly)), wobble_duration)
+
+/obj/effect/overlay/vis/field/proc/remove_wobbly()
+ if(QDELETED(src))
+ return
+ remove_wibbly_filters(src, remove_duration = 0.25 SECONDS)
+ addtimer(VARSET_CALLBACK(src, wobbling_effect, FALSE), 0.25 SECONDS)
+
+/atom/movable/field_effect_holder
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ appearance_flags = PIXEL_SCALE|LONG_GLIDE
+ plane = ABOVE_GAME_PLANE
+
+#undef CHANGING_OFFSET
+#undef OVERLAY_DATA
+#undef STARTING_POSITION
+#undef ANIMATE_DAMPENER_TIME
diff --git a/code/datums/proximity_monitor/fields/projectile_dampener/projectile_dampener_effects.dm b/code/datums/proximity_monitor/fields/projectile_dampener/projectile_dampener_effects.dm
new file mode 100644
index 0000000000000..bd07d7836fc77
--- /dev/null
+++ b/code/datums/proximity_monitor/fields/projectile_dampener/projectile_dampener_effects.dm
@@ -0,0 +1,38 @@
+///datum that holds the effects we have on bullet catching
+/datum/dampener_projectile_effects
+ ///new projectiles speeds
+ var/projectile_speed_multiplier = 0.4
+ /// new projectiles damage
+ var/projectile_damage_multiplier = 0.75
+ /// new projectiles knockdown
+ var/projectile_knockdown_multiplier = 0.66
+ /// new projectiles stun
+ var/projectile_stun_multiplier = 0.66
+ /// new projectiles stamina damage
+ var/projectile_stamina_multiplier = 0.66
+
+/datum/dampener_projectile_effects/proc/apply_effects(obj/projectile/bullet)
+ if(projectile_speed_multiplier)
+ bullet.speed *= projectile_speed_multiplier
+ if(projectile_damage_multiplier)
+ bullet.damage *= projectile_damage_multiplier
+ if(projectile_knockdown_multiplier)
+ bullet.knockdown *= projectile_knockdown_multiplier
+ if(projectile_stamina_multiplier)
+ bullet.stamina *= projectile_stamina_multiplier
+ if(projectile_stun_multiplier)
+ bullet.stun *= projectile_stun_multiplier
+
+/datum/dampener_projectile_effects/proc/remove_effects(obj/projectile/bullet)
+ bullet.speed /= projectile_speed_multiplier
+ bullet.damage /= projectile_damage_multiplier
+ bullet.knockdown /= projectile_knockdown_multiplier
+ bullet.stamina /= projectile_stamina_multiplier
+ bullet.stun /= projectile_stun_multiplier
+
+/datum/dampener_projectile_effects/peacekeeper
+ projectile_speed_multiplier = 0.66
+ projectile_damage_multiplier = 0.5
+ projectile_knockdown_multiplier = 1
+ projectile_stun_multiplier = 1
+ projectile_stamina_multiplier = 1
diff --git a/code/datums/proximity_monitor/fields/timestop.dm b/code/datums/proximity_monitor/fields/timestop.dm
index 3b8001426a03c..8411e2c3bb3f1 100644
--- a/code/datums/proximity_monitor/fields/timestop.dm
+++ b/code/datums/proximity_monitor/fields/timestop.dm
@@ -204,11 +204,11 @@
freeze_atom(i)
freeze_turf(target)
-/datum/proximity_monitor/advanced/timestop/proc/freeze_projectile(obj/projectile/P)
- P.paused = TRUE
+/datum/proximity_monitor/advanced/timestop/proc/freeze_projectile(obj/projectile/proj)
+ proj.paused = TRUE
-/datum/proximity_monitor/advanced/timestop/proc/unfreeze_projectile(obj/projectile/P)
- P.paused = FALSE
+/datum/proximity_monitor/advanced/timestop/proc/unfreeze_projectile(obj/projectile/proj)
+ proj.paused = FALSE
/datum/proximity_monitor/advanced/timestop/proc/freeze_mob(mob/living/victim)
frozen_mobs += victim
diff --git a/code/datums/quirks/negative_quirks/numb.dm b/code/datums/quirks/negative_quirks/numb.dm
index cd4f28cb30228..ee8b86d342679 100644
--- a/code/datums/quirks/negative_quirks/numb.dm
+++ b/code/datums/quirks/negative_quirks/numb.dm
@@ -10,6 +10,8 @@
/datum/quirk/numb/add(client/client_source)
quirk_holder.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type)
+ quirk_holder.add_traits(list(TRAIT_ANALGESIA, QUIRK_TRAIT))
/datum/quirk/numb/remove(client/client_source)
quirk_holder.remove_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type)
+ quirk_holder.remove_traits(list(TRAIT_ANALGESIA, QUIRK_TRAIT))
diff --git a/code/datums/quirks/negative_quirks/prosthetic_limb.dm b/code/datums/quirks/negative_quirks/prosthetic_limb.dm
index f8941975ac15e..a9917ac0a59a8 100644
--- a/code/datums/quirks/negative_quirks/prosthetic_limb.dm
+++ b/code/datums/quirks/negative_quirks/prosthetic_limb.dm
@@ -28,7 +28,7 @@
old_limb = human_holder.return_and_replace_bodypart(surplus, special = TRUE)
/datum/quirk/prosthetic_limb/post_add()
- to_chat(quirk_holder, span_boldannounce("Your [slot_string] has been replaced with a surplus prosthetic. It has almost no muscle force, and makes you unhealthier by just having it. Additionally, \
+ to_chat(quirk_holder, span_bolddanger("Your [slot_string] has been replaced with a surplus prosthetic. It has almost no muscle force, and makes you unhealthier by just having it. Additionally, \
you need to use a welding tool and cables to repair it, instead of sutures and regenerative meshes."))
/datum/quirk/prosthetic_limb/remove()
diff --git a/code/datums/quirks/negative_quirks/prosthetic_organ.dm b/code/datums/quirks/negative_quirks/prosthetic_organ.dm
index 2b0f20b0d9f84..7877e177b39fa 100644
--- a/code/datums/quirks/negative_quirks/prosthetic_organ.dm
+++ b/code/datums/quirks/negative_quirks/prosthetic_organ.dm
@@ -65,7 +65,7 @@
STOP_PROCESSING(SSobj, old_organ)
/datum/quirk/prosthetic_organ/post_add()
- to_chat(quirk_holder, span_boldannounce("Your [slot_string] has been replaced with a surplus organ. It is weak and highly unstable. \
+ to_chat(quirk_holder, span_bolddanger("Your [slot_string] has been replaced with a surplus organ. It is weak and highly unstable. \
Additionally, any EMP will make it stop working entirely."))
/datum/quirk/prosthetic_organ/remove()
diff --git a/code/datums/quirks/negative_quirks/quadruple_amputee.dm b/code/datums/quirks/negative_quirks/quadruple_amputee.dm
index 493cdf0b71cda..653cca3dccddc 100644
--- a/code/datums/quirks/negative_quirks/quadruple_amputee.dm
+++ b/code/datums/quirks/negative_quirks/quadruple_amputee.dm
@@ -16,5 +16,5 @@
human_holder.del_and_replace_bodypart(new /obj/item/bodypart/leg/right/robot/surplus, special = TRUE)
/datum/quirk/quadruple_amputee/post_add()
- to_chat(quirk_holder, span_boldannounce("All your limbs have been replaced with surplus prosthetics. They are fragile and will easily come apart under duress. \
+ to_chat(quirk_holder, span_bolddanger("All your limbs have been replaced with surplus prosthetics. They are fragile and will easily come apart under duress. \
Additionally, you need to use a welding tool and cables to repair them, instead of bruise packs and ointment."))
diff --git a/code/datums/quirks/negative_quirks/tin_man.dm b/code/datums/quirks/negative_quirks/tin_man.dm
index 0afd8874bed49..a75cbbedd766f 100644
--- a/code/datums/quirks/negative_quirks/tin_man.dm
+++ b/code/datums/quirks/negative_quirks/tin_man.dm
@@ -33,5 +33,5 @@
new_organ.Insert(human_holder, special = TRUE, movement_flags = DELETE_IF_REPLACED)
/datum/quirk/tin_man/post_add()
- to_chat(quirk_holder, span_boldannounce("Most of your internal organs have been replaced with surplus prosthetics. They are fragile and will easily come apart under duress. \
+ to_chat(quirk_holder, span_bolddanger("Most of your internal organs have been replaced with surplus prosthetics. They are fragile and will easily come apart under duress. \
Additionally, any EMP will make them stop working entirely."))
diff --git a/code/datums/quirks/neutral_quirks/monochromatic.dm b/code/datums/quirks/neutral_quirks/monochromatic.dm
index ef6735df25d93..6c1b8c2ef78bd 100644
--- a/code/datums/quirks/neutral_quirks/monochromatic.dm
+++ b/code/datums/quirks/neutral_quirks/monochromatic.dm
@@ -16,7 +16,7 @@
/datum/quirk/monochromatic/post_add()
if(is_detective_job(quirk_holder.mind.assigned_role))
- to_chat(quirk_holder, span_boldannounce("Mmm. Nothing's ever clear on this station. It's all shades of gray..."))
+ to_chat(quirk_holder, span_bolddanger("Mmm. Nothing's ever clear on this station. It's all shades of gray..."))
quirk_holder.playsound_local(quirk_holder, 'sound/ambience/security/ambidet1.ogg', 50, FALSE)
/datum/quirk/monochromatic/remove()
diff --git a/code/datums/quirks/neutral_quirks/transhumanist.dm b/code/datums/quirks/neutral_quirks/transhumanist.dm
index aa8ae075df395..cbd85150e7673 100644
--- a/code/datums/quirks/neutral_quirks/transhumanist.dm
+++ b/code/datums/quirks/neutral_quirks/transhumanist.dm
@@ -136,11 +136,11 @@
if(!slot_string)
return
if(isbodypart(old_part))
- to_chat(quirk_holder, span_boldannounce("Your [slot_string] has been replaced with a robotic limb. You need to use a welding tool and cables to repair it, instead of sutures and regenerative meshes."))
+ to_chat(quirk_holder, span_bolddanger("Your [slot_string] has been replaced with a robotic limb. You need to use a welding tool and cables to repair it, instead of sutures and regenerative meshes."))
else if (old_part.name == "eyes")
- to_chat(quirk_holder, span_boldannounce("You replaced your eyes with flashlights, not cameras. You can't see a thing!"))
+ to_chat(quirk_holder, span_bolddanger("You replaced your eyes with flashlights, not cameras. You can't see a thing!"))
else if (isorgan(old_part))
- to_chat(quirk_holder, span_boldannounce("Your [slot_string] brings you one step closer to silicon perfection, but you feel you're not quite there yet."))
+ to_chat(quirk_holder, span_bolddanger("Your [slot_string] brings you one step closer to silicon perfection, but you feel you're not quite there yet."))
/datum/quirk/transhumanist/remove()
if(isnull(old_part))
diff --git a/code/datums/quirks/positive_quirks/chip_connector.dm b/code/datums/quirks/positive_quirks/chip_connector.dm
index 6fcc5bf9d31be..2035c093699d1 100644
--- a/code/datums/quirks/positive_quirks/chip_connector.dm
+++ b/code/datums/quirks/positive_quirks/chip_connector.dm
@@ -22,7 +22,7 @@
connector.Insert(carbon_holder, special = TRUE)
/datum/quirk/chip_connector/post_add()
- to_chat(quirk_holder, span_boldannounce(desc)) // efficiency is clever laziness
+ to_chat(quirk_holder, span_bolddanger(desc)) // efficiency is clever laziness
/datum/quirk/chip_connector/remove()
qdel(connector)
diff --git a/code/datums/quirks/positive_quirks/chipped.dm b/code/datums/quirks/positive_quirks/chipped.dm
index 7f43fc07b5bbc..474e8a4adcdc4 100644
--- a/code/datums/quirks/positive_quirks/chipped.dm
+++ b/code/datums/quirks/positive_quirks/chipped.dm
@@ -5,7 +5,7 @@
value = 2
gain_text = span_notice("The chip in your head itches a bit.")
lose_text = span_danger("You don't feel so chipped anymore..")
- medical_record_text = "Patient explained how they got caught up in 'the skillchip chase' recently, and now the chip in they head itches every so often. Dumbass."
+ medical_record_text = "Patient explained how they got caught up in 'the skillchip chase' recently, and now the chip in their head itches every so often. Dumbass."
mail_goodies = list(
/obj/item/skillchip/matrix_taunt,
/obj/item/skillchip/big_pointer,
@@ -14,44 +14,70 @@
)
/// Variable that holds the chip, used on removal.
var/obj/item/skillchip/installed_chip
- var/datum/callback/itchy_timer
+ ///itchy status effect we give our owner
+ var/datum/itchy_effect
/datum/quirk_constant_data/chipped
associated_typepath = /datum/quirk/chipped
customization_options = list(/datum/preference/choiced/chipped)
/datum/quirk/chipped/add_to_holder(mob/living/new_holder, quirk_transfer, client/client_source)
- var/obj/item/skillchip/chip_pref = GLOB.quirk_chipped_choice[client_source?.prefs?.read_preference(/datum/preference/choiced/chipped)]
+ var/chip_pref = client_source?.prefs?.read_preference(/datum/preference/choiced/chipped)
- if(!chip_pref)
+ if(isnull(chip_pref))
return ..()
-
- gain_text = span_notice("The [chip_pref] in your head itches a bit.")
+ installed_chip = GLOB.quirk_chipped_choice[chip_pref] || GLOB.quirk_chipped_choice[pick(GLOB.quirk_chipped_choice)]
+ gain_text = span_notice("The [installed_chip::name] in your head itches a bit.")
lose_text = span_notice("Your head stops itching so much.")
return ..()
/datum/quirk/chipped/add_unique(client/client_source)
-
- var/preferred_chip = GLOB.quirk_chipped_choice[client_source?.prefs?.read_preference(/datum/preference/choiced/chipped)]
- if(isnull(preferred_chip)) //Client is gone or they chose a random chip
- preferred_chip = GLOB.quirk_chipped_choice[pick(GLOB.quirk_chipped_choice)]
+ if(!iscarbon(quirk_holder))
+ return
var/mob/living/carbon/quirk_holder_carbon = quirk_holder
- if(iscarbon(quirk_holder))
- installed_chip = new preferred_chip()
- quirk_holder_carbon.implant_skillchip(installed_chip, force = TRUE)
+ installed_chip = new installed_chip()
+
+ RegisterSignals(installed_chip, list(COMSIG_QDELETING, COMSIG_SKILLCHIP_REMOVED), PROC_REF(remove_effect))
+ RegisterSignal(installed_chip, COMSIG_SKILLCHIP_IMPLANTED, PROC_REF(apply_effect))
+
+ quirk_holder_carbon.implant_skillchip(installed_chip, force = TRUE)
installed_chip.try_activate_skillchip(silent = FALSE, force = TRUE)
- var/obj/item/organ/brain/itchy_brain = quirk_holder.get_organ_by_type(ORGAN_SLOT_BRAIN)
- itchy_timer = addtimer(CALLBACK(src, PROC_REF(cause_itchy), itchy_brain), rand(5 SECONDS, 10 MINUTES)) // they get The Itch from a poor quality install every so often
+/datum/quirk/chipped/proc/apply_effect(datum/source, obj/item/brain_applied)
+ SIGNAL_HANDLER
+ var/mob/living/carbon/quirk_holder_carbon = quirk_holder
+ if(brain_applied == quirk_holder_carbon.get_organ_slot(ORGAN_SLOT_BRAIN))
+ itchy_effect = quirk_holder.apply_status_effect(/datum/status_effect/itchy_skillchip_quirk)
+
+/datum/quirk/chipped/proc/remove_effect(datum/source, obj/item/brain_removed)
+ SIGNAL_HANDLER
+ var/mob/living/carbon/quirk_holder_carbon = quirk_holder
+ if(QDELING(source) || brain_removed == quirk_holder_carbon.get_organ_slot(ORGAN_SLOT_BRAIN))
+ quirk_holder.remove_status_effect(itchy_effect)
+ itchy_effect = null
/datum/quirk/chipped/remove()
- qdel(installed_chip)
- deltimer(itchy_timer)
- . = ..()
+ QDEL_NULL(installed_chip)
+ if(itchy_effect)
+ quirk_holder.remove_status_effect(itchy_effect)
+ itchy_effect = null
+ return ..()
-/datum/quirk/chipped/proc/cause_itchy(obj/item/organ/brain/itchy_brain)
+/datum/status_effect/itchy_skillchip_quirk
+ id = "itchy skillchip"
+ tick_interval_lowerbound = 5 SECONDS
+ tick_interval_upperbound = 10 MINUTES
+ ///lower damage we apply to our itchy owner
+ var/minimum_damage = 1
+ ///upper damage we apply to our itchy owner
+ var/maximum_damage = 5
- itchy_brain.apply_organ_damage(rand(1, 5), maximum = itchy_brain.maxHealth * 0.3)
- to_chat(itchy_brain.owner, span_warning("Your [itchy_brain] itches."))
- itchy_timer = addtimer(CALLBACK(itchy_brain, PROC_REF(cause_itchy)), rand(5 SECONDS, 10 MINUTES)) // it will never end
+/datum/status_effect/itchy_skillchip_quirk/tick(seconds_between_ticks)
+ var/mob/living/carbon/carbon_owner = owner
+ var/obj/item/organ/brain/itchy_brain = carbon_owner.get_organ_slot(ORGAN_SLOT_BRAIN)
+ if(isnull(itchy_brain))
+ return
+ itchy_brain.apply_organ_damage(rand(minimum_damage, maximum_damage), maximum = itchy_brain.maxHealth * 0.3)
+ if(owner.stat == CONSCIOUS && !owner.incapacitated && owner.get_empty_held_indexes())
+ to_chat(owner, span_warning("You scratch the itch in your head."))
diff --git a/code/datums/quirks/positive_quirks/spacer.dm b/code/datums/quirks/positive_quirks/spacer.dm
index 344462703e906..8d1503ccf2f6e 100644
--- a/code/datums/quirks/positive_quirks/spacer.dm
+++ b/code/datums/quirks/positive_quirks/spacer.dm
@@ -9,7 +9,7 @@
gain_text = span_notice("You feel at home in space.")
lose_text = span_danger("You feel homesick.")
icon = FA_ICON_USER_ASTRONAUT
- value = 7
+ value = 5
quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_CHANGES_APPEARANCE
medical_record_text = "Patient is well-adapted to non-terrestrial environments."
mail_goodies = list(
diff --git a/code/datums/shuttles/arrival.dm b/code/datums/shuttles/arrival.dm
index c609ccc57410d..35e28a10c064b 100644
--- a/code/datums/shuttles/arrival.dm
+++ b/code/datums/shuttles/arrival.dm
@@ -26,10 +26,6 @@
suffix = "pubby"
name = "arrival shuttle (Pubby)"
-/datum/map_template/shuttle/arrival/northstar
- suffix = "northstar"
- name = "arrival shuttle (North Star)"
-
/datum/map_template/shuttle/arrival/nebula
suffix = "nebula"
name = "arrival shuttle (Nebula)"
diff --git a/code/datums/shuttles/cargo.dm b/code/datums/shuttles/cargo.dm
index 209ec59f66f2e..91b9c9bca417b 100644
--- a/code/datums/shuttles/cargo.dm
+++ b/code/datums/shuttles/cargo.dm
@@ -27,10 +27,6 @@
suffix = "delta"
name = "cargo ferry (Delta)"
-/datum/map_template/shuttle/cargo/northstar
- suffix = "northstar"
- name = "cargo ferry (North Star)"
-
/datum/map_template/shuttle/cargo/nebula
suffix = "nebula"
name = "supply shuttle (Nebula)"
diff --git a/code/datums/shuttles/mining.dm b/code/datums/shuttles/mining.dm
index 21747a488e326..4bae7ebd78553 100644
--- a/code/datums/shuttles/mining.dm
+++ b/code/datums/shuttles/mining.dm
@@ -44,10 +44,6 @@
suffix = "large"
name = "mining shuttle (Large)"
-/datum/map_template/shuttle/mining/northstar
- suffix = "northstar"
- name = "mining shuttle (North Star)"
-
/datum/map_template/shuttle/mining/nebula
suffix = "nebula"
name = "mining shuttle (Nebula)"
@@ -64,7 +60,3 @@
/datum/map_template/shuttle/mining_common/kilo
suffix = "kilo"
name = "lavaland shuttle (Kilo)"
-
-/datum/map_template/shuttle/mining_common/northstar
- suffix = "northstar"
- name = "lavaland shuttle (North Star)"
diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm
index 6e8fb2da6d683..e5b15e2b016da 100644
--- a/code/datums/sprite_accessories.dm
+++ b/code/datums/sprite_accessories.dm
@@ -2284,6 +2284,10 @@
name = "Lightbearer"
icon_state = "lightbearer"
+/datum/sprite_accessory/moth_wings/dipped
+ name = "Dipped"
+ icon_state = "dipped"
+
/datum/sprite_accessory/moth_antennae //Finally splitting the sprite
icon = 'icons/mob/human/species/moth/moth_antennae.dmi'
color_src = null
@@ -2375,6 +2379,10 @@
name = "Lightbearer"
icon_state = "lightbearer"
+/datum/sprite_accessory/moth_antennae/dipped
+ name = "Dipped"
+ icon_state = "dipped"
+
/datum/sprite_accessory/moth_markings // the markings that moths can have. finally something other than the boring tan
icon = 'icons/mob/human/species/moth/moth_markings.dmi'
color_src = null
@@ -2438,3 +2446,7 @@
/datum/sprite_accessory/moth_markings/lightbearer
name = "Lightbearer"
icon_state = "lightbearer"
+
+/datum/sprite_accessory/moth_markings/dipped
+ name = "Dipped"
+ icon_state = "dipped"
diff --git a/code/datums/status_effects/_status_effect.dm b/code/datums/status_effects/_status_effect.dm
index df525fa8c81b1..9f3e3a549046b 100644
--- a/code/datums/status_effects/_status_effect.dm
+++ b/code/datums/status_effects/_status_effect.dm
@@ -12,6 +12,10 @@
/// While processing, this becomes the world.time when the next tick will occur.
/// -1 = will prevent ticks, and if duration is also unlimited (-1), stop processing wholesale.
var/tick_interval = 1 SECONDS
+ ///If our tick intervals are set to be a dynamic value within a range, the lowerbound of said range
+ var/tick_interval_lowerbound
+ ///If our tick intervals are set to be a dynamic value within a range, the upperbound of said range
+ var/tick_interval_upperbound
/// The mob affected by the status effect.
VAR_FINAL/mob/living/owner
/// How many of the effect can be on one mob, and/or what happens when you try to add a duplicate.
@@ -112,7 +116,7 @@
return
if(tick_interval != STATUS_EFFECT_NO_TICK && tick_interval < world.time)
- var/tick_length = initial(tick_interval)
+ var/tick_length = (tick_interval_upperbound && tick_interval_lowerbound) ? rand(tick_interval_lowerbound, tick_interval_upperbound) : initial(tick_interval)
tick(tick_length / (1 SECONDS))
tick_interval = world.time + tick_length
if(QDELING(src))
diff --git a/code/datums/status_effects/debuffs/cursed.dm b/code/datums/status_effects/debuffs/cursed.dm
index 8d331bbe90add..083bd678635e7 100644
--- a/code/datums/status_effects/debuffs/cursed.dm
+++ b/code/datums/status_effects/debuffs/cursed.dm
@@ -31,6 +31,8 @@
/datum/status_effect/grouped/cursed/Destroy()
UnregisterSignal(SSdcs, COMSIG_GLOB_CURSED_SLOT_MACHINE_WON)
branded_hand = null
+ if (smoke_path)
+ owner.remove_shared_particles(smoke_path)
return ..()
/// Checks the number of curses we have and returns information back to the slot machine. `max_curse_amount` is set by the slot machine itself.
@@ -123,7 +125,6 @@
span_notice("The smoke slowly clears from [owner.name]..."),
span_notice("Your skin finally settles down and your throat no longer feels as dry... The brand disappearing confirms that the curse has been lifted."),
)
- QDEL_NULL(particle_effect)
qdel(src)
/// If our owner's stat changes, rapidly surge the damage chance.
@@ -140,10 +141,8 @@
/datum/status_effect/grouped/cursed/proc/on_death(mob/living/source, gibbed)
SIGNAL_HANDLER
- if(gibbed)
- return
-
- QDEL_NULL(particle_effect)
+ if(!gibbed && smoke_path)
+ owner.remove_shared_particles(smoke_path)
/datum/status_effect/grouped/cursed/update_particles()
var/particle_path = /particles/smoke/steam/mild
@@ -156,9 +155,10 @@
if(smoke_path == particle_path)
return
- QDEL_NULL(particle_effect)
+ if (smoke_path)
+ owner.remove_shared_particles(smoke_path)
+ owner.add_shared_particles(particle_path)
smoke_path = particle_path
- particle_effect = new(owner, particle_path)
/datum/status_effect/grouped/cursed/tick(seconds_between_ticks)
if(curse_count <= 1)
diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm
index 25c133e46d14a..02fe573ef36e9 100644
--- a/code/datums/status_effects/debuffs/debuffs.dm
+++ b/code/datums/status_effects/debuffs/debuffs.dm
@@ -512,7 +512,7 @@
new/obj/effect/temp_visual/dir_setting/curse/grasp_portal(spawn_turf, owner.dir)
playsound(spawn_turf, 'sound/effects/curse/curse2.ogg', 80, TRUE, -1)
var/obj/projectile/curse_hand/C = new (spawn_turf)
- C.preparePixelProjectile(owner, spawn_turf)
+ C.aim_projectile(owner, spawn_turf)
C.fire()
/obj/effect/temp_visual/curse
diff --git a/code/datums/status_effects/debuffs/fire_stacks.dm b/code/datums/status_effects/debuffs/fire_stacks.dm
index 83510a2ded2bd..648f09f31e95f 100644
--- a/code/datums/status_effects/debuffs/fire_stacks.dm
+++ b/code/datums/status_effects/debuffs/fire_stacks.dm
@@ -135,6 +135,8 @@
var/obj/effect/dummy/lighting_obj/moblight
/// Type of mob light emitter we use when on fire
var/moblight_type = /obj/effect/dummy/lighting_obj/moblight/fire
+ /// Cached particle type
+ var/cached_state
/datum/status_effect/fire_handler/fire_stacks/get_examine_text()
if(owner.on_fire)
@@ -153,6 +155,8 @@
/datum/status_effect/fire_handler/fire_stacks/on_remove()
UnregisterSignal(owner, COMSIG_ATOM_TOUCHED_SPARKS)
+ if (cached_state)
+ owner.remove_shared_particles(cached_state)
/datum/status_effect/fire_handler/fire_stacks/tick(seconds_between_ticks)
if(stacks <= 0)
@@ -177,15 +181,23 @@
deal_damage(seconds_between_ticks)
/datum/status_effect/fire_handler/fire_stacks/update_particles()
- if(on_fire)
- if(!particle_effect)
- particle_effect = new(owner, /particles/embers)
- if(stacks > MOB_BIG_FIRE_STACK_THRESHOLD)
- particle_effect.particles.spawning = 5
- else
- particle_effect.particles.spawning = 1
- else if(particle_effect)
- QDEL_NULL(particle_effect)
+ if (!on_fire)
+ if (cached_state)
+ owner.remove_shared_particles(cached_state)
+ cached_state = null
+ return
+
+ var/particle_type = /particles/embers/minor
+ if(stacks > MOB_BIG_FIRE_STACK_THRESHOLD)
+ particle_type = /particles/embers
+
+ if (cached_state == particle_type)
+ return
+
+ if (cached_state)
+ owner.remove_shared_particles(cached_state)
+ owner.add_shared_particles(particle_type)
+ cached_state = particle_type
/**
* Proc that handles damage dealing and all special effects
@@ -300,7 +312,7 @@
enemy_types = list(/datum/status_effect/fire_handler/fire_stacks)
stack_modifier = -1
- ///If the mob has the TRAIT_SLIPPERY_WHEN_WET trait, the mob gets this component while it's wet
+ /// If the mob has the TRAIT_SLIPPERY_WHEN_WET trait, the mob gets this component while it's wet
var/datum/component/slippery/slipperiness
/datum/status_effect/fire_handler/wet_stacks/on_apply()
@@ -312,12 +324,14 @@
if(HAS_TRAIT(owner, TRAIT_SLIPPERY_WHEN_WET))
become_slippery()
ADD_TRAIT(owner, TRAIT_IS_WET, TRAIT_STATUS_EFFECT(id))
+ owner.add_shared_particles(/particles/droplets)
/datum/status_effect/fire_handler/wet_stacks/on_remove()
. = ..()
REMOVE_TRAIT(owner, TRAIT_IS_WET, TRAIT_STATUS_EFFECT(id))
if(HAS_TRAIT(owner, TRAIT_SLIPPERY_WHEN_WET))
no_longer_slippery()
+ owner.remove_shared_particles(/particles/droplets)
/datum/status_effect/fire_handler/wet_stacks/proc/update_wet_stack_modifier()
SIGNAL_HANDLER
@@ -325,7 +339,7 @@
/datum/status_effect/fire_handler/wet_stacks/proc/become_slippery()
SIGNAL_HANDLER
- slipperiness = owner.AddComponent(/datum/component/slippery, 5 SECONDS, lube_flags = SLIPPERY_WHEN_LYING_DOWN)
+ slipperiness = owner.AddComponent(/datum/component/slippery, 5 SECONDS, lube_flags = SLIPPERY_WHEN_LYING_DOWN|NO_SLIP_WHEN_WALKING|WEAK_SLIDE)
ADD_TRAIT(owner, TRAIT_NO_SLIP_WATER, TRAIT_STATUS_EFFECT(id))
/datum/status_effect/fire_handler/wet_stacks/proc/no_longer_slippery()
@@ -342,10 +356,5 @@
if(stacks <= 0)
qdel(src)
-/datum/status_effect/fire_handler/wet_stacks/update_particles()
- if(particle_effect)
- return
- particle_effect = new(owner, /particles/droplets)
-
/datum/status_effect/fire_handler/wet_stacks/check_basic_mob_immunity(mob/living/basic/basic_owner)
return !(basic_owner.basic_mob_flags & IMMUNE_TO_GETTING_WET)
diff --git a/code/datums/status_effects/debuffs/slime/slime_food.dm b/code/datums/status_effects/debuffs/slime/slime_food.dm
index 538e62e27c597..259f6c8829a6e 100644
--- a/code/datums/status_effects/debuffs/slime/slime_food.dm
+++ b/code/datums/status_effects/debuffs/slime/slime_food.dm
@@ -21,9 +21,11 @@
RegisterSignal(owner, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_feeder_deleted))
RegisterSignal(owner, COMSIG_SLIME_DRAINED, PROC_REF(on_drained))
RegisterSignal(owner, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
-
return ..()
+/datum/status_effect/slime_food/on_remove()
+ feeder = null
+
///Handles the source of the pheromones getting deleted, or the owner getting washed
/datum/status_effect/slime_food/proc/on_feeder_deleted(datum/source)
SIGNAL_HANDLER
@@ -51,6 +53,3 @@
draining_slime.befriend(feeder)
new /obj/effect/temp_visual/heart(draining_slime.loc)
qdel(src)
-
-/datum/status_effect/slime_food/on_remove()
- feeder = null
diff --git a/code/datums/status_effects/debuffs/slime/slimed.dm b/code/datums/status_effects/debuffs/slime/slimed.dm
index 6cd107c74a9d8..32fa90482233e 100644
--- a/code/datums/status_effects/debuffs/slime/slimed.dm
+++ b/code/datums/status_effects/debuffs/slime/slimed.dm
@@ -66,6 +66,14 @@
to_chat(owner, span_userdanger("You have been covered in a thick layer of slime! Find a way to wash it off!"))
return ..()
+/datum/status_effect/slimed/on_remove()
+ owner.remove_shared_particles(rainbow ? "slimed_rainbow" : "slimed_[slime_color]")
+
+/datum/status_effect/slimed/update_particles()
+ var/obj/effect/abstract/shared_particle_holder/holder = owner.add_shared_particles(rainbow ? /particles/slime/rainbow : /particles/slime, rainbow ? "slimed_rainbow" : "slimed_[slime_color]")
+ if (!rainbow)
+ holder.particles.color = "[slime_color]a0"
+
/datum/status_effect/slimed/proc/remove_stacks(stacks_to_remove = 1)
slime_stacks -= stacks_to_remove // lose 1 stack per second
if(slime_stacks <= 0)
diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm
index 8d36aaf287f3d..92a3a55ac692f 100644
--- a/code/datums/status_effects/wound_effects.dm
+++ b/code/datums/status_effects/wound_effects.dm
@@ -49,16 +49,18 @@
/datum/status_effect/limp/on_apply()
if(!iscarbon(owner))
return FALSE
- var/mob/living/carbon/C = owner
- left = C.get_bodypart(BODY_ZONE_L_LEG)
- right = C.get_bodypart(BODY_ZONE_R_LEG)
+ var/mob/living/carbon/carbon_owner = owner
+ left = carbon_owner.get_bodypart(BODY_ZONE_L_LEG)
+ right = carbon_owner.get_bodypart(BODY_ZONE_R_LEG)
update_limp()
- RegisterSignal(C, COMSIG_MOVABLE_MOVED, PROC_REF(check_step))
- RegisterSignals(C, list(COMSIG_CARBON_GAIN_WOUND, COMSIG_CARBON_POST_LOSE_WOUND, COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB), PROC_REF(update_limp))
+ RegisterSignal(carbon_owner, COMSIG_MOVABLE_MOVED, PROC_REF(check_step))
+ RegisterSignals(carbon_owner, list(COMSIG_CARBON_GAIN_WOUND, COMSIG_CARBON_POST_LOSE_WOUND, COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB), PROC_REF(update_limp))
return TRUE
/datum/status_effect/limp/on_remove()
UnregisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_GAIN_WOUND, COMSIG_CARBON_POST_LOSE_WOUND, COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB))
+ left = null
+ right = null
/atom/movable/screen/alert/status_effect/limp
name = "Limping"
@@ -119,7 +121,6 @@
C.remove_status_effect(src)
return
-
/////////////////////////
//////// WOUNDS /////////
/////////////////////////
diff --git a/code/datums/storage/subtypes/backpack.dm b/code/datums/storage/subtypes/backpack.dm
index a6b3e1477dd97..a2a1a13fcd463 100644
--- a/code/datums/storage/subtypes/backpack.dm
+++ b/code/datums/storage/subtypes/backpack.dm
@@ -2,6 +2,16 @@
max_total_storage = 21
max_slots = 21
+/datum/storage/backpack/New(
+ atom/parent,
+ max_slots,
+ max_specific_storage,
+ max_total_storage,
+)
+ . = ..()
+ var/static/list/exception_cache = typecacheof(list(/obj/item/fish_tank))
+ exception_hold = exception_cache
+
/datum/storage/backpack/santabag
max_total_storage = 60
max_slots = 21
diff --git a/code/datums/storage/subtypes/duffel_bag.dm b/code/datums/storage/subtypes/duffel_bag.dm
index cfa073da5e513..bb3a236d38b31 100644
--- a/code/datums/storage/subtypes/duffel_bag.dm
+++ b/code/datums/storage/subtypes/duffel_bag.dm
@@ -2,6 +2,16 @@
max_total_storage = 30
max_slots = 21
+/datum/storage/duffel/New(
+ atom/parent,
+ max_slots,
+ max_specific_storage,
+ max_total_storage,
+)
+ . = ..()
+ var/static/list/exception_cache = typecacheof(list(/obj/item/fish_tank))
+ exception_hold = exception_cache
+
// Syndi bags get some FUN extras
// You can fit any 2 bulky objects (assuming they're in the whitelist)
// Should have traitorus stuff in here, not just useful big things
@@ -60,6 +70,9 @@
/obj/item/storage/bag/money,
// Heads!
/obj/item/bodypart/head,
+ // Fish
+ /obj/item/fish,
+ /obj/item/fish_tank,
)
// We keep the type list and the typecache list separate...
diff --git a/code/datums/storage/subtypes/fish_case.dm b/code/datums/storage/subtypes/fish_case.dm
index 47103e931b1f8..e38d55e0e1d2e 100644
--- a/code/datums/storage/subtypes/fish_case.dm
+++ b/code/datums/storage/subtypes/fish_case.dm
@@ -7,7 +7,7 @@
. = ..()
if(!.)
return .
- if(!HAS_TRAIT(to_insert, TRAIT_FISH_CASE_COMPATIBILE))
+ if(!HAS_TRAIT(to_insert, TRAIT_AQUARIUM_CONTENT))
if(messages && user)
user.balloon_alert(user, "can't hold!")
return FALSE
diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm
index 85e5e74b02fba..fde148c51a8b7 100644
--- a/code/datums/weather/weather.dm
+++ b/code/datums/weather/weather.dm
@@ -51,6 +51,8 @@
var/protect_indoors = FALSE
/// Areas to be affected by the weather, calculated when the weather begins
var/list/impacted_areas = list()
+ /// Areas affected by weather have their blend modes changed
+ var/list/impacted_areas_blend_modes = list()
/// Areas that are protected and excluded from the affected areas.
var/list/protected_areas = list()
/// The list of z-levels that this weather is actively affecting
@@ -102,16 +104,19 @@
SEND_GLOBAL_SIGNAL(COMSIG_WEATHER_TELEGRAPH(type), src)
stage = STARTUP_STAGE
var/list/affectareas = list()
- for(var/V in get_areas(area_type))
- affectareas += V
- for(var/V in protected_areas)
- affectareas -= get_areas(V)
- for(var/V in affectareas)
- var/area/A = V
- if(protect_indoors && !A.outdoors)
+ for(var/area/selected_area as anything in get_areas(area_type))
+ affectareas += selected_area
+ for(var/area/protected_area as anything in protected_areas)
+ affectareas -= get_areas(protected_area)
+ for(var/area/affected_area as anything in affectareas)
+ if(protect_indoors && !affected_area.outdoors)
continue
- if(A.z in impacted_z_levels)
- impacted_areas |= A
+
+ for(var/z in impacted_z_levels)
+ if(length(affected_area.turfs_by_zlevel) >= z && length(affected_area.turfs_by_zlevel[z]))
+ impacted_areas |= affected_area
+ continue
+
weather_duration = rand(weather_duration_lower, weather_duration_upper)
SSweather.processing |= src
update_areas()
@@ -230,8 +235,17 @@
for(var/area/impacted as anything in impacted_areas)
if(length(overlay_cache))
impacted.overlays -= overlay_cache
+ if(impacted_areas_blend_modes[impacted])
+ // revert the blend mode to the old state
+ impacted.blend_mode = impacted_areas_blend_modes[impacted]
+ impacted_areas_blend_modes[impacted] = null
if(length(new_overlay_cache))
impacted.overlays += new_overlay_cache
+ // only change the blend mode if it's not default or overlay
+ if(impacted.blend_mode > BLEND_OVERLAY)
+ // save the old blend mode state
+ impacted_areas_blend_modes[impacted] = impacted.blend_mode
+ impacted.blend_mode = BLEND_OVERLAY
overlay_cache = new_overlay_cache
diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm
index 7d432c1e488da..f9d9cfc612174 100644
--- a/code/datums/weather/weather_types/ash_storm.dm
+++ b/code/datums/weather/weather_types/ash_storm.dm
@@ -12,7 +12,7 @@
weather_duration_upper = 1200
weather_overlay = "ash_storm"
- end_message = span_boldannounce("The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now.")
+ end_message = span_bolddanger("The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now.")
end_duration = 300
end_overlay = "light_ash"
diff --git a/code/datums/weather/weather_types/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm
index 2b749cdbc84d1..77aafed4f5dc5 100644
--- a/code/datums/weather/weather_types/snow_storm.dm
+++ b/code/datums/weather/weather_types/snow_storm.dm
@@ -14,7 +14,7 @@
use_glow = FALSE
end_duration = 100
- end_message = span_boldannounce("The snowfall dies down, it should be safe to go outside again.")
+ end_message = span_bolddanger("The snowfall dies down, it should be safe to go outside again.")
area_type = /area
protect_indoors = TRUE
diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm
index ec38d72898196..31bfe164b5494 100644
--- a/code/datums/wires/mulebot.dm
+++ b/code/datums/wires/mulebot.dm
@@ -29,24 +29,24 @@
if(WIRE_MOTOR1, WIRE_MOTOR2)
if(is_cut(WIRE_MOTOR1) && is_cut(WIRE_MOTOR2))
ADD_TRAIT(mule, TRAIT_IMMOBILIZED, MOTOR_LACK_TRAIT)
- holder.audible_message(span_hear("The motors of [src] go silent."), null, 1)
+ holder.audible_message(span_hear("The motors of [mule] go silent."), null, 1)
else
REMOVE_TRAIT(mule, TRAIT_IMMOBILIZED, MOTOR_LACK_TRAIT)
- holder.audible_message(span_hear("The motors of [src] whir to life!"), null, 1)
+ holder.audible_message(span_hear("The motors of [mule] whir to life!"), null, 1)
if(is_cut(WIRE_MOTOR1))
mule.set_varspeed(FAST_MOTOR_SPEED)
- holder.audible_message(span_hear("The motors of [src] speed up!"), null, 1)
+ holder.audible_message(span_hear("The motors of [mule] speed up!"), null, 1)
else if(is_cut(WIRE_MOTOR2))
mule.set_varspeed(AVERAGE_MOTOR_SPEED)
- holder.audible_message(span_hear("The motors of [src] whir."), null, 1)
+ holder.audible_message(span_hear("The motors of [mule] whir."), null, 1)
else
mule.set_varspeed(SLOW_MOTOR_SPEED)
- holder.audible_message(span_hear("The motors of [src] move gently."), null, 1)
+ holder.audible_message(span_hear("The motors of [mule] move gently."), null, 1)
if(WIRE_AVOIDANCE)
if (!isnull(source))
log_combat(source, mule, "[is_cut(WIRE_AVOIDANCE) ? "cut" : "mended"] the MULE safety wire of")
- holder.audible_message(span_hear("Something inside [src] clicks ominously!"), null, 1)
+ holder.audible_message(span_hear("Something inside [mule] clicks ominously!"), null, 1)
/datum/wires/mulebot/on_pulse(wire)
var/mob/living/simple_animal/bot/mulebot/mule = holder
diff --git a/code/datums/wounds/cranial_fissure.dm b/code/datums/wounds/cranial_fissure.dm
index 615d0d10eb0e6..8e561cd346c13 100644
--- a/code/datums/wounds/cranial_fissure.dm
+++ b/code/datums/wounds/cranial_fissure.dm
@@ -52,12 +52,10 @@
/datum/wound/cranial_fissure/remove_wound(ignore_limb, replaced)
REMOVE_TRAIT(limb, TRAIT_IMMUNE_TO_CRANIAL_FISSURE, type)
- REMOVE_TRAIT(victim, TRAIT_HAS_CRANIAL_FISSURE, type)
-
- victim.remove_filter(CRANIAL_FISSURE_FILTER_DISPLACEMENT)
-
- UnregisterSignal(victim, COMSIG_MOB_SLIPPED)
-
+ if (!isnull(victim))
+ REMOVE_TRAIT(victim, TRAIT_HAS_CRANIAL_FISSURE, type)
+ victim.remove_filter(CRANIAL_FISSURE_FILTER_DISPLACEMENT)
+ UnregisterSignal(victim, COMSIG_MOB_SLIPPED)
return ..()
/datum/wound/cranial_fissure/proc/on_owner_slipped(mob/source)
diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm
index d981cadaf8274..ba2d2d358fd47 100644
--- a/code/game/atom/_atom.dm
+++ b/code/game/atom/_atom.dm
@@ -884,7 +884,7 @@
var/extra_context = ""
var/used_name = name
- if(isliving(user) || isovermind(user) || isaicamera(user) || (ghost_screentips && isobserver(user)))
+ if(isliving(user) || isovermind(user) || iscameramob(user) || (ghost_screentips && isobserver(user)))
var/obj/item/held_item = user.get_active_held_item()
if (user.mob_flags & MOB_HAS_SCREENTIPS_NAME_OVERRIDE)
diff --git a/code/game/atom/atom_act.dm b/code/game/atom/atom_act.dm
index 8565d790612c2..54f023eb86b59 100644
--- a/code/game/atom/atom_act.dm
+++ b/code/game/atom/atom_act.dm
@@ -75,6 +75,20 @@
SEND_SIGNAL(src, COMSIG_ATOM_EMP_ACT, severity, protection)
return protection // Pass the protection value collected here upwards
+/**
+ * Wrapper for bullet_act used for atom-specific calculations, i.e. armor
+ *
+ * @params
+ * * hitting_projectile - projectile
+ * * def_zone - zone hit
+ * * piercing_hit - is this hit piercing or normal?
+ */
+
+/atom/proc/projectile_hit(obj/projectile/hitting_projectile, def_zone, piercing_hit = FALSE, blocked = null)
+ if (isnull(blocked))
+ blocked = check_projectile_armor(def_zone, hitting_projectile)
+ return bullet_act(hitting_projectile, def_zone, piercing_hit, blocked)
+
/**
* React to a hit by a projectile object
*
@@ -82,11 +96,12 @@
* * hitting_projectile - projectile
* * def_zone - zone hit
* * piercing_hit - is this hit piercing or normal?
+ * * blocked - total armor value to apply to this hit
*/
-/atom/proc/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit = FALSE)
+/atom/proc/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit = FALSE, blocked = 0)
SHOULD_CALL_PARENT(TRUE)
- var/sigreturn = SEND_SIGNAL(src, COMSIG_ATOM_PRE_BULLET_ACT, hitting_projectile, def_zone)
+ var/sigreturn = SEND_SIGNAL(src, COMSIG_ATOM_PRE_BULLET_ACT, hitting_projectile, def_zone, piercing_hit, blocked)
if(sigreturn & COMPONENT_BULLET_PIERCED)
return BULLET_ACT_FORCE_PIERCE
if(sigreturn & COMPONENT_BULLET_BLOCKED)
@@ -94,7 +109,7 @@
if(sigreturn & COMPONENT_BULLET_ACTED)
return BULLET_ACT_HIT
- SEND_SIGNAL(src, COMSIG_ATOM_BULLET_ACT, hitting_projectile, def_zone)
+ SEND_SIGNAL(src, COMSIG_ATOM_BULLET_ACT, hitting_projectile, def_zone, piercing_hit, blocked)
if(QDELETED(hitting_projectile)) // Signal deleted it?
return BULLET_ACT_BLOCK
@@ -102,7 +117,7 @@
target = src,
// This armor check only matters for the visuals and messages in on_hit(), it's not actually used to reduce damage since
// only living mobs use armor to reduce damage, but on_hit() is going to need the value no matter what is shot.
- blocked = check_projectile_armor(def_zone, hitting_projectile),
+ blocked = blocked,
pierce_hit = piercing_hit,
)
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index cce2760ae609d..ceaf03685532a 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -73,7 +73,7 @@
. = ..()
if(!new_viewer || hud_users_all_z_levels.len != 1)
return
- for(var/mob/eye/ai_eye/eye as anything in GLOB.aiEyes)
+ for(var/mob/eye/camera/ai/eye as anything in GLOB.camera_eyes)
eye.update_ai_detect_hud()
/datum/atom_hud/data/malf_apc
diff --git a/code/game/machinery/computer/arcade/_arcade.dm b/code/game/machinery/computer/arcade/_arcade.dm
index 053ec907f3e63..eb91fa44f1c70 100644
--- a/code/game/machinery/computer/arcade/_arcade.dm
+++ b/code/game/machinery/computer/arcade/_arcade.dm
@@ -85,7 +85,7 @@
for(var/i in 1 to prizes)
user.add_mood_event("arcade", /datum/mood_event/arcade)
if(prob(0.0001)) //1 in a million
- new /obj/item/gun/energy/pulse/prize(src)
+ new /obj/item/gun/energy/pulse/prize(get_turf(src))
visible_message(span_notice("[src] dispenses.. woah, a gun! Way past cool."), span_notice("You hear a chime and a shot."))
user.client.give_award(/datum/award/achievement/misc/pulse, user)
continue
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index 80a06fa6b9fc1..5633fe4904748 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -8,7 +8,7 @@
var/list/z_lock = list() // Lock use to these z levels
var/lock_override = NONE
- var/mob/eye/ai_eye/remote/eyeobj
+ var/mob/eye/camera/remote/eyeobj
var/mob/living/current_user = null
var/list/networks = list(CAMERANET_NETWORK_SS13)
/// Typepath of the action button we use as "off"
@@ -76,27 +76,33 @@
/obj/machinery/computer/camera_advanced/syndie/connect_to_shuttle(mapload, obj/docking_port/mobile/port, obj/docking_port/stationary/dock)
return //For syndie nuke shuttle, to spy for station.
+/**
+ * Initializes a camera eye.
+ * Returns TRUE if initialization was successful.
+ * Will return nothing if it runtimes.
+ */
/obj/machinery/computer/camera_advanced/proc/CreateEye()
- eyeobj = new()
- eyeobj.origin = src
+ if(eyeobj)
+ CRASH("Tried to make another eyeobj for some reason. Why?")
+
+ eyeobj = new(get_turf(src), src)
+ return TRUE
/obj/machinery/computer/camera_advanced/proc/GrantActions(mob/living/user)
for(var/datum/action/to_grant as anything in actions)
to_grant.Grant(user)
/obj/machinery/proc/remove_eye_control(mob/living/user)
- CRASH("[type] does not implement ai eye handling")
+ CRASH("[type] does not implement camera eye handling")
/obj/machinery/computer/camera_advanced/proc/give_eye_control(mob/user)
if(isnull(user?.client))
return
- GrantActions(user)
+
current_user = user
- eyeobj.eye_user = user
- eyeobj.name = "Camera Eye ([user.name])"
- user.remote_control = eyeobj
- user.reset_perspective(eyeobj)
- eyeobj.setLoc(eyeobj.loc)
+ eyeobj.assign_user(user)
+ GrantActions(user)
+
if(should_supress_view_changes)
user.client.view_size.supress()
begin_processing()
@@ -110,14 +116,11 @@
for(var/datum/camerachunk/camerachunks_gone as anything in eyeobj.visibleCameraChunks)
camerachunks_gone.remove(eyeobj)
- user.reset_perspective(null)
- if(eyeobj.visible_icon)
- user.client.images -= eyeobj.user_image
+ eyeobj.assign_user(null)
+ current_user = null
+
user.client.view_size.unsupress()
- eyeobj.eye_user = null
- user.remote_control = null
- current_user = null
playsound(src, 'sound/machines/terminal/terminal_off.ogg', 25, FALSE)
/obj/machinery/computer/camera_advanced/on_set_is_operational(old_value)
@@ -148,39 +151,43 @@
if(!QDELETED(current_user))
to_chat(user, span_warning("The console is already in use!"))
return
- var/mob/living/L = user
- if(!eyeobj)
- CreateEye()
- if(!eyeobj) //Eye creation failed
+
+ if(eyeobj)
+ give_eye_control(user)
+ eyeobj.setLoc(eyeobj.loc)
+ return
+ /* We're attempting to initialize the eye past this point */
+
+ if(!CreateEye())
+ to_chat(user, span_warning("\The [src] flashes a bunch of never-ending errors on the display. Something is really wrong."))
return
- if(!eyeobj.eye_initialized)
- var/camera_location
- var/turf/myturf = get_turf(src)
- if(eyeobj.use_static != FALSE)
- if((!length(z_lock) || (myturf.z in z_lock)) && GLOB.cameranet.checkTurfVis(myturf))
- camera_location = myturf
- else
- for(var/obj/machinery/camera/C as anything in GLOB.cameranet.cameras)
- if(!C.can_use() || length(z_lock) && !(C.z in z_lock))
- continue
- var/list/network_overlap = networks & C.network
- if(length(network_overlap))
- camera_location = get_turf(C)
- break
+
+ var/camera_location
+ var/turf/myturf = get_turf(src)
+ var/consider_zlock = (!!length(z_lock))
+
+ if(!eyeobj.use_visibility)
+ if(consider_zlock && !(myturf.z in z_lock))
+ camera_location = locate(round(world.maxx * 0.5), round(world.maxy * 0.5), z_lock[1])
else
camera_location = myturf
- if(length(z_lock) && !(myturf.z in z_lock))
- camera_location = locate(round(world.maxx/2), round(world.maxy/2), z_lock[1])
-
- if(camera_location)
- eyeobj.eye_initialized = TRUE
- give_eye_control(L)
- eyeobj.setLoc(camera_location)
+ else
+ if((!consider_zlock || (myturf.z in z_lock)) && GLOB.cameranet.checkTurfVis(myturf))
+ camera_location = myturf
else
- unset_machine()
+ for(var/obj/machinery/camera/C as anything in GLOB.cameranet.cameras)
+ if(!C.can_use() || consider_zlock && !(C.z in z_lock))
+ continue
+ var/list/network_overlap = networks & C.network
+ if(length(network_overlap))
+ camera_location = get_turf(C)
+ break
+
+ if(camera_location)
+ give_eye_control(user)
+ eyeobj.setLoc(camera_location, TRUE)
else
- give_eye_control(L)
- eyeobj.setLoc(eyeobj.loc)
+ unset_machine()
/obj/machinery/computer/camera_advanced/attack_robot(mob/user)
return attack_hand(user)
@@ -188,73 +195,6 @@
/obj/machinery/computer/camera_advanced/attack_ai(mob/user)
return //AIs would need to disable their own camera procs to use the console safely. Bugs happen otherwise.
-/mob/eye/ai_eye/remote
- name = "Inactive Camera Eye"
- ai_detector_visible = FALSE
- var/sprint = 10
- var/cooldown = 0
- var/acceleration = 1
- var/mob/living/eye_user = null
- var/obj/machinery/origin
- var/eye_initialized = 0
- var/visible_icon = 0
- var/image/user_image = null
-
-/mob/eye/ai_eye/remote/update_remote_sight(mob/living/user)
- user.set_invis_see(SEE_INVISIBLE_LIVING) //can't see ghosts through cameras
- user.set_sight(SEE_TURFS)
- return TRUE
-
-/mob/eye/ai_eye/remote/Destroy()
- if(origin && eye_user)
- origin.remove_eye_control(eye_user,src)
- origin = null
- . = ..()
- eye_user = null
-
-/mob/eye/ai_eye/remote/GetViewerClient()
- if(eye_user)
- return eye_user.client
- return null
-
-/mob/eye/ai_eye/remote/setLoc(turf/destination, force_update = FALSE)
- if(eye_user)
- destination = get_turf(destination)
- if (destination)
- abstract_move(destination)
- else
- moveToNullspace()
-
- update_ai_detect_hud()
-
- if(use_static)
- GLOB.cameranet.visibility(src, GetViewerClient(), null, use_static)
-
- if(visible_icon)
- if(eye_user.client)
- eye_user.client.images -= user_image
- user_image = image(icon,loc,icon_state, FLY_LAYER)
- SET_PLANE(user_image, ABOVE_GAME_PLANE, destination)
- eye_user.client.images += user_image
-
-/mob/eye/ai_eye/remote/relaymove(mob/living/user, direction)
- var/initial = initial(sprint)
- var/max_sprint = 50
-
- if(cooldown && cooldown < world.timeofday) // 3 seconds
- sprint = initial
-
- for(var/i = 0; i < max(sprint, initial); i += 20)
- var/turf/step = get_turf(get_step(src, direction))
- if(step)
- setLoc(step)
-
- cooldown = world.timeofday + 5
- if(acceleration)
- sprint = min(sprint + 0.5, max_sprint)
- else
- sprint = initial
-
/datum/action/innate/camera_off
name = "End Camera View"
button_icon = 'icons/mob/actions/actions_silicon.dmi'
@@ -263,8 +203,8 @@
/datum/action/innate/camera_off/Activate()
if(!owner || !isliving(owner))
return
- var/mob/eye/ai_eye/remote/remote_eye = owner.remote_control
- var/obj/machinery/computer/camera_advanced/console = remote_eye.origin
+ var/mob/eye/camera/remote/remote_eye = owner.remote_control
+ var/obj/machinery/computer/camera_advanced/console = remote_eye.origin_ref.resolve()
console.remove_eye_control(owner)
/datum/action/innate/camera_jump
@@ -275,8 +215,8 @@
/datum/action/innate/camera_jump/Activate()
if(!owner || !isliving(owner))
return
- var/mob/eye/ai_eye/remote/remote_eye = owner.remote_control
- var/obj/machinery/computer/camera_advanced/origin = remote_eye.origin
+ var/mob/eye/camera/remote/remote_eye = owner.remote_control
+ var/obj/machinery/computer/camera_advanced/origin = remote_eye.origin_ref.resolve()
var/list/L = list()
@@ -320,7 +260,7 @@
/datum/action/innate/camera_multiz_up/Activate()
if(!owner || !isliving(owner))
return
- var/mob/eye/ai_eye/remote/remote_eye = owner.remote_control
+ var/mob/eye/camera/remote/remote_eye = owner.remote_control
if(remote_eye.zMove(UP))
to_chat(owner, span_notice("You move upwards."))
else
@@ -334,7 +274,7 @@
/datum/action/innate/camera_multiz_down/Activate()
if(!owner || !isliving(owner))
return
- var/mob/eye/ai_eye/remote/remote_eye = owner.remote_control
+ var/mob/eye/camera/remote/remote_eye = owner.remote_control
if(remote_eye.zMove(DOWN))
to_chat(owner, span_notice("You move downwards."))
else
diff --git a/code/game/machinery/computer/operating_computer.dm b/code/game/machinery/computer/operating_computer.dm
index 83a2a08d986c3..3cba3ad2078a6 100644
--- a/code/game/machinery/computer/operating_computer.dm
+++ b/code/game/machinery/computer/operating_computer.dm
@@ -140,7 +140,7 @@
data["patient"]["oxyLoss"] = patient.getOxyLoss()
if(patient.surgeries.len)
for(var/datum/surgery/procedure in patient.surgeries)
- var/datum/surgery_step/surgery_step = procedure.get_surgery_step()
+ var/datum/surgery_step/surgery_step = GLOB.surgery_steps[procedure.steps[procedure.status]]
var/chems_needed = surgery_step.get_chem_list()
var/alternative_step
var/alt_chems_needed = ""
diff --git a/code/game/machinery/computer/records/security.dm b/code/game/machinery/computer/records/security.dm
index b2bc95e3fd060..3b84836bd5e9b 100644
--- a/code/game/machinery/computer/records/security.dm
+++ b/code/game/machinery/computer/records/security.dm
@@ -184,7 +184,7 @@
if("set_note")
var/note = strip_html_full(params["note"], MAX_MESSAGE_LEN)
- investigate_log("[user] has changed the security note of record: \"[target]\" from \"[target.security_note]\" to \"[note]\".")
+ investigate_log("[user] has changed the security note of record: \"[target]\" from \"[target.security_note]\" to \"[note]\".", INVESTIGATE_RECORDS)
target.security_note = note
return TRUE
diff --git a/code/game/machinery/computer/telescreen.dm b/code/game/machinery/computer/telescreen.dm
index 082ac7560eef0..b9a7273ae75ba 100644
--- a/code/game/machinery/computer/telescreen.dm
+++ b/code/game/machinery/computer/telescreen.dm
@@ -45,8 +45,9 @@
var/icon_state_off = "entertainment_blank"
var/icon_state_on = "entertainment"
-/obj/machinery/vending/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+/obj/machinery/computer/security/telescreen/entertainment/add_context(atom/source, list/context, obj/item/held_item, mob/user)
context[SCREENTIP_CONTEXT_CTRL_LMB] = "Toggle mute button"
+ return CONTEXTUAL_SCREENTIP_SET
/obj/machinery/computer/security/telescreen/entertainment/click_ctrl(mob/user)
. = ..()
@@ -64,6 +65,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai
/obj/machinery/computer/security/telescreen/entertainment/Initialize(mapload)
. = ..()
find_and_hang_on_wall()
+ register_context()
speakers = new(src)
/obj/machinery/computer/security/telescreen/entertainment/Destroy()
diff --git a/code/game/machinery/dna_infuser/infuser_actions.dm b/code/game/machinery/dna_infuser/infuser_actions.dm
index 1b55059bb9899..466bed9e17efe 100644
--- a/code/game/machinery/dna_infuser/infuser_actions.dm
+++ b/code/game/machinery/dna_infuser/infuser_actions.dm
@@ -41,6 +41,8 @@
if(!LAZYACCESS(params2list(params), RIGHT_CLICK))
return
. = ..()
+ if(!.)
+ return
var/modifiers = params2list(params)
caller.visible_message(
@@ -48,7 +50,7 @@
span_bold("You spit ink."),
)
var/obj/projectile/ink_spit/ink = new /obj/projectile/ink_spit(caller.loc)
- ink.preparePixelProjectile(target, caller, modifiers)
+ ink.aim_projectile(target, caller, modifiers)
ink.firer = caller
ink.fire()
playsound(caller, 'sound/items/weapons/pierce.ogg', 20, TRUE, -1)
diff --git a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm
index 2197eb4e1697e..1fab18f45f93a 100644
--- a/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/fish_organs.dm
@@ -8,8 +8,8 @@
id = "organ_set_bonus_fish"
tick_interval = 1 SECONDS
organs_needed = 3
- bonus_activate_text = span_notice("Fish DNA is deeply infused with you! While wet, you crawl faster, are slippery, and cannot slip, and it takes longer to dry out. \
- You're also more resistant to high pressure, better at fishing, but less resilient when dry, especially against burns.")
+ bonus_activate_text = span_notice("Fish DNA is deeply infused with you! While wet, you crawl faster, are slippery, cannot slip, and it takes longer to dry out. \
+ You're also resistant to high pressure, better at fishing, but less resilient when dry, especially against burns.")
bonus_deactivate_text = span_notice("You no longer feel as fishy. The moisture around your body begins to dissipate faster...")
bonus_traits = list(
TRAIT_RESISTHIGHPRESSURE,
@@ -34,6 +34,9 @@
if(ishuman(owner))
var/mob/living/carbon/human/human = owner
+ //Fish is slightly weaker to being cooked. oh oh.
+ human.physiology.burn_mod *= 1.15
+ human.physiology.heat_mod *= 1.15
human.physiology.damage_resistance += 8 //base 8% damage resistance, much wow.
if(!HAS_TRAIT(owner, TRAIT_IS_WET))
apply_debuff()
@@ -61,6 +64,8 @@
owner.clear_mood_event("fish_organs_bonus")
if(ishuman(owner))
var/mob/living/carbon/human/human = owner
+ human.physiology.burn_mod /= 1.15
+ human.physiology.heat_mod /= 1.15
human.physiology.damage_resistance -= 8
if(HAS_TRAIT(owner, TRAIT_IS_WET) && istype(owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL), /obj/item/organ/tail/fish))
remove_speed_buff()
diff --git a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm
index 82c9c9fc8e8be..805277b3d9c61 100644
--- a/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/gondola_organs.dm
@@ -34,7 +34,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah...
AddElement(/datum/element/noticable_organ, "%PRONOUN_They radiate%PRONOUN_s an aura of serenity.")
AddElement(/datum/element/update_icon_blocker)
-/obj/item/organ/heart/gondola/mob_insert(mob/living/carbon/receiver, special, movement_flags)
+/obj/item/organ/heart/gondola/on_mob_insert(mob/living/carbon/receiver, special, movement_flags)
. = ..()
if(!(FACTION_HOSTILE in receiver.faction))
factions_to_remove += FACTION_HOSTILE
@@ -42,7 +42,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah...
factions_to_remove += FACTION_MINING
receiver.faction |= list(FACTION_HOSTILE, FACTION_MINING)
-/obj/item/organ/heart/gondola/mob_remove(mob/living/carbon/heartless, special, movement_flags)
+/obj/item/organ/heart/gondola/on_mob_remove(mob/living/carbon/heartless, special, movement_flags)
. = ..()
for(var/faction in factions_to_remove)
heartless.faction -= faction
@@ -64,11 +64,11 @@ Fluoride Stare: After someone says 5 words, blah blah blah...
AddElement(/datum/element/noticable_organ, "%PRONOUN_Their mouth is permanently affixed into a relaxed smile.", BODY_ZONE_PRECISE_MOUTH)
AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/gondola)
-/obj/item/organ/tongue/gondola/mob_insert(mob/living/carbon/tongue_owner, special, movement_flags)
+/obj/item/organ/tongue/gondola/on_mob_insert(mob/living/carbon/tongue_owner, special, movement_flags)
. = ..()
tongue_owner.add_mood_event("gondola_zen", /datum/mood_event/gondola_serenity)
-/obj/item/organ/tongue/gondola/mob_remove(mob/living/carbon/tongue_owner, special, movement_flags)
+/obj/item/organ/tongue/gondola/on_mob_remove(mob/living/carbon/tongue_owner, special, movement_flags)
tongue_owner.clear_mood_event("gondola_zen")
return ..()
@@ -87,7 +87,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah...
AddElement(/datum/element/noticable_organ, "%PRONOUN_Their left arm has small needles breaching the skin all over it.", BODY_ZONE_L_ARM)
AddElement(/datum/element/noticable_organ, "%PRONOUN_Their right arm has small needles breaching the skin all over it.", BODY_ZONE_R_ARM)
-/obj/item/organ/liver/gondola/mob_insert(mob/living/carbon/liver_owner, special, movement_flags)
+/obj/item/organ/liver/gondola/on_mob_insert(mob/living/carbon/liver_owner, special, movement_flags)
. = ..()
var/has_left = liver_owner.has_left_hand(check_disabled = FALSE)
var/has_right = liver_owner.has_right_hand(check_disabled = FALSE)
@@ -102,7 +102,7 @@ Fluoride Stare: After someone says 5 words, blah blah blah...
RegisterSignal(liver_owner, COMSIG_LIVING_TRY_PULL, PROC_REF(on_owner_try_pull))
RegisterSignal(liver_owner, COMSIG_CARBON_HELPED, PROC_REF(on_hug))
-/obj/item/organ/liver/gondola/mob_remove(mob/living/carbon/liver_owner, special, movement_flags)
+/obj/item/organ/liver/gondola/on_mob_remove(mob/living/carbon/liver_owner, special, movement_flags)
. = ..()
UnregisterSignal(liver_owner, list(COMSIG_HUMAN_EQUIPPING_ITEM, COMSIG_LIVING_TRY_PULL, COMSIG_CARBON_HELPED))
diff --git a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
index f10dcefb0d5c5..251c5c35a49b0 100644
--- a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
@@ -74,7 +74,7 @@
//but 1.5 damage
human_receiver.physiology?.damage_resistance -= 50
-/obj/item/organ/heart/rat/on_mob_remove(mob/living/carbon/heartless, special)
+/obj/item/organ/heart/rat/on_mob_remove(mob/living/carbon/heartless, special, movement_flags)
. = ..()
if(!ishuman(heartless))
return
diff --git a/code/game/machinery/dna_infuser/organ_sets/roach_organs.dm b/code/game/machinery/dna_infuser/organ_sets/roach_organs.dm
index 2b32ad8570223..03955f06ffe82 100644
--- a/code/game/machinery/dna_infuser/organ_sets/roach_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/roach_organs.dm
@@ -72,7 +72,7 @@
QDEL_NULL(roach_shell)
return ..()
-/obj/item/organ/heart/roach/on_mob_insert(mob/living/carbon/organ_owner, special)
+/obj/item/organ/heart/roach/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
if(!ishuman(organ_owner))
return
@@ -87,7 +87,7 @@
. = ..()
limb.add_bodypart_overlay(roach_shell)
-/obj/item/organ/heart/roach/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/heart/roach/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
if(!ishuman(organ_owner) || QDELETED(organ_owner))
return
@@ -195,7 +195,7 @@
. = ..()
AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/roach)
-/obj/item/organ/liver/roach/on_mob_insert(mob/living/carbon/organ_owner, special)
+/obj/item/organ/liver/roach/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
if(!ishuman(organ_owner))
return
@@ -203,7 +203,7 @@
var/mob/living/carbon/human/human_owner = owner
human_owner.physiology.tox_mod *= 2
-/obj/item/organ/liver/roach/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/liver/roach/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
if(!ishuman(organ_owner) || QDELETED(organ_owner))
return
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index 437c2dbd168a6..f13b1947524fb 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -25,8 +25,8 @@
use_power = NO_POWER_USE
interaction_flags_mouse_drop = NEED_HANDS
- ///What are we sticking our needle in?
- var/atom/attached
+ /// Information and effects about where the IV drip is attached to
+ var/datum/iv_drip_attachment/attachment
///Are we donating or injecting?
var/mode = IV_INJECTING
///The chemicals flow speed
@@ -54,7 +54,7 @@
AddElement(/datum/element/noisy_movement)
/obj/machinery/iv_drip/Destroy()
- attached = null
+ QDEL_NULL(attachment)
QDEL_NULL(reagent_container)
return ..()
@@ -65,7 +65,7 @@
ui.open()
/obj/machinery/iv_drip/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
- if(attached)
+ if(attachment)
context[SCREENTIP_CONTEXT_RMB] = "Take needle out"
else if(reagent_container && !use_internal_storage)
context[SCREENTIP_CONTEXT_RMB] = "Eject container"
@@ -93,12 +93,12 @@
.["canRemoveContainer"] = !use_internal_storage
.["mode"] = mode == IV_INJECTING ? TRUE : FALSE
- .["canDraw"] = inject_only || (attached && !isliving(attached)) ? FALSE : TRUE
+ .["canDraw"] = inject_only || (attachment && !isliving(attachment.attached_to)) ? FALSE : TRUE
.["transferRate"] = transfer_rate
- .["hasObjectAttached"] = attached ? TRUE : FALSE
- if(attached)
- .["objectName"] = attached.name
+ .["hasObjectAttached"] = !!attachment
+ if(attachment)
+ .["objectName"] = attachment.attached_to.name
var/datum/reagents/drip_reagents = get_reagents()
if(drip_reagents)
@@ -131,7 +131,7 @@
update_appearance(UPDATE_ICON)
/obj/machinery/iv_drip/update_icon_state()
- if(transfer_rate > 0 && attached)
+ if(transfer_rate > 0 && attachment)
icon_state = "[base_icon_state]_[mode ? "injecting" : "donating"]"
else
icon_state = "[base_icon_state]_[mode ? "injectidle" : "donateidle"]"
@@ -143,7 +143,7 @@
if(!reagent_container)
return
- . += attached ? "beakeractive" : "beakeridle"
+ . += attachment ? "beakeractive" : "beakeridle"
var/datum/reagents/container_reagents = get_reagents()
if(!container_reagents)
return
@@ -172,9 +172,9 @@
if(!target.is_injectable(user))
to_chat(user, span_warning("Can't inject into this!"))
return
- if(attached)
- visible_message(span_warning("[attached] is detached from [src]."))
- attached = null
+ if(attachment)
+ visible_message(span_warning("[attachment.attached_to] is detached from [src]."))
+ QDEL_NULL(attachment)
update_appearance(UPDATE_ICON)
user.visible_message(span_warning("[user] attaches [src] to [target]."), span_notice("You attach [src] to [target]."))
attach_iv(target, user)
@@ -214,19 +214,21 @@
new /obj/item/stack/sheet/iron(loc)
/obj/machinery/iv_drip/process(seconds_per_tick)
- if(!attached)
+ if(!attachment)
return PROCESS_KILL
- if(!(get_dist(src, attached) <= 1 && isturf(attached.loc)))
- if(isliving(attached))
- var/mob/living/carbon/attached_mob = attached
- to_chat(attached, span_userdanger("The IV drip needle is ripped out of you, leaving an open bleeding wound!"))
+ var/atom/attached_to = attachment.attached_to
+
+ if(!(get_dist(src, attached_to) <= 1 && isturf(attached_to.loc)))
+ if(isliving(attached_to))
+ var/mob/living/carbon/attached_mob = attached_to
+ to_chat(attached_to, span_userdanger("The IV drip needle is ripped out of you, leaving an open bleeding wound!"))
var/list/arm_zones = shuffle(list(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM))
var/obj/item/bodypart/chosen_limb = attached_mob.get_bodypart(arm_zones[1]) || attached_mob.get_bodypart(arm_zones[2]) || attached_mob.get_bodypart(BODY_ZONE_CHEST)
chosen_limb.receive_damage(3)
attached_mob.cause_wound_of_type_and_severity(WOUND_PIERCE, chosen_limb, WOUND_SEVERITY_MODERATE, wound_source = "IV needle")
else
- visible_message(span_warning("[attached] is detached from [src]."))
+ visible_message(span_warning("[attached_to] is detached from [src]."))
detach_iv()
return PROCESS_KILL
@@ -240,12 +242,12 @@
// Give reagents
if(mode)
if(drip_reagents.total_volume)
- drip_reagents.trans_to(attached, transfer_rate * seconds_per_tick, methods = INJECT, show_message = FALSE) //make reagents reacts, but don't spam messages
+ drip_reagents.trans_to(attached_to, transfer_rate * seconds_per_tick, methods = INJECT, show_message = FALSE) //make reagents reacts, but don't spam messages
update_appearance(UPDATE_ICON)
// Take blood
- else if (isliving(attached))
- var/mob/living/attached_mob = attached
+ else if (isliving(attached_to))
+ var/mob/living/attached_mob = attached_to
var/amount = min(transfer_rate * seconds_per_tick, drip_reagents.maximum_volume - drip_reagents.total_volume)
// If the beaker is full, ping
if(!amount)
@@ -267,8 +269,8 @@
return
if(!ishuman(user))
return
- if(attached)
- visible_message(span_notice("[attached] is detached from [src]."))
+ if(attachment)
+ visible_message(span_notice("[attachment.attached_to] is detached from [src]."))
detach_iv()
else if(reagent_container)
eject_beaker(user)
@@ -291,7 +293,10 @@
if(isliving(target))
var/mob/living/target_mob = target
target_mob.throw_alert(ALERT_IV_CONNECTED, /atom/movable/screen/alert/iv_connected)
- attached = target
+
+ qdel(attachment)
+ attachment = new(src, target)
+
START_PROCESSING(SSmachines, src)
update_appearance(UPDATE_ICON)
@@ -299,13 +304,13 @@
///Called when an iv is detached. doesnt include chat stuff because there's multiple options and its better handled by the caller
/obj/machinery/iv_drip/proc/detach_iv()
- if(attached)
- visible_message(span_notice("[attached] is detached from [src]."))
- if(isliving(attached))
- var/mob/living/attached_mob = attached
+ if(attachment)
+ visible_message(span_notice("[attachment.attached_to] is detached from [src]."))
+ if(isliving(attachment.attached_to))
+ var/mob/living/attached_mob = attachment.attached_to
attached_mob.clear_alert(ALERT_IV_CONNECTED, /atom/movable/screen/alert/iv_connected)
- SEND_SIGNAL(src, COMSIG_IV_DETACH, attached)
- attached = null
+ SEND_SIGNAL(src, COMSIG_IV_DETACH, attachment?.attached_to)
+ QDEL_NULL(attachment)
update_appearance(UPDATE_ICON)
/// Get the reagents used by IV drip
@@ -325,8 +330,8 @@
if(usr.incapacitated)
return
if(reagent_container)
- if(attached)
- visible_message(span_warning("[attached] is detached from [src]."))
+ if(attachment)
+ visible_message(span_warning("[attachment?.attached_to] is detached from [src]."))
detach_iv()
reagent_container.forceMove(drop_location())
reagent_container = null
@@ -346,7 +351,7 @@
mode = IV_INJECTING
return
// Prevent blood draining from non-living
- if(attached && !isliving(attached))
+ if(attachment && !isliving(attachment.attached_to))
mode = IV_INJECTING
return
mode = !mode
@@ -367,7 +372,50 @@
. += span_notice("It has an internal chemical storage.")
else
. += span_notice("No chemicals are attached.")
- . += span_notice("[attached ? attached : "Nothing"] is connected.")
+ . += span_notice("[attachment ? attachment.attached_to : "Nothing"] is connected.")
+
+/// Information and effects about where an IV drip is attached to
+// Lifetime is managed by the iv_drip, which will delete the iv_drip_attachment after
+// a process if the attached object is invalid.
+// iv_drip_attachment should never outlive iv_drip.
+/datum/iv_drip_attachment
+ var/obj/machinery/iv_drip/iv_drip
+ var/atom/attached_to
+
+ VAR_PRIVATE
+ datum/beam/beam
+ datum/component/tug_towards/tug_to_me
+
+/datum/iv_drip_attachment/New(
+ obj/machinery/iv_drip/iv_drip,
+ atom/attached_to
+)
+ src.iv_drip = iv_drip
+ src.attached_to = attached_to
+
+ tug_to_me = attached_to.AddComponent(/datum/component/tug_towards, iv_drip)
+
+ beam = iv_drip.Beam(
+ attached_to,
+ icon_state = "1-full",
+ beam_color = COLOR_SILVER,
+ layer = BELOW_MOB_LAYER,
+
+ // Come out from the spout
+ override_origin_pixel_x = 9,
+ override_origin_pixel_y = 2,
+ )
+
+/datum/iv_drip_attachment/Destroy(force)
+ tug_to_me.remove_tug_target(iv_drip)
+ tug_to_me = null
+
+ iv_drip = null
+ attached_to = null
+
+ QDEL_NULL(beam)
+
+ return ..()
/datum/crafting_recipe/iv_drip
name = "IV drip"
diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm
index 9961b1d9f6fc8..2097e919247e5 100644
--- a/code/game/machinery/newscaster/newscaster_machine.dm
+++ b/code/game/machinery/newscaster/newscaster_machine.dm
@@ -590,7 +590,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30)
else
to_chat(user, span_warning("You cannot interface with silicon photo uploading!"))
if(!targetcam.stored.len)
- to_chat(usr, span_boldannounce("No images saved."))
+ to_chat(usr, span_bolddanger("No images saved."))
return
var/datum/picture/selection = targetcam.selectpicture(user)
if(selection)
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index e64e01bbcf246..32e29a2e5dd0a 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -655,7 +655,7 @@ DEFINE_BITFIELD(turret_flags, list(
//Shooting Code:
- A.preparePixelProjectile(target, T)
+ A.aim_projectile(target, T)
A.firer = src
A.fired_from = src
if(ignore_faction)
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index b90ebe54ffaf2..71817de3a1052 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -28,7 +28,7 @@
name = "thermite"
desc = "Looks hot."
icon = 'icons/effects/fire.dmi'
- icon_state = "2" //what?
+ icon_state = "medium" //what?
anchored = TRUE
plane = ABOVE_GAME_PLANE
layer = FLY_LAYER
diff --git a/code/game/objects/effects/particles/fire.dm b/code/game/objects/effects/particles/fire.dm
index 9904685807364..481849c00eb1d 100644
--- a/code/game/objects/effects/particles/fire.dm
+++ b/code/game/objects/effects/particles/fire.dm
@@ -34,6 +34,9 @@
spin = generator(GEN_NUM, list(-15,15), NORMAL_RAND)
scale = generator(GEN_VECTOR, list(0.5,0.5), list(2,2), NORMAL_RAND)
+/particles/embers/minor
+ spawning = 1
+
/particles/embers/spark
count = 3
spawning = 2
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index 21a51ba9bcb42..dbb5ad3d8bdba 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -146,6 +146,7 @@
var/turf/real_target = get_link_target_turf()
if(!istype(real_target))
return FALSE
+
if(!force && (!ismecha(moving) && !isprojectile(moving) && moving.anchored && !allow_anchored))
return
var/no_effect = FALSE
@@ -156,8 +157,8 @@
var/turf/start_turf = get_turf(moving)
if(do_teleport(moving, real_target, innate_accuracy_penalty, no_effects = no_effect, channel = teleport_channel, forced = force_teleport))
if(isprojectile(moving))
- var/obj/projectile/P = moving
- P.ignore_source_check = TRUE
+ var/obj/projectile/proj = moving
+ proj.ignore_source_check = TRUE
new /obj/effect/temp_visual/portal_animation(start_turf, src, moving)
playsound(start_turf, SFX_PORTAL_ENTER, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
playsound(real_target, SFX_PORTAL_ENTER, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
diff --git a/code/game/objects/effects/shared_particle_holder.dm b/code/game/objects/effects/shared_particle_holder.dm
new file mode 100644
index 0000000000000..2fe0c97647986
--- /dev/null
+++ b/code/game/objects/effects/shared_particle_holder.dm
@@ -0,0 +1,89 @@
+#define SHARED_PARTICLE_HOLDER_INDEX 1
+#define SHARED_PARTICLE_USER_NUM_INDEX 2
+// Assoc list of particle type/key -> list(list of particle holders, number of particle users)
+GLOBAL_LIST_EMPTY(shared_particles)
+
+//A more abstract version of particle holder not bound to a specific object
+/obj/effect/abstract/shared_particle_holder
+ name = "shared particle holder"
+ desc = "How are you reading this? Please make a bug report :)"
+ appearance_flags = KEEP_APART|KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
+ vis_flags = VIS_INHERIT_PLANE
+ layer = ABOVE_ALL_MOB_LAYER
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ anchored = TRUE
+ /// Holds info about how this particle emitter works
+ /// See \code\__DEFINES\particles.dm
+ var/particle_flags = NONE
+
+/obj/effect/abstract/shared_particle_holder/Initialize(mapload, particle_path = /particles/smoke, particle_flags = NONE)
+ . = ..()
+ // Shouldn't exist outside of nullspace
+ loc = null
+ src.particle_flags = particle_flags
+ particles = new particle_path()
+
+/obj/effect/abstract/shared_particle_holder/Destroy(force)
+ QDEL_NULL(particles)
+ return ..()
+
+/* Adds (or creates and adds) a shared particle holder
+ * Shared particle holders are held in nullspace and added to vis_contents of all atoms using it
+ * in order to save clientside performance by making clients only render 3-5 particle holders
+ * for 400 objects using them. This should be prioritized over normal particles when possible if it is known
+ * that there will be a lot of objects using certain particles.
+ * custom_key can be used to create a new pool of already existing particle type in case you're planning to edit holder's color or properties
+ * pool_size controls how many particle holders per type are created. Any objects over this cap will pick an existing holder from the pool
+ */
+/atom/movable/proc/add_shared_particles(particle_type, custom_key = null, particle_flags = NONE, pool_size = 3)
+ var/particle_key = custom_key || "[particle_type]"
+ if (!GLOB.shared_particles[particle_key])
+ GLOB.shared_particles[particle_key] = list(list(new /obj/effect/abstract/shared_particle_holder(null, particle_type, particle_flags)), 1)
+ vis_contents += GLOB.shared_particles[particle_key][SHARED_PARTICLE_HOLDER_INDEX][1]
+ return GLOB.shared_particles[particle_key][SHARED_PARTICLE_HOLDER_INDEX][1]
+
+ var/list/type_holders = GLOB.shared_particles[particle_key][SHARED_PARTICLE_HOLDER_INDEX]
+ for (var/obj/effect/abstract/shared_particle_holder/particle_holder as anything in type_holders)
+ if (particle_holder in vis_contents)
+ return particle_holder
+
+ if (length(type_holders) < pool_size)
+ var/obj/effect/abstract/shared_particle_holder/new_holder = new(null, particle_type, particle_flags)
+ type_holders += new_holder
+ vis_contents += new_holder
+ GLOB.shared_particles[particle_key][SHARED_PARTICLE_USER_NUM_INDEX] += 1
+ return new_holder
+
+ var/obj/effect/abstract/shared_particle_holder/particle_holder = pick(type_holders)
+ vis_contents += particle_holder
+ GLOB.shared_particles[particle_key][SHARED_PARTICLE_USER_NUM_INDEX] += 1
+ return particle_holder
+
+/* Removes shared particles from object's vis_contents and disposes of it if nothing uses that type/key of particle
+ * particle_key can be either a type (if no custom_key was passed) or said custom_key
+ */
+/atom/movable/proc/remove_shared_particles(particle_key, delete_on_empty = TRUE)
+ if (!particle_key)
+ return
+
+ if (ispath(particle_key))
+ particle_key = "[particle_key]"
+
+ if (!GLOB.shared_particles[particle_key])
+ return
+
+ var/list/type_holders = GLOB.shared_particles[particle_key][SHARED_PARTICLE_HOLDER_INDEX]
+ for (var/obj/effect/abstract/shared_particle_holder/particle_holder as anything in type_holders)
+ if (!(particle_holder in vis_contents))
+ continue
+
+ vis_contents -= particle_holder
+ GLOB.shared_particles[particle_key][SHARED_PARTICLE_USER_NUM_INDEX] -= 1
+
+ if (delete_on_empty && GLOB.shared_particles[particle_key][SHARED_PARTICLE_USER_NUM_INDEX] <= 0)
+ QDEL_LIST(type_holders)
+ GLOB.shared_particles -= particle_key
+ return
+
+#undef SHARED_PARTICLE_HOLDER_INDEX
+#undef SHARED_PARTICLE_USER_NUM_INDEX
diff --git a/code/game/objects/effects/spawners/random/structure.dm b/code/game/objects/effects/spawners/random/structure.dm
index 289a2aba27600..a83b88c3a9863 100644
--- a/code/game/objects/effects/spawners/random/structure.dm
+++ b/code/game/objects/effects/spawners/random/structure.dm
@@ -260,22 +260,117 @@
)
/obj/effect/spawner/random/structure/shipping_container
- name = "shipping container spawner"
+ name = "random shipping container spawner"
icon = 'icons/obj/fluff/containers.dmi'
icon_state = "random_container"
loot = list(
+ /obj/structure/shipping_container = 3,
+ /obj/structure/shipping_container/amsco = 3,
+ /obj/structure/shipping_container/blue = 3,
/obj/structure/shipping_container/conarex = 3,
/obj/structure/shipping_container/deforest = 3,
- /obj/structure/shipping_container/kahraman = 3,
- /obj/structure/shipping_container/kahraman/alt = 3,
+ /obj/structure/shipping_container/defaced = 3,
+ /obj/structure/shipping_container/great_northern = 3,
+ /obj/structure/shipping_container/green = 3,
+ /obj/structure/shipping_container/kahraman = 2,
+ /obj/structure/shipping_container/kahraman/alt = 1,
/obj/structure/shipping_container/kosmologistika = 3,
- /obj/structure/shipping_container/interdyne = 3,
+ /obj/structure/shipping_container/magenta = 3,
/obj/structure/shipping_container/nakamura = 3,
/obj/structure/shipping_container/nanotrasen = 3,
- /obj/structure/shipping_container/nthi = 3,
- /obj/structure/shipping_container/vitezstvi = 3,
+ /obj/structure/shipping_container/ntfid = 2,
+ /obj/structure/shipping_container/ntfid/defaced = 1,
+ /obj/structure/shipping_container/nthi = 1,
+ /obj/structure/shipping_container/nthi/minor = 1,
+ /obj/structure/shipping_container/nthi/precious = 1,
+ /obj/structure/shipping_container/orange = 3,
+ /obj/structure/shipping_container/purple = 3,
+ /obj/structure/shipping_container/red = 3,
+ /obj/structure/shipping_container/sunda = 3,
+ /obj/structure/shipping_container/vitezstvi = 2,
+ /obj/structure/shipping_container/vitezstvi/flags = 1,
+ /obj/structure/shipping_container/yellow = 3,
+ /obj/structure/shipping_container/biosustain = 3,
/obj/structure/shipping_container/cybersun = 2,
- /obj/structure/shipping_container/donk_co = 2,
- /obj/structure/shipping_container/gorlex = 1,
+ /obj/structure/shipping_container/cybersun/defaced = 1,
+ /obj/structure/shipping_container/donk_co = 3,
+ /obj/structure/shipping_container/exagon = 1,
+ /obj/structure/shipping_container/exagon/minor = 1,
+ /obj/structure/shipping_container/exagon/precious = 1,
+ /obj/structure/shipping_container/gorlex = 2,
+ /obj/structure/shipping_container/gorlex/red = 1,
+ /obj/structure/shipping_container/interdyne = 3,
+ /obj/structure/shipping_container/oms = 3,
+ /obj/structure/shipping_container/tiger_coop = 2,
+ /obj/structure/shipping_container/tiger_coop = 1,
+ )
+
+/obj/effect/spawner/random/structure/shipping_container/blank
+ name = "random blank shipping container spawner"
+ loot = list(
+ /obj/structure/shipping_container = 3,
+ /obj/structure/shipping_container/blue = 3,
+ /obj/structure/shipping_container/green = 3,
+ /obj/structure/shipping_container/magenta = 3,
+ /obj/structure/shipping_container/orange = 3,
+ /obj/structure/shipping_container/purple = 3,
+ /obj/structure/shipping_container/red = 3,
+ /obj/structure/shipping_container/yellow = 3,
+ )
+
+/obj/effect/spawner/random/structure/syndicate //syndicate containers only
+ name = "random syndicate shipping container spawner"
+ loot = list(
+ /obj/structure/shipping_container/biosustain = 3,
+ /obj/structure/shipping_container/cybersun = 2,
+ /obj/structure/shipping_container/cybersun/defaced = 1,
+ /obj/structure/shipping_container/donk_co = 3,
+ /obj/structure/shipping_container/exagon = 1,
+ /obj/structure/shipping_container/exagon/minor = 1,
+ /obj/structure/shipping_container/exagon/precious = 1,
+ /obj/structure/shipping_container/gorlex = 2,
/obj/structure/shipping_container/gorlex/red = 1,
+ /obj/structure/shipping_container/interdyne = 3,
+ /obj/structure/shipping_container/oms = 3,
+ /obj/structure/shipping_container/tiger_coop = 2,
+ /obj/structure/shipping_container/tiger_coop = 1,
+ )
+
+/obj/effect/spawner/random/structure/shipping_container/station_appropriate //places extra emphasis on NT containers, excludes syndicate companies (except Donk. Co.) entirely
+ name = "station-appropriate shipping container spawner"
+ loot = list(
+ /obj/structure/shipping_container/nanotrasen = 5,
+ /obj/structure/shipping_container/nthi = 1,
+ /obj/structure/shipping_container/nthi/minor = 1,
+ /obj/structure/shipping_container/nthi/precious = 1,
+ /obj/structure/shipping_container/ntfid = 3,
+ /obj/structure/shipping_container/nakamura = 2,
+ /obj/structure/shipping_container/deforest = 2,
+ /obj/structure/shipping_container/kosmologistika = 2,
+ /obj/structure/shipping_container/donk_co = 2,
+ /obj/structure/shipping_container/amsco = 1,
+ /obj/structure/shipping_container/conarex = 1,
+ /obj/structure/shipping_container/kahraman = 1,
+ /obj/structure/shipping_container/kahraman/alt = 1,
+ /obj/structure/shipping_container/sunda = 1,
+ /obj/structure/shipping_container/vitezstvi = 1,
+ )
+
+/obj/effect/spawner/random/structure/shipping_container/reefer //reefers only
+ name = "random reefer container spawner"
+ loot = list(
+ /obj/structure/shipping_container/reefer = 3,
+ /obj/structure/shipping_container/reefer/biosustain = 3,
+ /obj/structure/shipping_container/reefer/deforest = 3,
+ /obj/structure/shipping_container/reefer/interdyne = 3,
+ )
+
+/obj/effect/spawner/random/structure/shipping_container/gas //gas cisterns only
+ name = "random gas cistern spawner"
+ loot = list(
+ /obj/structure/shipping_container/gas = 3,
+ /obj/structure/shipping_container/gas/apda = 3,
+ /obj/structure/shipping_container/gas/apda/hydrogen = 3,
+ /obj/structure/shipping_container/gas/exagon = 3,
+ /obj/structure/shipping_container/gas/nthi = 3,
)
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index ae2ce27b100f6..f132c7a01537d 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -57,6 +57,12 @@
icon_state = "firing_effect"
duration = 3
+/obj/effect/temp_visual/dir_setting/firing_effect/Initialize(mapload, set_dir)
+ . = ..()
+ if (ismovable(loc))
+ var/atom/movable/spawned_inside = loc
+ spawned_inside.vis_contents += src
+
/obj/effect/temp_visual/dir_setting/firing_effect/setDir(newdir)
switch(newdir)
if(NORTH)
@@ -245,7 +251,7 @@
/obj/effect/temp_visual/fire
icon = 'icons/effects/fire.dmi'
- icon_state = "3"
+ icon_state = "heavy"
light_range = LIGHT_RANGE_FIRE
light_color = LIGHT_COLOR_FIRE
duration = 10
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm b/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm
index 2d112aa205909..e9e043a598173 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm
@@ -36,26 +36,19 @@
apply_vars(angle_override, p_x, p_y, color_override, scaling)
return ..()
-/obj/effect/projectile/proc/apply_vars(angle_override, p_x = 0, p_y = 0, color_override, scaling = 1, atom/new_loc, increment = 0)
- var/mutable_appearance/look = new(src)
- SET_PLANE_EXPLICIT(look, plane, new_loc || src)
- look.pixel_x = p_x
- look.pixel_y = p_y
+/obj/effect/projectile/proc/apply_vars(angle_override, p_x = 0, p_y = 0, color_override, scaling = 1, increment = 0)
+ pixel_x = p_x
+ pixel_y = p_y
if(color_override)
- look.color = color_override
- appearance = look
- scale_to(1,scaling, FALSE)
+ color = color_override
+ scale_to(1, scaling, FALSE)
turn_to(angle_override, FALSE)
- if(!isnull(new_loc)) //If you want to null it just delete it...
- forceMove(new_loc)
for(var/i in 1 to increment)
pixel_x += round((sin(angle_override)+16*sin(angle_override)*2), 1)
pixel_y += round((cos(angle_override)+16*cos(angle_override)*2), 1)
-/obj/effect/projectile_lighting
- var/owner
+/obj/effect/abstract/projectile_lighting
-/obj/effect/projectile_lighting/Initialize(mapload, color, range, intensity, owner_key)
+/obj/effect/abstract/projectile_lighting/Initialize(mapload, color, range, intensity)
. = ..()
set_light(range, intensity, color)
- owner = owner_key
diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
index 8c4ea163232e1..e2323ce4413f9 100644
--- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
+++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
@@ -1,25 +1,3 @@
-/proc/generate_tracer_between_points(datum/point/starting, datum/point/ending, beam_type, color, qdel_in = 5, light_range = 2, light_color_override, light_intensity = 1, instance_key) //Do not pass z-crossing points as that will not be properly (and likely will never be properly until it's absolutely needed) supported!
- if(!istype(starting) || !istype(ending) || !ispath(beam_type))
- return
- var/datum/point/midpoint = point_midpoint_points(starting, ending)
- var/obj/effect/projectile/tracer/PB = new beam_type
- if(isnull(light_color_override))
- light_color_override = color
- PB.apply_vars(angle_between_points(starting, ending), midpoint.return_px(), midpoint.return_py(), color, pixel_length_between_points(starting, ending) / ICON_SIZE_ALL, midpoint.return_turf(), 0)
- . = PB
- if(light_range > 0 && light_intensity > 0)
- var/list/turf/line = get_line(starting.return_turf(), ending.return_turf())
- tracing_line:
- for(var/i in line)
- var/turf/T = i
- for(var/obj/effect/projectile_lighting/PL in T)
- if(PL.owner == instance_key)
- continue tracing_line
- QDEL_IN(new /obj/effect/projectile_lighting(T, light_color_override, light_range, light_intensity, instance_key), qdel_in > 0? qdel_in : 5)
- line = null
- if(qdel_in)
- QDEL_IN(PB, qdel_in)
-
/obj/effect/projectile/tracer
name = "beam"
icon = 'icons/obj/weapons/guns/projectiles_tracer.dmi'
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 1a9306ca24f6b..d35194c467449 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -27,7 +27,7 @@
///Icon state for mob worn overlays, if null the normal icon_state will be used.
var/worn_icon_state
///Icon state for the belt overlay, if null the normal icon_state will be used.
- var/belt_icon_state
+ var/inside_belt_icon_state
///Forced mob worn layer instead of the standard preferred size.
var/alternate_worn_layer
///The config type to use for greyscaled worn sprites. Both this and greyscale_colors must be assigned to work.
@@ -259,8 +259,10 @@
/// Has the item been reskinned?
var/current_skin
- ///// List of options to reskin.
+ /// List of options to reskin.
var/list/unique_reskin
+ /// If reskins change inhands as well
+ var/unique_reskin_changes_inhand = FALSE
/// Do we apply a click cooldown when resisting this object if it is restraining them?
var/resist_cooldown = CLICK_CD_BREAKOUT
@@ -943,7 +945,7 @@
/// Returns the icon used for overlaying the object on a belt
/obj/item/proc/get_belt_overlay()
- var/icon_state_to_use = belt_icon_state || icon_state
+ var/icon_state_to_use = inside_belt_icon_state || icon_state
if(greyscale_config_belt && greyscale_colors)
return mutable_appearance(SSgreyscale.GetColoredIconByType(greyscale_config_belt, greyscale_colors), icon_state_to_use)
return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state_to_use)
diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm
index d5769ceb8d798..7a8d70888f066 100644
--- a/code/game/objects/items/body_egg.dm
+++ b/code/game/objects/items/body_egg.dm
@@ -15,14 +15,14 @@
if(iscarbon(loc))
Insert(loc)
-/obj/item/organ/body_egg/mob_insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED)
+/obj/item/organ/body_egg/on_mob_insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags)
. = ..()
egg_owner.add_traits(list(TRAIT_XENO_HOST, TRAIT_XENO_IMMUNE), ORGAN_TRAIT)
egg_owner.med_hud_set_status()
INVOKE_ASYNC(src, PROC_REF(AddInfectionImages), egg_owner)
-/obj/item/organ/body_egg/mob_remove(mob/living/carbon/egg_owner, special, movement_flags)
+/obj/item/organ/body_egg/on_mob_remove(mob/living/carbon/egg_owner, special, movement_flags)
. = ..()
egg_owner.remove_traits(list(TRAIT_XENO_HOST, TRAIT_XENO_IMMUNE), ORGAN_TRAIT)
egg_owner.med_hud_set_status()
diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm
index f2d81ac4bde1d..8045646b075ca 100644
--- a/code/game/objects/items/chainsaw.dm
+++ b/code/game/objects/items/chainsaw.dm
@@ -68,6 +68,8 @@
toolspeed = active ? 0.5 : initial(toolspeed)
update_item_action_buttons()
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
/obj/item/chainsaw/suicide_act(mob/living/carbon/user)
if(!HAS_TRAIT(src, TRAIT_TRANSFORM_ACTIVE))
user.visible_message(span_suicide("[user] smashes [src] into [user.p_their()] neck, destroying [user.p_their()] esophagus! It looks like [user.p_theyre()] trying to commit suicide!"))
diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index dd5d78fce0d61..70fb3bb6693c2 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -365,7 +365,7 @@
if(!req_defib)
return
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(check_range))
- RegisterSignal(defib.loc, COMSIG_MOVABLE_MOVED, PROC_REF(check_range))
+ RegisterSignal(defib, COMSIG_MOVABLE_MOVED, PROC_REF(check_range))
/obj/item/shockpaddles/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
. = ..()
@@ -430,9 +430,9 @@
/obj/item/shockpaddles/dropped(mob/user)
. = ..()
+ UnregisterSignal(defib, COMSIG_MOVABLE_MOVED)
if(user)
UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
- UnregisterSignal(defib.loc, COMSIG_MOVABLE_MOVED)
if(req_defib)
if(user)
to_chat(user, span_notice("The paddles snap back into the main unit."))
@@ -558,7 +558,7 @@
playsound(src, 'sound/machines/defib/defib_failed.ogg', 50, FALSE)
do_cancel()
return
- user.visible_message(span_boldannounce("[user] shocks [H] with \the [src]!"), span_warning("You shock [H] with \the [src]!"))
+ user.visible_message(span_bolddanger("[user] shocks [H] with \the [src]!"), span_warning("You shock [H] with \the [src]!"))
playsound(src, 'sound/machines/defib/defib_zap.ogg', 100, TRUE, -1)
playsound(src, 'sound/items/weapons/egloves.ogg', 100, TRUE, -1)
H.emote("scream")
diff --git a/code/game/objects/items/devices/broadcast_camera.dm b/code/game/objects/items/devices/broadcast_camera.dm
index 78868844e48cb..40f8fe0a87154 100644
--- a/code/game/objects/items/devices/broadcast_camera.dm
+++ b/code/game/objects/items/devices/broadcast_camera.dm
@@ -13,7 +13,7 @@
force = 8
throwforce = 12
w_class = WEIGHT_CLASS_NORMAL
- obj_flags = INDESTRUCTIBLE | EMP_PROTECT_ALL // No fun police
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
slot_flags = NONE
light_system = OVERLAY_LIGHT
light_color = COLOR_SOFT_RED
@@ -33,6 +33,11 @@
/// The "virtual" radio inside of the the physical camera, a la microphone
var/obj/item/radio/entertainment/microphone/internal_radio
+/obj/item/broadcast_camera/Initialize(mapload)
+ . = ..()
+
+ AddElement(/datum/element/empprotection, EMP_PROTECT_ALL)
+
/obj/item/broadcast_camera/Destroy(force)
QDEL_NULL(internal_radio)
QDEL_NULL(internal_camera)
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index e323c65b1ebc1..4d538f46184d9 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -204,7 +204,7 @@
var/turf/our_turf = get_turf(src)
detect_state = PROXIMITY_NONE
- for(var/mob/eye/ai_eye/AI_eye as anything in GLOB.aiEyes)
+ for(var/mob/eye/camera/ai/AI_eye as anything in GLOB.camera_eyes)
if(!AI_eye.ai_detector_visible)
continue
@@ -253,7 +253,7 @@
// copied from camera chunks but we are doing a really big edge case here though
/obj/item/multitool/ai_detect/proc/surrounding_chunks(turf/epicenter)
. = list()
- var/static_range = /mob/eye/ai_eye::static_visibility_range
+ var/static_range = /mob/eye/camera/ai::static_visibility_range
var/x1 = max(1, epicenter.x - static_range)
var/y1 = max(1, epicenter.y - static_range)
var/x2 = min(world.maxx, epicenter.x + static_range)
@@ -283,7 +283,7 @@
desc = "An omni-technological interface."
icon = 'icons/obj/antags/abductor.dmi'
icon_state = "multitool"
- belt_icon_state = "multitool_alien"
+ inside_belt_icon_state = "multitool_alien"
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 1.25, /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/titanium = SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SHEET_MATERIAL_AMOUNT)
toolspeed = 0.1
diff --git a/code/game/objects/items/devices/scanners/gas_analyzer.dm b/code/game/objects/items/devices/scanners/gas_analyzer.dm
index 745c855e2fc71..7d58838fc2135 100644
--- a/code/game/objects/items/devices/scanners/gas_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/gas_analyzer.dm
@@ -183,8 +183,8 @@
var/icon = target
var/message = list()
- playsound(user, SFX_INDUSTRIAL_SCAN, 20, TRUE, -2, TRUE, FALSE)
if(!silent && isliving(user))
+ playsound(user, SFX_INDUSTRIAL_SCAN, 20, TRUE, -2, TRUE, FALSE)
user.visible_message(span_notice("[user] uses the analyzer on [icon2html(icon, viewers(user))] [target]."), span_notice("You use the analyzer on [icon2html(icon, user)] [target]."))
message += span_boldnotice("Results of analysis of [icon2html(icon, user)] [target].")
diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm
index e2fe6de338aaf..dd75928cb2d16 100644
--- a/code/game/objects/items/devices/scanners/health_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/health_analyzer.dm
@@ -469,7 +469,7 @@
var/datum/reagent/reagent = r
if(reagent.chemical_flags & REAGENT_INVISIBLE) //Don't show hidden chems on scanners
continue
- render_block += "[round(reagent.volume, 0.001)] units of [reagent.name][reagent.overdosed ? " - [span_boldannounce("OVERDOSING")]" : "."][round(reagent.volume, 0.001)] units of [reagent.name][reagent.overdosed ? " - [span_bolddanger("OVERDOSING")]" : "."]Subject contains no reagents in their blood. [round(bit.volume, 0.001)] units of [bit.name][bit.overdosed ? " - [span_boldannounce("OVERDOSING")]" : "."][round(bit.volume, 0.001)] units of [bit.name][bit.overdosed ? " - [span_bolddanger("OVERDOSING")]" : "."][round(bit_vol, 0.001)] units of [bit.name][bit.overdosed ? " - [span_boldannounce("OVERDOSING")]" : "."][round(bit_vol, 0.001)] units of [bit.name][bit.overdosed ? " - [span_bolddanger("OVERDOSING")]" : "."]Subject contains no reagents in their stomach. how many you've killed."))
+ to_chat(user, span_notice("You've lost count of how many you've killed."))
new_name = "many-notched claymore"
add_atom_colour(rgb(255, 195, 195), ADMIN_COLOUR_PRIORITY)
if(5)
- to_chat(user, span_boldannounce("Five voices now echo in your mind, cheering the slaughter."))
+ to_chat(user, span_bolddanger("Five voices now echo in your mind, cheering the slaughter."))
new_name = "battle-tested claymore"
add_atom_colour(rgb(255, 175, 175), ADMIN_COLOUR_PRIORITY)
if(6)
- to_chat(user, span_boldannounce("Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe."))
+ to_chat(user, span_bolddanger("Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe."))
new_name = "battle-scarred claymore"
add_atom_colour(rgb(255, 155, 155), ADMIN_COLOUR_PRIORITY)
if(7)
- to_chat(user, span_boldannounce("Kill. Butcher. Conquer. "))
+ to_chat(user, span_bolddanger("Kill. Butcher. Conquer. "))
new_name = "vicious claymore"
add_atom_colour(rgb(255, 135, 135), ADMIN_COLOUR_PRIORITY)
if(8)
@@ -437,6 +437,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
icon = 'icons/obj/weapons/hammer.dmi'
icon_state = "carpenter_hammer"
inhand_icon_state = "carpenter_hammer"
+ worn_icon_state = "clawhammer" //plaecholder
lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi'
desc = "Uncanny looking hammer."
@@ -446,6 +447,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_NORMAL
wound_bonus = 20
demolition_mod = 1.25
+ slot_flags = ITEM_SLOT_BELT
/obj/item/carpenter_hammer/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items_reskin.dm b/code/game/objects/items_reskin.dm
index f8bffa7bf5f63..b73df0a487b72 100644
--- a/code/game/objects/items_reskin.dm
+++ b/code/game/objects/items_reskin.dm
@@ -64,6 +64,8 @@
return
current_skin = pick
icon_state = unique_reskin[pick]
+ if (unique_reskin_changes_inhand)
+ inhand_icon_state = icon_state
to_chat(user, "[src] is now skinned as '[pick].'")
SEND_SIGNAL(src, COMSIG_OBJ_RESKIN, user, pick)
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 77f670bf9fc92..45bc7f9110636 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -1,7 +1,11 @@
-/obj/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
+/obj/hitby(atom/movable/hit_by, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
..()
- take_damage(AM.throwforce, BRUTE, MELEE, 1, get_dir(src, AM))
+ var/damage_taken = hit_by.throwforce
+ if(isitem(hit_by))
+ var/obj/item/as_item = hit_by
+ damage_taken *= as_item.demolition_mod
+ take_damage(damage_taken, BRUTE, MELEE, 1, get_dir(src, hit_by))
/obj/ex_act(severity, target)
if(resistance_flags & INDESTRUCTIBLE)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 7c8173fae3653..40713320eeb10 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -206,10 +206,10 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag)
SHOULD_CALL_PARENT(FALSE)
CRASH("Unimplemented.")
-/obj/handle_ricochet(obj/projectile/P)
+/obj/handle_ricochet(obj/projectile/proj)
. = ..()
if(. && receive_ricochet_damage_coeff)
- take_damage(P.damage * receive_ricochet_damage_coeff, P.damage_type, P.armor_flag, 0, REVERSE_DIR(P.dir), P.armour_penetration) // pass along receive_ricochet_damage_coeff damage to the structure for the ricochet
+ take_damage(proj.damage * receive_ricochet_damage_coeff, proj.damage_type, proj.armor_flag, 0, REVERSE_DIR(proj.dir), proj.armour_penetration) // pass along receive_ricochet_damage_coeff damage to the structure for the ricochet
/// Handles exposing an object to reagents.
/obj/expose_reagents(list/reagents, datum/reagents/source, methods=TOUCH, volume_modifier=1, show_message=TRUE)
diff --git a/code/game/objects/structures/construction_console/construction_actions.dm b/code/game/objects/structures/construction_console/construction_actions.dm
index b3a4e309ffa96..cce7d2ee51628 100644
--- a/code/game/objects/structures/construction_console/construction_actions.dm
+++ b/code/game/objects/structures/construction_console/construction_actions.dm
@@ -5,7 +5,7 @@
/datum/action/innate/construction
button_icon = 'icons/mob/actions/actions_construction.dmi'
///Console's eye mob
- var/mob/eye/ai_eye/remote/base_construction/remote_eye
+ var/mob/eye/camera/remote/base_construction/remote_eye
///Console itself
var/obj/machinery/computer/camera_advanced/base_construction/base_console
///Is this used to build only on the station z level?
diff --git a/code/game/objects/structures/construction_console/construction_console.dm b/code/game/objects/structures/construction_console/construction_console.dm
index 97b83acccae06..69275d0e95133 100644
--- a/code/game/objects/structures/construction_console/construction_console.dm
+++ b/code/game/objects/structures/construction_console/construction_console.dm
@@ -1,7 +1,7 @@
/**
* Camera console used to control a base building drone
*
- * Using this console will put the user in control of a [base building drone][/mob/eye/ai_eye/remote/base_construction].
+ * Using this console will put the user in control of a [base building drone][/mob/eye/camera/remote/base_construction].
* The drone will appear somewhere within the allowed_area var, or if no area is specified, at the location of the console.area
* Upon interacting, the user will be granted a set of base building actions that will generally be carried out at the drone's location.
* To create a new base builder system, this class should be the only thing that needs to be subtyped.
@@ -61,8 +61,7 @@
var/turf/spawn_spot = find_spawn_spot()
if (!spawn_spot)
return FALSE
- eyeobj = new /mob/eye/ai_eye/remote/base_construction(spawn_spot, src)
- eyeobj.origin = src
+ eyeobj = new /mob/eye/camera/remote/base_construction(spawn_spot, src)
return TRUE
/obj/machinery/computer/camera_advanced/base_construction/attackby(obj/item/W, mob/user, params)
@@ -95,7 +94,7 @@
* The mob is constrained to a given area defined by the base construction console.
*
*/
-/mob/eye/ai_eye/remote/base_construction
+/mob/eye/camera/remote/base_construction
name = "construction holo-drone"
//Allows any curious crew to watch the base after it leaves. (This is safe as the base cannot be modified once it leaves)
move_on_shuttle = TRUE
@@ -105,20 +104,20 @@
///Reference to the camera console controlling this drone
var/obj/machinery/computer/camera_advanced/base_construction/linked_console
-/mob/eye/ai_eye/remote/base_construction/Initialize(mapload, obj/machinery/computer/camera_advanced/console_link)
+/mob/eye/camera/remote/base_construction/Initialize(mapload, obj/machinery/computer/camera_advanced/console_link)
linked_console = console_link
if(!linked_console)
stack_trace("A base consturuction drone was created with no linked console")
return INITIALIZE_HINT_QDEL
return ..()
-/mob/eye/ai_eye/remote/base_construction/setLoc(turf/destination, force_update = FALSE)
+/mob/eye/camera/remote/base_construction/setLoc(turf/destination, force_update = FALSE)
var/area/curr_area = get_area(destination)
//Only move if we're in the allowed area. If no allowed area is defined, then we're free to move wherever.
if(!linked_console.allowed_area || istype(curr_area, linked_console.allowed_area))
return ..()
-/mob/eye/ai_eye/remote/base_construction/relaymove(mob/living/user, direction)
+/mob/eye/camera/remote/base_construction/relaymove(mob/living/user, direction)
//This camera eye is visible, and as such needs to keep its dir updated
dir = direction
return ..()
diff --git a/code/game/objects/structures/containers.dm b/code/game/objects/structures/containers.dm
index bf56f7850f82d..965d74ae94d09 100644
--- a/code/game/objects/structures/containers.dm
+++ b/code/game/objects/structures/containers.dm
@@ -2,7 +2,7 @@
name = "shipping container"
desc = "A standard-measure shipping container for bulk transport of goods. This one is blank, offering no clue as to its contents."
icon = 'icons/obj/fluff/containers.dmi'
- icon_state = "container_blank"
+ icon_state = "blank"
max_integrity = 1000
bound_width = 96
bound_height = 32
@@ -16,19 +16,40 @@
AddComponent(/datum/component/seethrough, SEE_THROUGH_MAP_SHIPPING_CONTAINER)
+/obj/structure/shipping_container/amsco
+ name = "\improper AMSCO shipping container"
+ desc = "A standard-measure shipping container for bulk transport of goods. This one is from Amundsen-Scott, and so is probably carrying prospecting gear."
+ icon_state = "amsco"
+
+/obj/structure/shipping_container/blue
+ icon_state = "blue"
+
/obj/structure/shipping_container/conarex
name = "\improper Conarex Aeronautics shipping container"
desc = "A standard-measure shipping container for bulk transport of goods. This one is from Conarex Aeronautics, and is probably carrying spacecraft parts (or a bribery scandal) as a result."
icon_state = "conarex"
+/obj/structure/shipping_container/defaced
+ name = "defaced shipping container"
+ desc = "A standard-measure shipping container for bulk transport of goods. This one's covered in tasteful graffiti."
+ icon_state = "defaced"
+
/obj/structure/shipping_container/deforest
- name = "\improper DeForest Medical Corp. shipping container"
- desc = "A standard-measure shipping container for bulk transport of goods. This one is from DeForest, and so is probably carrying medical supplies."
+ name = "\improper Nanotrasen-DeForest shipping container"
+ desc = "A standard-measure shipping container for bulk transport of goods. This one is from Nanotrasen-DeForest, and so is probably carrying medical supplies."
icon_state = "deforest"
+/obj/structure/shipping_container/great_northern
+ name = "\improper Great Northern shipping container"
+ desc = "A standard-measure shipping container for bulk transport of goods. This one is from Great Northern, and is probably carrying farming equipment."
+ icon_state = "great_northern"
+
+/obj/structure/shipping_container/green
+ icon_state = "green"
+
/obj/structure/shipping_container/kahraman
name = "\improper Kahraman Heavy Industry shipping container"
- desc = "A standard-measure shipping container for bulk transport of goods. This one is from Kahraman, and is reinforced for carrying ore."
+ desc = "A standard-measure shipping container for bulk transport of goods. This one is from Kahraman, and is reinforced for carrying mining equipment."
icon_state = "kahraman"
/obj/structure/shipping_container/kahraman/alt
@@ -36,13 +57,11 @@
/obj/structure/shipping_container/kosmologistika
name = "\improper Kosmologistika shipping container"
- desc = "A standard-measure shipping container for bulk transport of goods. This one is from Kosmologistika, the logistics company owned and operated by the SSC."
+ desc = "A standard-measure shipping container for bulk transport of goods. This one is from Kosmologistika, the state logistics company owned and operated by the SSC."
icon_state = "kosmologistika"
-/obj/structure/shipping_container/interdyne
- name = "\improper Interdyne shipping container"
- desc = "A standard-measure shipping container for bulk transport of goods. This one is from Interdyne, a private pharmaceutical company. Probably carrying medical or research supplies, probably."
- icon_state = "interdyne"
+/obj/structure/shipping_container/magenta
+ icon_state = "magenta"
/obj/structure/shipping_container/nakamura
name = "\improper Nakamura Engineering shipping container"
@@ -54,27 +73,86 @@
desc = "A standard-measure shipping container for bulk transport of goods. This one prominently features Nanotrasen's logo, and so presumably could be carrying anything."
icon_state = "nanotrasen"
+/obj/structure/shipping_container/ntfid
+ name = "\improper Nanotrasen Futures and Innovation shipping container"
+ desc = "A standard-measure shipping container for bulk transport of goods. This one is from NTFID: Nanotrasen's research and development subdivision."
+ icon_state = "ntfid"
+
+/obj/structure/shipping_container/ntfid/defaced
+ desc = "A standard-measure shipping container for bulk transport of goods. Someone clearly has a bone to pick with NTFID."
+ icon_state = "ntfid_defaced"
+
/obj/structure/shipping_container/nthi
name = "\improper Nanotrasen Heavy Industries shipping container"
- desc = "A standard-measure shipping container for bulk transport of goods. This one is from NTHI: Nanotrasen's mining and refining subdivision."
+ desc = "A standard-measure shipping container for bulk transport of common metals and minerals. This one is from NTHI: Nanotrasen's mining and refining subdivision."
icon_state = "nthi"
+/obj/structure/shipping_container/nthi/minor
+ desc = "A standard-measure shipping container for bulk transport of rare metals and minerals. This one is from NTHI: Nanotrasen's mining and refining subdivision."
+ icon_state = "nthi_minor"
+
+/obj/structure/shipping_container/nthi/precious
+ desc = "A standard-measure shipping container for bulk transport of precious metals and minerals. This one is from NTHI: Nanotrasen's mining and refining subdivision."
+ icon_state = "nthi_precious"
+
+/obj/structure/shipping_container/orange
+ icon_state = "orange"
+
+/obj/structure/shipping_container/purple
+ icon_state = "purple"
+
+/obj/structure/shipping_container/red
+ icon_state = "red"
+
+/obj/structure/shipping_container/sunda
+ name = "\improper Sunda Galaksi shipping container"
+ desc = "A standard-measure shipping container for bulk transport of goods. This one is from Sunda Galaksi, and could be carrying just about anything."
+ icon_state = "sunda"
+
/obj/structure/shipping_container/vitezstvi
name = "\improper VÃtÄ›zstvà Arms shipping container"
desc = "A standard-measure shipping container for bulk transport of goods. This one is from VÃtÄ›zstvà Arms, proudly proclaiming that VÃtÄ›zstvà weapons mean victory."
icon_state = "vitezstvi"
+/obj/structure/shipping_container/vitezstvi/flags
+ icon_state = "vitezstvi_flags"
+
+/obj/structure/shipping_container/yellow
+ icon_state = "yellow"
+
//Syndies
+/obj/structure/shipping_container/biosustain
+ name = "\improper Biosustain shipping container"
+ desc = "A standard-measure shipping container for bulk transport of goods. This one is from Biosustain, and so it's probably carrying seeds or farming equipment."
+ icon_state = "biosustain"
+
/obj/structure/shipping_container/cybersun
name = "\improper Cybersun Industries shipping container"
desc = "A standard-measure shipping container for bulk transport of goods. This one prominently features Cybersun's logo, and so presumably could be carrying almost anything."
icon_state = "cybersun"
+/obj/structure/shipping_container/cybersun/defaced
+ desc = "A standard-measure shipping container for bulk transport of goods. This one originally featured Cybersun's logo, before it was painted over by an enterprising artist."
+ icon_state = "cybersun_defaced"
+
/obj/structure/shipping_container/donk_co
name = "\improper Donk Co. shipping container"
- desc = "A standard-measure shipping container for bulk transport of goods. This one is from Donk Co. and so could be carrying just about anything- although it's probably Donk Pockets."
+ desc = "A standard-measure shipping container for bulk transport of goods. This one is from Donk Co. and so could be carrying just about anything- although it's probably just Donk Pockets."
icon_state = "donk_co"
+/obj/structure/shipping_container/exagon
+ name = "\improper Exagon-Ichikawa shipping container"
+ desc = "A standard-measure shipping container for bulk transport of common metals and minerals. This one is from Exagon-Ichikawa, Cybersun Industries' mining and refining subdivision."
+ icon_state = "exagon"
+
+/obj/structure/shipping_container/exagon/minor
+ desc = "A standard-measure shipping container for bulk transport of rare metals and minerals. This one is from Exagon-Ichikawa, Cybersun Industries' mining and refining subdivision."
+ icon_state = "exagon_minor"
+
+/obj/structure/shipping_container/exagon/precious
+ desc = "A standard-measure shipping container for bulk transport of precious metals and minerals. This one is from Exagon-Ichikawa, Cybersun Industries' mining and refining subdivision."
+ icon_state = "exagon_precious"
+
/obj/structure/shipping_container/gorlex
name = "\improper Gorlex Securities shipping container"
desc = "A standard-measure shipping container for bulk transport of goods. This one is from Gorlex Securities, and is probably carrying their primary export: war crimes."
@@ -82,3 +160,68 @@
/obj/structure/shipping_container/gorlex/red
icon_state = "gorlex_red"
+
+/obj/structure/shipping_container/interdyne
+ name = "\improper Interdyne shipping container"
+ desc = "A standard-measure shipping container for bulk transport of goods. This one is from Interdyne, a private pharmaceutical company. Probably carrying medical or research supplies, probably."
+ icon_state = "interdyne"
+
+/obj/structure/shipping_container/oms
+ name = "\improper OMS shipping container"
+ desc = "A standard-measure shipping container for bulk transport of goods. This one is from Cybersun's medical subdivision OMS (Osaka Medical Systems), and is probably carrying medical cybernetics or somesuch."
+ icon_state = "oms"
+
+/obj/structure/shipping_container/tiger_coop
+ name = "suspicious shipping container"
+ desc = "A standard-measure shipping container for bulk transport of goods. This previously blank container has been spray-painted with the insignia of the Tiger Cooperative, meaning whatever's inside is probably dangerous."
+ icon_state = "tiger_coop"
+
+/obj/structure/shipping_container/tiger_coop/text
+ icon_state = "tiger_coop_text"
+
+// REEFER CONTAINERS (REFRIGERATED)
+/obj/structure/shipping_container/reefer
+ name = "reefer shipping container"
+ desc = "A standard-measure reefer shipping container for bulk transport of refrigerated goods. This one is blank, offering no clue as to its contents."
+ icon_state = "blank_reefer"
+
+/obj/structure/shipping_container/reefer/deforest
+ name = "\improper Nanotrasen-DeForest reefer shipping container"
+ desc = "A standard-measure reefer shipping container for bulk transport of refrigerated goods. This one is from Nanotrasen-DeForest, and is probably carrying temperature sensitive biological material."
+ icon_state = "deforest_reefer"
+
+/obj/structure/shipping_container/reefer/biosustain
+ name = "\improper Biosustain reefer shipping container"
+ desc = "A standard-measure reefer shipping container for bulk transport of refrigerated goods. This one is from Biosustain, and so it's probably carrying GMOs or agrichemicals."
+ icon_state = "biosustain_reefer"
+
+/obj/structure/shipping_container/reefer/interdyne
+ name = "\improper Interdyne reefer shipping container"
+ desc = "A standard-measure reefer shipping container for bulk transport of refrigerated goods. This one is from Interdyne, a private pharmaceutical company, and is probably carrying organs or blood, maybe both."
+ icon_state = "interdyne_reefer"
+
+// GAS TANK
+/obj/structure/shipping_container/gas
+ name = "bulk gas tank"
+ desc = "A standard-measure gas tank for bulk transport of gases. This one is rather irresponsibly blank, offering no clue as to its contents."
+ icon_state = "blank_gas"
+
+/obj/structure/shipping_container/gas/apda
+ name = "\improper APdA S.p.A. bulk helium tank"
+ desc = "A standard-measure gas tank for bulk transport of gases. This one is from Associato Petrochimico dell'Adriatico, containing their second most important export: helium-3 for fuel use."
+ icon_state = "apda_gas_helium"
+
+/obj/structure/shipping_container/gas/apda/hydrogen
+ name = "\improper APdA S.p.A. bulk hydrogen tank"
+ desc = "A standard-measure gas tank for bulk transport of gases. This one is from Associato Petrochimico dell'Adriatico, containing their most important export: hydrogen for fuel use."
+ icon_state = "apda_gas_hydrogen"
+
+/obj/structure/shipping_container/gas/nthi
+ name = "\improper NTHI bulk plasma tank"
+ desc = "A standard-measure gas tank for bulk transport of gases. This one is from NTHI, Nanotrasen's mining and refining subdivision, and contains high-grade gaseous plasma from the Spinward Sector."
+ icon_state = "nthi_gas_plasma"
+
+/obj/structure/shipping_container/gas/exagon
+ name = "\improper Exagon-Ichikawa bulk plasma tank"
+ desc = "A standard-measure gas tank for bulk transport of gases. This one is from Exagon-Ichikawa, Cybersun Industries' mining and refining subdivision, and contains gaseous plasma most likely sourced from Mars."
+ icon_state = "exagon_gas_plasma"
diff --git a/code/game/objects/structures/deployable_turret.dm b/code/game/objects/structures/deployable_turret.dm
index e9162294c8f42..a02481d8ef73d 100644
--- a/code/game/objects/structures/deployable_turret.dm
+++ b/code/game/objects/structures/deployable_turret.dm
@@ -195,7 +195,7 @@
target = target_turf
var/obj/projectile/projectile_to_fire = new projectile_type(targets_from)
playsound(src, firesound, 75, TRUE)
- projectile_to_fire.preparePixelProjectile(target, targets_from)
+ projectile_to_fire.aim_projectile(target, targets_from)
projectile_to_fire.firer = user
projectile_to_fire.fired_from = src
projectile_to_fire.fire()
diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm
index 4e568a56f48b2..f1505cd1b50a0 100644
--- a/code/game/objects/structures/fireplace.dm
+++ b/code/game/objects/structures/fireplace.dm
@@ -30,6 +30,7 @@
/obj/structure/fireplace/Destroy()
STOP_PROCESSING(SSobj, src)
QDEL_NULL(burning_loop)
+ remove_shared_particles(/particles/smoke/burning)
. = ..()
/obj/structure/fireplace/setDir(newdir)
@@ -166,17 +167,17 @@
fuel_added = 0
update_appearance()
adjust_light()
- particles = new /particles/smoke/burning()
+ var/obj/effect/abstract/shared_particle_holder/smoke_particles = add_shared_particles(/particles/smoke/burning)
switch(dir)
if(SOUTH)
- particles.position = list(0, 29, 0)
+ smoke_particles.particles.position = list(0, 29, 0)
if(EAST)
- particles.position = list(-20, 9, 0)
+ smoke_particles.particles.position = list(-20, 9, 0)
if(WEST)
- particles.position = list(20, 9, 0)
+ smoke_particles.particles.position = list(20, 9, 0)
if(NORTH) // there is no icon state for SOUTH
- QDEL_NULL(particles)
+ remove_shared_particles(/particles/smoke/burning)
/obj/structure/fireplace/proc/put_out()
STOP_PROCESSING(SSobj, src)
@@ -185,7 +186,7 @@
update_appearance()
adjust_light()
desc = initial(desc)
- QDEL_NULL(particles)
+ remove_shared_particles(/particles/smoke/burning)
#undef LOG_BURN_TIMER
#undef PAPER_BURN_TIMER
diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm
index 838113cab8c38..19e35d30a5e6c 100644
--- a/code/game/objects/structures/hivebot.dm
+++ b/code/game/objects/structures/hivebot.dm
@@ -13,7 +13,7 @@
var/datum/effect_system/fluid_spread/smoke/smoke = new
smoke.set_up(2, holder = src, location = loc)
smoke.start()
- visible_message(span_boldannounce("[src] warps in!"))
+ visible_message(span_bolddanger("[src] warps in!"))
playsound(src.loc, 'sound/effects/empulse.ogg', 25, TRUE)
addtimer(CALLBACK(src, PROC_REF(warpbots)), rand(1 SECONDS, 1 MINUTES))
@@ -30,7 +30,7 @@
if("rapid")
new /mob/living/basic/hivebot/rapid(get_turf(src))
sleep(10 SECONDS)
- visible_message(span_boldannounce("[src] warps out!"))
+ visible_message(span_bolddanger("[src] warps out!"))
playsound(src.loc, 'sound/effects/empulse.ogg', 25, TRUE)
qdel(src)
return
diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm
index f9d490a29b2e9..b53f11c711a61 100644
--- a/code/game/objects/structures/icemoon/cave_entrance.dm
+++ b/code/game/objects/structures/icemoon/cave_entrance.dm
@@ -50,7 +50,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
*/
/obj/structure/spawner/ice_moon/proc/destroy_effect()
playsound(loc,'sound/effects/explosion/explosionfar.ogg', 200, TRUE)
- visible_message(span_boldannounce("[src] collapses, sealing everything inside! \nOres fall out of the cave as it is destroyed!"))
+ visible_message(span_bolddanger("[src] collapses, sealing everything inside! \nOres fall out of the cave as it is destroyed!"))
/**
* Drops items after the spawner is destroyed
@@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(ore_probability, list(
/obj/effect/collapsing_demonic_portal/Initialize(mapload)
. = ..()
playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE)
- visible_message(span_boldannounce("[src] begins to collapse, cutting it off from this world!"))
+ visible_message(span_bolddanger("[src] begins to collapse, cutting it off from this world!"))
animate(src, transform = matrix().Scale(0, 1), alpha = 50, time = 5 SECONDS)
addtimer(CALLBACK(src, PROC_REF(collapse)), 5 SECONDS)
diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm
index b169868a85fb7..0461180721e2b 100644
--- a/code/game/objects/structures/lavaland/necropolis_tendril.dm
+++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm
@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(tendrils, list())
/obj/effect/collapse/Initialize(mapload)
. = ..()
emitted_light = new(loc)
- visible_message(span_boldannounce("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!"))
+ visible_message(span_bolddanger("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!"))
balloon_alert_to_viewers("interact to grab loot before collapse!", vision_distance = 7)
playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE)
addtimer(CALLBACK(src, PROC_REF(collapse)), 5 SECONDS)
@@ -132,7 +132,7 @@ GLOBAL_LIST_INIT(tendrils, list())
for(var/mob/M in range(7,src))
shake_camera(M, 15, 1)
playsound(get_turf(src),'sound/effects/explosion/explosionfar.ogg', 200, TRUE)
- visible_message(span_boldannounce("The tendril falls inward, the ground around it widening into a yawning chasm!"))
+ visible_message(span_bolddanger("The tendril falls inward, the ground around it widening into a yawning chasm!"))
for(var/turf/T in RANGE_TURFS(2,src))
if(HAS_TRAIT(T, TRAIT_NO_TERRAFORM))
continue
diff --git a/code/game/objects/structures/lavaland/ore_vent.dm b/code/game/objects/structures/lavaland/ore_vent.dm
index 1eaff6e93dc7e..d53935bda2974 100644
--- a/code/game/objects/structures/lavaland/ore_vent.dm
+++ b/code/game/objects/structures/lavaland/ore_vent.dm
@@ -224,7 +224,7 @@
addtimer(CALLBACK(node, TYPE_PROC_REF(/atom, update_appearance)), wave_timer * 0.25)
addtimer(CALLBACK(node, TYPE_PROC_REF(/atom, update_appearance)), wave_timer * 0.5)
addtimer(CALLBACK(node, TYPE_PROC_REF(/atom, update_appearance)), wave_timer * 0.75)
- particles = new /particles/smoke/ash()
+ add_shared_particles(/particles/smoke/ash)
for(var/i in 1 to 5) // Clears the surroundings of the ore vent before starting wave defense.
for(var/turf/closed/mineral/rock in oview(i))
if(istype(rock, /turf/open/misc/asteroid) && prob(35)) // so it's too common
@@ -272,7 +272,7 @@
SEND_SIGNAL(src, COMSIG_VENT_WAVE_CONCLUDED)
COOLDOWN_RESET(src, wave_cooldown)
- particles = null
+ remove_shared_particles(/particles/smoke/ash)
if(force)
initiate_wave_win()
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 5fd3b2b435a4a..b785c48ceb37f 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -248,13 +248,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
to_chat(user, span_warning("A chill runs down your spine as [src] shatters..."))
user.AddComponent(/datum/component/omen, incidents_left = 7)
-/obj/structure/mirror/bullet_act(obj/projectile/P)
- if(broken || !isliving(P.firer) || !P.damage)
+/obj/structure/mirror/bullet_act(obj/projectile/proj)
+ if(broken || !isliving(proj.firer) || !proj.damage)
return ..()
. = ..()
if(broken) // breaking a mirror truly gets you bad luck!
- var/mob/living/unlucky_dude = P.firer
+ var/mob/living/unlucky_dude = proj.firer
to_chat(unlucky_dude, span_warning("A chill runs down your spine as [src] shatters..."))
unlucky_dude.AddComponent(/datum/component/omen, incidents_left = 7)
diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm
index 532ecebde0e5e..d470008bb9cad 100644
--- a/code/game/objects/structures/reflector.dm
+++ b/code/game/objects/structures/reflector.dm
@@ -75,8 +75,8 @@
/obj/structure/reflector/proc/auto_reflect(obj/projectile/proj, pdir, turf/ploc, pangle)
proj.ignore_source_check = TRUE
- proj.range = proj.decayedRange
- proj.decayedRange = max(proj.decayedRange--, 0)
+ proj.range = proj.maximum_range
+ proj.maximum_range = max(proj.maximum_range--, 0)
return BULLET_ACT_FORCE_PIERCE
/obj/structure/reflector/tool_act(mob/living/user, obj/item/tool, list/modifiers)
@@ -196,7 +196,7 @@
if(abs(incidence) > 90 && abs(incidence) < 270)
return FALSE
var/new_angle = SIMPLIFY_DEGREES(rotation_angle + incidence)
- proj.set_angle_centered(new_angle)
+ proj.set_angle_centered(loc, new_angle)
return ..()
//DOUBLE
@@ -220,7 +220,8 @@
/obj/structure/reflector/double/auto_reflect(obj/projectile/proj, pdir, turf/ploc, pangle)
var/incidence = GET_ANGLE_OF_INCIDENCE(rotation_angle, (proj.angle + 180))
var/new_angle = SIMPLIFY_DEGREES(rotation_angle + incidence)
- proj.set_angle_centered(new_angle)
+ proj.forceMove(loc)
+ proj.set_angle_centered(loc, new_angle)
return ..()
//BOX
@@ -241,8 +242,8 @@
admin = TRUE
anchored = TRUE
-/obj/structure/reflector/box/auto_reflect(obj/projectile/P)
- P.set_angle_centered(rotation_angle)
+/obj/structure/reflector/box/auto_reflect(obj/projectile/proj)
+ proj.set_angle_centered(loc, rotation_angle)
return ..()
/obj/structure/reflector/ex_act()
diff --git a/code/game/objects/structures/water_structures/toilet.dm b/code/game/objects/structures/water_structures/toilet.dm
index 986d7eae4ea05..435af610996ae 100644
--- a/code/game/objects/structures/water_structures/toilet.dm
+++ b/code/game/objects/structures/water_structures/toilet.dm
@@ -31,7 +31,7 @@
cover_open = round(rand(0, 1))
update_appearance(UPDATE_ICON)
if(mapload && SSmapping.level_trait(z, ZTRAIT_STATION))
- AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/toilet)
+ AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[/datum/fish_source/toilet])
AddElement(/datum/element/fish_safe_storage)
register_context()
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index c2b9963c5ed41..06d71c37a15a9 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -354,13 +354,15 @@
if(lube & SLIDE_ICE)
// Ice slides only go 1 tile, this is so you will slip across ice until you reach a non-slip tile
slide_distance = 1
- else if(HAS_TRAIT(slipper, TRAIT_CURSED))
+ else if(HAS_TRAIT(slipper, TRAIT_CURSED) && !(lube & WEAK_SLIDE))
// When cursed, all slips send you flying
lube |= SLIDE
slide_distance = rand(5, 9)
else if(HAS_TRAIT(slipper, TRAIT_NO_SLIP_SLIDE))
// Stops sliding
slide_distance = 0
+ else if(lube & WEAK_SLIDE)
+ slide_distance = rand(1, 2)
var/obj/buckled_obj
if(slipper.buckled)
@@ -390,10 +392,12 @@
// They need to be kept upright to maintain the combo effect (So don't knockdown)
slipper.Immobilize(1 SECONDS)
slipper.incapacitate(1 SECONDS)
+ else if(lube & WEAK_SLIDE)
+ slipper.adjust_staggered_up_to(STAGGERED_SLOWDOWN_LENGTH, 10 SECONDS)
+ slipper.stop_pulling()
else
slipper.Knockdown(knockdown_amount)
slipper.Paralyze(paralyze_amount)
- slipper.stop_pulling()
if(buckled_obj)
buckled_obj.unbuckle_mob(slipper)
@@ -403,7 +407,7 @@
if(slide_distance)
var/turf/target = get_ranged_target_turf(slipper, olddir, slide_distance)
- if(lube & SLIDE)
+ if(lube & (SLIDE|WEAK_SLIDE))
slipper.AddComponent(/datum/component/force_move, target, TRUE)
else if(lube & SLIDE_ICE)
slipper.AddComponent(/datum/component/force_move, target, FALSE)//spinning would be bad for ice, fucks up the next dir
diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm
index fa0b0c4b12872..283ee3c31901a 100644
--- a/code/game/turfs/open/lava.dm
+++ b/code/game/turfs/open/lava.dm
@@ -22,6 +22,7 @@
barefootstep = FOOTSTEP_LAVA
clawfootstep = FOOTSTEP_LAVA
heavyfootstep = FOOTSTEP_LAVA
+ rust_resistance = RUST_RESISTANCE_ABSOLUTE
/// How much fire damage we deal to living mobs stepping on us
var/lava_damage = 20
/// How many firestacks we add to living mobs stepping on us
@@ -42,25 +43,50 @@
var/fish_source_type = /datum/fish_source/lavaland
/// The color we use for our immersion overlay
var/immerse_overlay_color = "#a15e1b"
- rust_resistance = RUST_RESISTANCE_ABSOLUTE
+ /// Whether the immerse element has been added yet or not
+ var/immerse_added = FALSE
/turf/open/lava/Initialize(mapload)
. = ..()
if(fish_source_type)
- AddElement(/datum/element/lazy_fishing_spot, fish_source_type)
+ add_lazy_fishing(fish_source_type)
// You can release chrabs and lavaloops and likes in lava, or be an absolute scumbag and drop other fish there too.
ADD_TRAIT(src, TRAIT_CATCH_AND_RELEASE, INNATE_TRAIT)
refresh_light()
if(!smoothing_flags)
update_appearance()
- AddElement(/datum/element/immerse, icon, icon_state, "immerse", immerse_overlay_color)
+ RegisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(on_atom_inited))
/turf/open/lava/Destroy()
+ UnregisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON)
for(var/mob/living/leaving_mob in contents)
leaving_mob.RemoveElement(/datum/element/perma_fire_overlay)
REMOVE_TRAIT(leaving_mob, TRAIT_NO_EXTINGUISH, TURF_TRAIT)
return ..()
+///We lazily add the immerse element when something is spawned or crosses this turf and not before.
+/turf/open/lava/proc/on_atom_inited(datum/source, atom/movable/movable)
+ SIGNAL_HANDLER
+ if(burn_stuff(movable))
+ START_PROCESSING(SSobj, src)
+ if(immerse_added || is_type_in_typecache(movable, GLOB.immerse_ignored_movable))
+ return
+ AddElement(/datum/element/immerse, icon, icon_state, "immerse", immerse_overlay_color)
+ immerse_added = TRUE
+
+/**
+ * turf/Initialize() calls Entered on its contents too, however
+ * we need to wait for movables that still need to be initialized
+ * before we add the immerse element.
+ */
+/turf/open/lava/Entered(atom/movable/arrived)
+ . = ..()
+ if(!immerse_added && !is_type_in_typecache(arrived, GLOB.immerse_ignored_movable))
+ AddElement(/datum/element/immerse, icon, icon_state, "immerse", immerse_overlay_color)
+ immerse_added = TRUE
+ if(burn_stuff(arrived))
+ START_PROCESSING(SSobj, src)
+
/turf/open/lava/update_overlays()
. = ..()
. += emissive_appearance(mask_icon, mask_state, src)
@@ -124,6 +150,8 @@
update_appearance(~UPDATE_SMOOTHING)
/turf/open/lava/ex_act(severity, target)
+ if(fish_source)
+ GLOB.preset_fish_sources[fish_source].spawn_reward_from_explosion(src, severity)
return FALSE
/turf/open/lava/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent)
@@ -139,14 +167,6 @@
/turf/open/lava/MakeDry(wet_setting = TURF_WET_WATER)
return
-/turf/open/lava/airless
- initial_gas_mix = AIRLESS_ATMOS
-
-/turf/open/lava/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
- . = ..()
- if(burn_stuff(arrived))
- START_PROCESSING(SSobj, src)
-
/turf/open/lava/Exited(atom/movable/gone, direction)
. = ..()
if(isliving(gone) && !islava(gone.loc))
@@ -322,6 +342,9 @@
/turf/open/lava/can_cross_safely(atom/movable/crossing)
return HAS_TRAIT(src, TRAIT_LAVA_STOPPED) || HAS_TRAIT(crossing, immunity_trait ) || HAS_TRAIT(crossing, TRAIT_MOVE_FLYING)
+/turf/open/lava/airless
+ initial_gas_mix = AIRLESS_ATMOS
+
/turf/open/lava/smooth
name = "lava"
baseturfs = /turf/open/lava/smooth
diff --git a/code/game/turfs/open/sand.dm b/code/game/turfs/open/sand.dm
index 254c595fcbdd6..af583de777910 100644
--- a/code/game/turfs/open/sand.dm
+++ b/code/game/turfs/open/sand.dm
@@ -12,9 +12,11 @@
/turf/open/misc/beach/Initialize(mapload)
. = ..()
- AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/sand)
+ add_lazy_fishing(/datum/fish_source/sand)
/turf/open/misc/beach/ex_act(severity, target)
+ if(fish_source)
+ GLOB.preset_fish_sources[fish_source].spawn_reward_from_explosion(src, severity)
return FALSE
/turf/open/misc/beach/sand
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index f970b22c74995..b7bc8242bf7b4 100644
--- a/code/game/turfs/open/water.dm
+++ b/code/game/turfs/open/water.dm
@@ -27,14 +27,42 @@
/// Fishing element for this specific water tile
var/datum/fish_source/fishing_datum = /datum/fish_source/river
+ /// Whether the immerse element has been added yet or not
+ var/immerse_added = FALSE
+
/turf/open/water/Initialize(mapload)
. = ..()
- AddElement(/datum/element/immerse, icon, icon_state, "immerse", immerse_overlay_color, alpha = immerse_overlay_alpha)
+ RegisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(on_atom_inited))
AddElement(/datum/element/watery_tile)
if(!isnull(fishing_datum))
- AddElement(/datum/element/lazy_fishing_spot, fishing_datum)
+ add_lazy_fishing(fishing_datum)
ADD_TRAIT(src, TRAIT_CATCH_AND_RELEASE, INNATE_TRAIT)
+///We lazily add the immerse element when something is spawned or crosses this turf and not before.
+/turf/open/water/proc/on_atom_inited(datum/source, atom/movable/movable)
+ SIGNAL_HANDLER
+ UnregisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON)
+ if(immerse_added || is_type_in_typecache(movable, GLOB.immerse_ignored_movable))
+ return
+ AddElement(/datum/element/immerse, icon, icon_state, "immerse", immerse_overlay_color, alpha = immerse_overlay_alpha)
+ immerse_added = TRUE
+
+/turf/open/water/Destroy()
+ UnregisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON)
+ return ..()
+
+/**
+ * turf/Initialize() calls Entered on its contents too, however
+ * we need to wait for movables that still need to be initialized
+ * before we add the immerse element.
+ */
+/turf/open/water/Entered(atom/movable/arrived)
+ . = ..()
+ if(immerse_added || is_type_in_typecache(arrived, GLOB.immerse_ignored_movable))
+ return
+ AddElement(/datum/element/immerse, icon, icon_state, "immerse", immerse_overlay_color, alpha = immerse_overlay_alpha)
+ immerse_added = TRUE
+
/turf/open/water/jungle
/turf/open/water/no_planet_atmos
@@ -96,18 +124,12 @@
animate(filter, offset = 1, time = 3 SECONDS, loop = -1, easing = SINE_EASING|EASE_IN|EASE_OUT)
animate(offset = -1, time = 3 SECONDS, easing = SINE_EASING|EASE_IN|EASE_OUT)
- /**
- * turf/Initialize() calls Entered on its contents, however
- * we need to wait for movables that still need to be initialized.
- */
- RegisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(enter_initialized_movable))
/turf/open/water/hot_spring/Destroy()
QDEL_NULL(steam_effect)
remove_filter("hot_spring_waves")
for(var/atom/movable/movable as anything in contents)
exit_hot_spring(movable)
- UnregisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON)
return ..()
/turf/open/water/hot_spring/Entered(atom/movable/arrived, atom/old_loc)
@@ -118,6 +140,9 @@
/turf/open/water/hot_spring/proc/enter_initialized_movable(datum/source, atom/movable/movable)
SIGNAL_HANDLER
+ if(!immerse_added && !is_type_in_typecache(movable, GLOB.immerse_ignored_movable))
+ AddElement(/datum/element/immerse, icon, icon_state, "immerse", immerse_overlay_color, alpha = immerse_overlay_alpha)
+ immerse_added = TRUE
enter_hot_spring(movable)
///Registers the signals from the immerse element and calls dip_in if the movable has the required trait.
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index fdbc1e04b8eb6..aab0f609d0e3f 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -109,6 +109,9 @@ GLOBAL_LIST_EMPTY(station_turfs)
/// Never directly access this, use get_explosive_block() instead
var/inherent_explosive_resistance = -1
+ ///The typepath we use for lazy fishing on turfs, to save on world init time.
+ var/fish_source
+
/turf/vv_edit_var(var_name, new_value)
var/static/list/banned_edits = list(NAMEOF_STATIC(src, x), NAMEOF_STATIC(src, y), NAMEOF_STATIC(src, z))
@@ -790,3 +793,67 @@ GLOBAL_LIST_EMPTY(station_turfs)
/// Returns whether it is safe for an atom to move across this turf
/turf/proc/can_cross_safely(atom/movable/crossing)
return TRUE
+
+/**
+ * the following are some hacky fishing-related optimizations to shave off
+ * time we spend implementing the fishing as possible, even if that means
+ * doing hackier code, because we've hundreds of turfs like lava, water etc every round,
+ */
+/turf/proc/add_lazy_fishing(fish_source_path)
+ RegisterSignal(src, COMSIG_PRE_FISHING, PROC_REF(add_fishing_spot_comp))
+ RegisterSignal(src, COMSIG_NPC_FISHING, PROC_REF(on_npc_fishing))
+ RegisterSignal(src, COMSIG_FISH_RELEASED_INTO, PROC_REF(on_fish_release_into))
+ RegisterSignal(src, COMSIG_TURF_CHANGE, PROC_REF(remove_lazy_fishing))
+ ADD_TRAIT(src, TRAIT_FISHING_SPOT, INNATE_TRAIT)
+ fish_source = fish_source_path
+
+/turf/proc/remove_lazy_fishing()
+ SIGNAL_HANDLER
+ UnregisterSignal(src, list(
+ COMSIG_PRE_FISHING,
+ COMSIG_NPC_FISHING,
+ COMSIG_FISH_RELEASED_INTO,
+ COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL),
+ COMSIG_TURF_CHANGE,
+ ))
+ REMOVE_TRAIT(src, TRAIT_FISHING_SPOT, INNATE_TRAIT)
+ fish_source = null
+
+/turf/proc/add_fishing_spot_comp(datum/source)
+ SIGNAL_HANDLER
+ source.AddComponent(/datum/component/fishing_spot, fish_source)
+ remove_lazy_fishing()
+
+/turf/proc/on_npc_fishing(datum/source, list/fish_spot_container)
+ SIGNAL_HANDLER
+ fish_spot_container[NPC_FISHING_SPOT] = GLOB.preset_fish_sources[fish_source]
+
+/turf/proc/on_fish_release_into(datum/source, obj/item/fish/fish, mob/living/releaser)
+ SIGNAL_HANDLER
+ GLOB.preset_fish_sources[fish_source].readd_fish(fish, releaser)
+
+/turf/examine(mob/user)
+ . = ..()
+ if(!fish_source || !HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT))
+ return
+ if(!GLOB.preset_fish_sources[fish_source].has_known_fishes())
+ return
+ . += span_tinynoticeital("This is a fishing spot. You can look again to list its fishes...")
+
+/turf/examine_more(mob/user)
+ . = ..()
+ if(!HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT) || !fish_source)
+ return
+ GLOB.preset_fish_sources[fish_source].get_catchable_fish_names(user, src, .)
+
+/turf/ex_act(severity, target)
+ . = ..()
+ if(!fish_source)
+ return
+ GLOB.preset_fish_sources[fish_source].spawn_reward_from_explosion(src, severity)
+
+/turf/multitool_act(mob/living/user, obj/item/multitool/tool)
+ if(!fish_source || !istype(tool.buffer, /obj/machinery/fishing_portal_generator))
+ return ..()
+ var/obj/machinery/fishing_portal_generator/portal = tool.buffer
+ return portal.link_fishing_spot(GLOB.preset_fish_sources[fish_source], src, user)
diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm
index edc3525bf2f07..a329ad595fa50 100644
--- a/code/modules/admin/admin_investigate.dm
+++ b/code/modules/admin/admin_investigate.dm
@@ -1,6 +1,8 @@
/atom/proc/investigate_log(message, subject)
- if(!message || !subject)
+ if(!message)
return
+ if(!subject)
+ CRASH("No subject provided for investigate_log")
var/F = file("[GLOB.log_directory]/[subject].html")
var/source = "[src]"
diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm
index 296b6fd2dd86f..73987622202e6 100644
--- a/code/modules/admin/permissionedit.dm
+++ b/code/modules/admin/permissionedit.dm
@@ -300,7 +300,9 @@ ADMIN_VERB(edit_admin_permissions, R_PERMISSIONS, "Permissions Panel", "Edit adm
D.deactivate() //after logs so the deadmined admin can see the message.
/datum/admins/proc/auto_deadmin()
- if (owner.prefs.read_preference(/datum/preference/toggle/bypass_deadmin_in_centcom) && is_centcom_level(owner.mob.z))
+ if(owner.is_localhost())
+ return FALSE
+ if(owner.prefs.read_preference(/datum/preference/toggle/bypass_deadmin_in_centcom) && is_centcom_level(owner.mob.z))
return FALSE
to_chat(owner, span_interface("You are now a normal player."), confidential = TRUE)
diff --git a/code/modules/admin/verbs/adminfun.dm b/code/modules/admin/verbs/adminfun.dm
index 93b398397c284..984ced4c0bf7e 100644
--- a/code/modules/admin/verbs/adminfun.dm
+++ b/code/modules/admin/verbs/adminfun.dm
@@ -194,7 +194,7 @@ ADMIN_VERB_AND_CONTEXT_MENU(admin_smite, R_ADMIN|R_FUN, "Smite", "Smite a player
divine_wrath.original = target
divine_wrath.def_zone = body_zone
divine_wrath.spread = 0
- divine_wrath.preparePixelProjectile(target, source_turf)
+ divine_wrath.aim_projectile(target, source_turf)
divine_wrath.fire()
/client/proc/punish_log(whom, punishment)
diff --git a/code/modules/admin/verbs/highlander_datum.dm b/code/modules/admin/verbs/highlander_datum.dm
index de7e4918fc00b..c574c39288213 100644
--- a/code/modules/admin/verbs/highlander_datum.dm
+++ b/code/modules/admin/verbs/highlander_datum.dm
@@ -11,7 +11,7 @@ GLOBAL_DATUM(highlander_controller, /datum/highlander_controller)
. = ..()
RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(new_highlander))
sound_to_playing_players('sound/misc/highlander.ogg')
- send_to_playing_players(span_boldannounce("THERE CAN BE ONLY ONE "))
+ send_to_playing_players(span_bolddanger("THERE CAN BE ONLY ONE "))
for(var/obj/item/disk/nuclear/nuke_disk as anything in SSpoints_of_interest.real_nuclear_disks)
var/datum/component/stationloving/component = nuke_disk.GetComponent(/datum/component/stationloving)
component?.relocate() //Gets it out of bags and such
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index b70465666f3d0..d66e7f777c309 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -41,7 +41,10 @@ ADMIN_VERB(play_sound, R_SOUND, "Play Global Sound", "Play a sound to all connec
ADMIN_VERB(play_local_sound, R_SOUND, "Play Local Sound", "Plays a sound only you can hear.", ADMIN_CATEGORY_FUN, sound as sound)
log_admin("[key_name(user)] played a local sound [sound]")
message_admins("[key_name_admin(user)] played a local sound [sound]")
- playsound(get_turf(user.mob), sound, 50, FALSE, FALSE)
+ var/volume = tgui_input_number(user, "What volume would you like the sound to play at?", max_value = 100)
+ var/sound/admin_sound = sound(sound)
+ admin_sound.volume = volume || 50
+ playsound(get_turf(user.mob), sound, FALSE, FALSE)
BLACKBOX_LOG_ADMIN_VERB("Play Local Sound")
ADMIN_VERB(play_direct_mob_sound, R_SOUND, "Play Direct Mob Sound", "Play a sound directly to a mob.", ADMIN_CATEGORY_FUN, sound as sound, mob/target in world)
@@ -51,6 +54,10 @@ ADMIN_VERB(play_direct_mob_sound, R_SOUND, "Play Direct Mob Sound", "Play a soun
return
log_admin("[key_name(user)] played a direct mob sound [sound] to [key_name_admin(target)].")
message_admins("[key_name_admin(user)] played a direct mob sound [sound] to [ADMIN_LOOKUPFLW(target)].")
+ var/volume = tgui_input_number(user, "What volume would you like the sound to play at?", max_value = 100)
+ var/sound/admin_sound = sound(sound)
+ if(volume)
+ admin_sound.volume = volume
SEND_SOUND(target, sound)
BLACKBOX_LOG_ADMIN_VERB("Play Direct Mob Sound")
@@ -175,6 +182,10 @@ ADMIN_VERB(play_web_sound, R_SOUND, "Play Internet Sound", "Play a given interne
web_sound(user.mob, null)
ADMIN_VERB(set_round_end_sound, R_SOUND, "Set Round End Sound", "Set the sound that plays on round end.", ADMIN_CATEGORY_FUN, sound as sound)
+ var/volume = tgui_input_number(user, "What volume would you like this sound to play at?", max_value = 100)
+ var/sound/admin_sound = sound(sound)
+ if(volume)
+ admin_sound.volume = volume
SSticker.SetRoundEndSound(sound)
log_admin("[key_name(user)] set the round end sound to [sound]")
diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm
index 26cf122211305..e43164419d59c 100644
--- a/code/modules/admin/verbs/secrets.dm
+++ b/code/modules/admin/verbs/secrets.dm
@@ -493,7 +493,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
return
SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Mass Braindamage"))
for(var/mob/living/carbon/human/H in GLOB.player_list)
- to_chat(H, span_boldannounce("You suddenly feel stupid."), confidential = TRUE)
+ to_chat(H, span_bolddanger("You suddenly feel stupid."), confidential = TRUE)
H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 60, 80)
message_admins("[key_name_admin(holder)] made everybody brain damaged")
if("floorlava")
diff --git a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm
index 296eef07e8141..790dd0f8e5355 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm
@@ -60,5 +60,5 @@
user.visible_message(span_notice("[user] inserts [tool] into [target]."), span_notice("You insert [tool] into [target]."))
user.temporarilyRemoveItemFromInventory(tool, TRUE)
var/obj/item/organ/heart/gland/gland = tool
- gland.Insert(target, 2)
- return 1
+ gland.Insert(target, special = TRUE, movement_flags = FROM_ABDUCTOR_SURGERY)
+ return TRUE
diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm
index b991a16b8318d..9f5bae7aad53f 100644
--- a/code/modules/antagonists/abductor/equipment/gland.dm
+++ b/code/modules/antagonists/abductor/equipment/gland.dm
@@ -84,7 +84,7 @@
active_mind_control = FALSE
return TRUE
-/obj/item/organ/heart/gland/mob_remove(mob/living/carbon/gland_owner, special, movement_flags)
+/obj/item/organ/heart/gland/on_mob_remove(mob/living/carbon/gland_owner, special, movement_flags)
. = ..()
active = FALSE
if(initial(uses) == 1)
@@ -93,10 +93,10 @@
hud.remove_atom_from_hud(gland_owner)
clear_mind_control()
-/obj/item/organ/heart/gland/mob_insert(mob/living/carbon/gland_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED)
+/obj/item/organ/heart/gland/on_mob_insert(mob/living/carbon/gland_owner, special = FALSE, movement_flags)
. = ..()
- if(special != 2 && uses) // Special 2 means abductor surgery
+ if(!(movement_flags & FROM_ABDUCTOR_SURGERY) && uses)
Start()
var/datum/atom_hud/abductor/hud = GLOB.huds[DATA_HUD_ABDUCTOR]
hud.add_atom_to_hud(gland_owner)
diff --git a/code/modules/antagonists/abductor/machinery/camera.dm b/code/modules/antagonists/abductor/machinery/camera.dm
index f4ddd345075f8..644e3a827bf7b 100644
--- a/code/modules/antagonists/abductor/machinery/camera.dm
+++ b/code/modules/antagonists/abductor/machinery/camera.dm
@@ -21,11 +21,12 @@
return ..()
/obj/machinery/computer/camera_advanced/abductor/CreateEye()
- ..()
- eyeobj.visible_icon = TRUE
+ . = ..()
+ //For observers
eyeobj.icon = 'icons/mob/eyemob.dmi'
eyeobj.icon_state = "abductor_camera"
- eyeobj.SetInvisibility(INVISIBILITY_OBSERVER)
+ //For the user
+ eyeobj.set_user_icon(eyeobj.icon, eyeobj.icon_state)
/obj/machinery/computer/camera_advanced/abductor/GrantActions(mob/living/carbon/user)
if(!abduct_created)
@@ -57,7 +58,7 @@
to_chat(owner, span_warning("You must wait [DisplayTimeText(use_delay - world.time)] to use the [target] again!"))
return
var/mob/living/carbon/human/C = owner
- var/mob/eye/ai_eye/remote/remote_eye = C.remote_control
+ var/mob/eye/camera/remote/remote_eye = C.remote_control
var/obj/machinery/abductor/pad/P = target
var/area/target_area = get_area(remote_eye)
@@ -101,7 +102,7 @@
to_chat(owner, span_warning("You can only teleport to one place at a time!"))
return
var/mob/living/carbon/human/C = owner
- var/mob/eye/ai_eye/remote/remote_eye = C.remote_control
+ var/mob/eye/camera/remote/remote_eye = C.remote_control
var/obj/machinery/abductor/pad/P = target
var/area/target_area = get_area(remote_eye)
@@ -151,7 +152,7 @@
return
var/mob/living/carbon/human/C = owner
- var/mob/eye/ai_eye/remote/remote_eye = C.remote_control
+ var/mob/eye/camera/remote/remote_eye = C.remote_control
var/obj/machinery/abductor/console/console = target
console.SetDroppoint(remote_eye.loc,owner)
diff --git a/code/modules/antagonists/blob/blob_antag.dm b/code/modules/antagonists/blob/blob_antag.dm
index 25bea4b083eaa..c5dfa6a1e10ca 100644
--- a/code/modules/antagonists/blob/blob_antag.dm
+++ b/code/modules/antagonists/blob/blob_antag.dm
@@ -100,7 +100,7 @@
. = ..()
if(owner)
addtimer(CALLBACK(src, PROC_REF(Activate), TRUE), autoplace_time, TIMER_UNIQUE|TIMER_OVERRIDE)
- to_chat(owner, span_boldannounce("You will automatically pop and place your blob core in [DisplayTimeText(autoplace_time)]."))
+ to_chat(owner, span_bolddanger("You will automatically pop and place your blob core in [DisplayTimeText(autoplace_time)]."))
/datum/action/innate/blobpop/Activate(timer_activated = FALSE)
var/mob/living/old_body = owner
@@ -183,5 +183,3 @@
/obj/effect/dummy/phased_mob/can_blob_attack()
return FALSE
-
-
diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm
index db40090615b07..bb43097bcd227 100644
--- a/code/modules/antagonists/blob/overmind.dm
+++ b/code/modules/antagonists/blob/overmind.dm
@@ -139,7 +139,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
if(!placed)
if(manualplace_min_time && world.time >= manualplace_min_time)
to_chat(src, span_boldnotice("You may now place your blob core."))
- to_chat(src, span_boldannounce("You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)]."))
+ to_chat(src, span_bolddanger("You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)]."))
manualplace_min_time = 0
if(autoplace_max_time && world.time >= autoplace_max_time)
place_blob_core(BLOB_RANDOM_PLACEMENT)
@@ -261,8 +261,8 @@ GLOBAL_LIST_EMPTY(blob_nodes)
return FALSE
to_chat(src, span_blobannounce("You are the overmind!"))
if(!placed && autoplace_max_time <= world.time)
- to_chat(src, span_boldannounce("You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)]."))
- to_chat(src, span_boldannounce("You [manualplace_min_time ? "will be able to":"can"] manually place your blob core by pressing the Place Blob Core button in the bottom right corner of the screen."))
+ to_chat(src, span_bolddanger("You will automatically place your blob core in [DisplayTimeText(autoplace_max_time - world.time)]."))
+ to_chat(src, span_bolddanger("You [manualplace_min_time ? "will be able to":"can"] manually place your blob core by pressing the Place Blob Core button in the bottom right corner of the screen."))
update_health_hud()
add_points(0)
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index 05881a3b4b3be..698ccda7ac9d1 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -1037,7 +1037,7 @@
/datum/antagonist/changeling/headslug/greet()
play_stinger()
- to_chat(owner, span_boldannounce("You are a fresh changeling birthed from a headslug! \
+ to_chat(owner, span_bolddanger("You are a fresh changeling birthed from a headslug! \
You aren't as strong as a normal changeling, as you are newly born."))
diff --git a/code/modules/antagonists/changeling/headslug_eggs.dm b/code/modules/antagonists/changeling/headslug_eggs.dm
index e2238d9d7e703..5c237b1156004 100644
--- a/code/modules/antagonists/changeling/headslug_eggs.dm
+++ b/code/modules/antagonists/changeling/headslug_eggs.dm
@@ -11,11 +11,11 @@
/// When this egg last got removed from a body. If -1, the egg hasn't been removed from a body.
var/removal_time = -1
-/obj/item/organ/body_egg/changeling_egg/mob_insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags = DELETE_IF_REPLACED)
+/obj/item/organ/body_egg/changeling_egg/on_mob_insert(mob/living/carbon/egg_owner, special = FALSE, movement_flags)
. = ..()
hatch_time = world.time + (removal_time == -1 ? EGG_INCUBATION_TIME : (hatch_time - removal_time))
-/obj/item/organ/body_egg/changeling_egg/mob_remove(mob/living/carbon/egg_owner, special, movement_flags)
+/obj/item/organ/body_egg/changeling_egg/on_mob_remove(mob/living/carbon/egg_owner, special, movement_flags)
. = ..()
removal_time = world.time
diff --git a/code/modules/antagonists/changeling/powers/absorb.dm b/code/modules/antagonists/changeling/powers/absorb.dm
index 167371b4d675d..d8ebc7c599803 100644
--- a/code/modules/antagonists/changeling/powers/absorb.dm
+++ b/code/modules/antagonists/changeling/powers/absorb.dm
@@ -7,6 +7,7 @@
req_human = TRUE
///if we're currently absorbing, used for sanity
var/is_absorbing = FALSE
+ var/datum/looping_sound/changeling_absorb/absorbing_loop
/datum/action/changeling/absorb_dna/can_sting(mob/living/carbon/owner)
if(!..())
@@ -59,6 +60,7 @@
if(target.mind && owner.mind)//if the victim and owner have minds
absorb_memories(target)
+ qdel(absorbing_loop)
is_absorbing = FALSE
changeling.adjust_chemicals(10)
@@ -146,6 +148,7 @@
if(2)
owner.visible_message(span_warning("[owner] extends a proboscis!"), span_notice("We extend a proboscis."))
if(3)
+ absorbing_loop = new(owner, start_immediately = TRUE)
owner.visible_message(span_danger("[owner] stabs [target] with the proboscis!"), span_notice("We stab [target] with the proboscis."))
to_chat(target, span_userdanger("You feel a sharp stabbing pain!"))
target.take_overall_damage(40)
@@ -153,6 +156,7 @@
SSblackbox.record_feedback("nested tally", "changeling_powers", 1, list("Absorb DNA", "[absorbing_iteration]"))
if(!do_after(owner, 15 SECONDS, target, hidden = TRUE))
owner.balloon_alert(owner, "interrupted!")
+ qdel(absorbing_loop)
is_absorbing = FALSE
return FALSE
return TRUE
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 150c61af29af6..c6bfa9cca425a 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -1426,7 +1426,7 @@ Striking a noncultist, however, will tear their flesh."}
qdel(src)
return FALSE
var/obj/projectile/projectile = hitby
- if(projectile.reflectable & REFLECT_NORMAL)
+ if(projectile.reflectable)
return FALSE //To avoid reflection chance double-dipping with block chance
. = ..()
if(.)
diff --git a/code/modules/antagonists/fugitive/hunters/hunter.dm b/code/modules/antagonists/fugitive/hunters/hunter.dm
index ba26645364712..8c68f0b63bf3b 100644
--- a/code/modules/antagonists/fugitive/hunters/hunter.dm
+++ b/code/modules/antagonists/fugitive/hunters/hunter.dm
@@ -26,7 +26,7 @@
/datum/antagonist/fugitive_hunter/greet()
switch(backstory)
if(HUNTER_PACK_COPS)
- to_chat(owner, span_boldannounce("Justice has arrived. I am a member of the Spacepol!"))
+ to_chat(owner, span_bolddanger("Justice has arrived. I am a member of the Spacepol!"))
to_chat(owner, "The criminals should be on the station, we have special huds implanted to recognize them. ")
to_chat(owner, "As we have lost pretty much all power over these damned lawless megacorporations, it's a mystery if their security will cooperate with us. ")
if(HUNTER_PACK_RUSSIAN)
@@ -47,7 +47,7 @@
to_chat(owner, span_danger("Your mission is simple. Infiltrate the facility and extract the target, dead or alive."))
to_chat(owner, span_danger("This is a stealth infiltration mission in hostile enemy territory. Be wary, and avoid being caught if possible."))
- to_chat(owner, span_boldannounce("You are not an antagonist in that you may kill whomever you please, but you can do anything to ensure the capture of the fugitives, even if that means going through the station."))
+ to_chat(owner, span_bolddanger("You are not an antagonist in that you may kill whomever you please, but you can do anything to ensure the capture of the fugitives, even if that means going through the station."))
owner.announce_objectives()
/datum/antagonist/fugitive_hunter/create_team(datum/team/fugitive_hunters/new_team)
diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm
index fe7a6f1b125b4..8466eaf3130f2 100644
--- a/code/modules/antagonists/heretic/heretic_antag.dm
+++ b/code/modules/antagonists/heretic/heretic_antag.dm
@@ -7,6 +7,8 @@
* Used in creating spooky-text for heretic ascension announcements.
*/
/proc/generate_heretic_text(length = 25)
+ if(!isnum(length)) // stupid thing so we can use this directly in replacetext
+ length = 25
. = ""
for(var/i in 1 to length)
. += pick("!", "$", "^", "@", "&", "#", "*", "(", ")", "?")
diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm
index 0e445c862f495..a0d77682cd8d4 100644
--- a/code/modules/antagonists/heretic/heretic_knowledge.dm
+++ b/code/modules/antagonists/heretic/heretic_knowledge.dm
@@ -665,8 +665,14 @@
cost = 2
priority = MAX_KNOWLEDGE_PRIORITY + 1 // Yes, the final ritual should be ABOVE the max priority.
required_atoms = list(/mob/living/carbon/human = 3)
- //use this to store the achievement typepath
+ /// The typepath of the achievement to grant upon successful ascension.
var/datum/award/achievement/misc/ascension_achievement
+ /// The text of the ascension announcement.
+ /// %NAME% is replaced with the heretic's real name,
+ /// and %SPOOKY% is replaced with output from [generate_heretic_text]
+ var/announcement_text
+ /// The sound that's played for the ascension announcement.
+ var/announcement_sound
/datum/heretic_knowledge/ultimate/on_research(mob/user, datum/antagonist/heretic/our_heretic)
. = ..()
@@ -727,6 +733,13 @@
source = user,
header = "A Heretic is Ascending!",
)
+ priority_announce(
+ text = replacetext(replacetext(announcement_text, "%NAME%", user.real_name), "%SPOOKY%", GLOBAL_PROC_REF(generate_heretic_text)),
+ title = generate_heretic_text(),
+ sound = announcement_sound,
+ color_override = "pink",
+ )
+
if(!isnull(ascension_achievement))
user.client?.give_award(ascension_achievement, user)
heretic_datum.increase_rust_strength()
diff --git a/code/modules/antagonists/heretic/items/corrupted_organs.dm b/code/modules/antagonists/heretic/items/corrupted_organs.dm
index fec25094bb782..0e8699f6771e0 100644
--- a/code/modules/antagonists/heretic/items/corrupted_organs.dm
+++ b/code/modules/antagonists/heretic/items/corrupted_organs.dm
@@ -28,7 +28,7 @@
if (LAZYLEN(hallucinations))
organ_owner.client.images |= hallucinations
-/obj/item/organ/eyes/corrupt/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/eyes/corrupt/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
if (!LAZYLEN(hallucinations))
return
@@ -51,7 +51,7 @@
. = ..()
RegisterSignal(organ_owner, COMSIG_MOB_SAY, PROC_REF(on_spoken))
-/obj/item/organ/tongue/corrupt/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/tongue/corrupt/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
UnregisterSignal(organ_owner, COMSIG_MOB_SAY)
@@ -87,11 +87,11 @@
. = ..()
AddElement(/datum/element/corrupted_organ)
-/obj/item/organ/liver/corrupt/on_mob_insert(mob/living/carbon/organ_owner, special)
+/obj/item/organ/liver/corrupt/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
RegisterSignal(organ_owner, COMSIG_ATOM_EXPOSE_REAGENTS, PROC_REF(on_drank))
-/obj/item/organ/liver/corrupt/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/liver/corrupt/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
UnregisterSignal(organ_owner, COMSIG_ATOM_EXPOSE_REAGENTS)
@@ -124,11 +124,11 @@
AddElement(/datum/element/corrupted_organ)
AddElement(/datum/element/noticable_organ, "%PRONOUN_They %PRONOUN_have an unhealthy pallor.")
-/obj/item/organ/stomach/corrupt/on_mob_insert(mob/living/carbon/organ_owner, special)
+/obj/item/organ/stomach/corrupt/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
RegisterSignal(organ_owner, COMSIG_ATOM_EXPOSE_REAGENTS, PROC_REF(on_drank))
-/obj/item/organ/stomach/corrupt/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/stomach/corrupt/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
UnregisterSignal(organ_owner, COMSIG_ATOM_EXPOSE_REAGENTS)
diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
index 3b5b80a621461..9d657c7b3e726 100644
--- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm
@@ -163,6 +163,8 @@
WITNESS MY ASCENSION, THE ASHY LANTERN BLAZES ONCE MORE!"
ascension_achievement = /datum/award/achievement/misc/ash_ascension
+ announcement_text = "%SPOOKY% Fear the blaze, for the Ashlord, %NAME% has ascended! The flames shall consume all! %SPOOKY%"
+ announcement_sound = 'sound/music/antag/heretic/ascend_ash.ogg'
/// A static list of all traits we apply on ascension.
var/static/list/traits_to_apply = list(
TRAIT_BOMBIMMUNE,
@@ -187,13 +189,6 @@
/datum/heretic_knowledge/ultimate/ash_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
. = ..()
- priority_announce(
- text = "[generate_heretic_text()] Fear the blaze, for the Ashlord, [user.real_name] has ascended! The flames shall consume all! [generate_heretic_text()]",
- title = "[generate_heretic_text()]",
- sound = 'sound/music/antag/heretic/ascend_ash.ogg',
- color_override = "pink",
- )
-
var/datum/action/cooldown/spell/fire_sworn/circle_spell = new(user.mind)
circle_spell.Grant(user)
@@ -209,5 +204,4 @@
var/datum/action/cooldown/spell/aoe/fiery_rebirth/fiery_rebirth = locate() in user.actions
fiery_rebirth?.cooldown_time *= 0.16
- if(length(traits_to_apply))
- user.add_traits(traits_to_apply, MAGIC_TRAIT)
+ user.add_traits(traits_to_apply, type)
diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
index dcca07b00af70..993aa20c4287e 100644
--- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
@@ -380,6 +380,8 @@
I AM UNMATCHED! A STORM OF STEEL AND SILVER IS UPON US! WITNESS MY ASCENSION!"
ascension_achievement = /datum/award/achievement/misc/blade_ascension
+ announcement_text = "%SPOOKY% Master of blades, the Torn Champion's disciple, %NAME% has ascended! Their steel is that which will cut reality in a maelstom of silver! %SPOOKY%"
+ announcement_sound = 'sound/music/antag/heretic/ascend_blade.ogg'
/datum/heretic_knowledge/ultimate/blade_final/is_valid_sacrifice(mob/living/carbon/human/sacrifice)
. = ..()
@@ -390,13 +392,7 @@
/datum/heretic_knowledge/ultimate/blade_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
. = ..()
- priority_announce(
- text = "[generate_heretic_text()] Master of blades, the Torn Champion's disciple, [user.real_name] has ascended! Their steel is that which will cut reality in a maelstom of silver! [generate_heretic_text()]",
- title = "[generate_heretic_text()]",
- sound = 'sound/music/antag/heretic/ascend_blade.ogg',
- color_override = "pink",
- )
- ADD_TRAIT(user, TRAIT_NEVER_WOUNDED, name)
+ ADD_TRAIT(user, TRAIT_NEVER_WOUNDED, type)
RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade))
user.apply_status_effect(/datum/status_effect/protective_blades/recharging, null, 8, 30, 0.25 SECONDS, /obj/effect/floating_blade, 1 MINUTES)
user.add_stun_absorption(
diff --git a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
index 90fe514cde946..d545e258a302e 100644
--- a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
@@ -219,6 +219,8 @@
WITNESS MY ASCENSION!"
ascension_achievement = /datum/award/achievement/misc/cosmic_ascension
+ announcement_text = "%SPOOKY% A Star Gazer has arrived into the station, %NAME% has ascended! This station is the domain of the Cosmos! %SPOOKY%"
+ announcement_sound = 'sound/music/antag/heretic/ascend_cosmic.ogg'
/// A static list of command we can use with our mob.
var/static/list/star_gazer_commands = list(
/datum/pet_command/idle,
@@ -236,12 +238,6 @@
/datum/heretic_knowledge/ultimate/cosmic_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
. = ..()
- priority_announce(
- text = "[generate_heretic_text()] A Star Gazer has arrived into the station, [user.real_name] has ascended! This station is the domain of the Cosmos! [generate_heretic_text()]",
- title = "[generate_heretic_text()]",
- sound = 'sound/music/antag/heretic/ascend_cosmic.ogg',
- color_override = "pink",
- )
var/mob/living/basic/heretic_summon/star_gazer/star_gazer_mob = new /mob/living/basic/heretic_summon/star_gazer(loc)
star_gazer_mob.maxHealth = INFINITY
star_gazer_mob.health = INFINITY
diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
index 57e60c46b6367..cfcd6ea9ceda1 100644
--- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
@@ -288,20 +288,14 @@
Reality will bend to THE LORD OF THE NIGHT or be unraveled! WITNESS MY ASCENSION!"
required_atoms = list(/mob/living/carbon/human = 4)
ascension_achievement = /datum/award/achievement/misc/flesh_ascension
+ announcement_text = "%SPOOKY% Ever coiling vortex. Reality unfolded. ARMS OUTREACHED, THE LORD OF THE NIGHT, %NAME% has ascended! Fear the ever twisting hand! %SPOOKY%"
+ announcement_sound = 'sound/music/antag/heretic/ascend_flesh.ogg'
/datum/heretic_knowledge/ultimate/flesh_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
. = ..()
- priority_announce(
- text = "[generate_heretic_text()] Ever coiling vortex. Reality unfolded. ARMS OUTREACHED, THE LORD OF THE NIGHT, [user.real_name] has ascended! Fear the ever twisting hand! [generate_heretic_text()]",
- title = "[generate_heretic_text()]",
- sound = 'sound/music/antag/heretic/ascend_flesh.ogg',
- color_override = "pink",
- )
-
var/datum/action/cooldown/spell/shapeshift/shed_human_form/worm_spell = new(user.mind)
worm_spell.Grant(user)
-
var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
var/datum/heretic_knowledge/limited_amount/flesh_grasp/grasp_ghoul = heretic_datum.get_knowledge(/datum/heretic_knowledge/limited_amount/flesh_grasp)
grasp_ghoul.limit *= 3
diff --git a/code/modules/antagonists/heretic/knowledge/lock_lore.dm b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
index 6333e9a8fa4fc..96c6110f6df79 100644
--- a/code/modules/antagonists/heretic/knowledge/lock_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
@@ -176,6 +176,8 @@
The Labyrinth will be Locked no more, and freedom will be ours! WITNESS US!"
required_atoms = list(/mob/living/carbon/human = 3)
ascension_achievement = /datum/award/achievement/misc/lock_ascension
+ announcement_text = "Delta-class dimensional anomaly detec%SPOOKY% Reality rended, torn. Gates open, doors open, %NAME% has ascended! Fear the tide! %SPOOKY%"
+ announcement_sound = 'sound/music/antag/heretic/ascend_knock.ogg'
/datum/heretic_knowledge/ultimate/lock_final/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
. = ..()
@@ -198,13 +200,6 @@
/datum/heretic_knowledge/ultimate/lock_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
. = ..()
- priority_announce(
- text = "Delta-class dimensional anomaly detec[generate_heretic_text()] Reality rended, torn. Gates open, doors open, [user.real_name] has ascended! Fear the tide! [generate_heretic_text()]",
- title = "[generate_heretic_text()]",
- sound = 'sound/music/antag/heretic/ascend_knock.ogg',
- color_override = "pink",
- )
-
// buffs
var/datum/action/cooldown/spell/shapeshift/eldritch/ascension/transform_spell = new(user.mind)
transform_spell.Grant(user)
diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
index 9628305f50b46..c5a6930eab799 100644
--- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
@@ -162,6 +162,9 @@
WITNESS MY ASCENSION, THE MOON SMILES ONCE MORE AND FOREVER MORE IT SHALL!"
ascension_achievement = /datum/award/achievement/misc/moon_ascension
+ announcement_text = "%SPOOKY% Laugh, for the ringleader %NAME% has ascended! \
+ The truth shall finally devour the lie! %SPOOKY%"
+ announcement_sound = 'sound/music/antag/heretic/ascend_moon.ogg'
/datum/heretic_knowledge/ultimate/moon_final/is_valid_sacrifice(mob/living/sacrifice)
@@ -174,15 +177,7 @@
/datum/heretic_knowledge/ultimate/moon_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
. = ..()
- priority_announce(
- text = "[generate_heretic_text()] Laugh, for the ringleader [user.real_name] has ascended! \
- The truth shall finally devour the lie! [generate_heretic_text()]",
- title = "[generate_heretic_text()]",
- sound = 'sound/music/antag/heretic/ascend_moon.ogg',
- color_override = "pink",
- )
-
- ADD_TRAIT(user, TRAIT_MADNESS_IMMUNE, REF(src))
+ ADD_TRAIT(user, TRAIT_MADNESS_IMMUNE, type)
user.mind.add_antag_datum(/datum/antagonist/lunatic/master)
RegisterSignal(user, COMSIG_LIVING_LIFE, PROC_REF(on_life))
diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
index f624767f33e82..41db760f53ae6 100644
--- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
@@ -168,6 +168,8 @@
The Blacksmith forges ahead! Rusted Hills, CALL MY NAME! WITNESS MY ASCENSION!"
ascension_achievement = /datum/award/achievement/misc/rust_ascension
+ announcement_text = "%SPOOKY% Fear the decay, for the Rustbringer, %NAME% has ascended! None shall escape the corrosion! %SPOOKY%"
+ announcement_sound = 'sound/music/antag/heretic/ascend_rust.ogg'
/// If TRUE, then immunities are currently active.
var/immunities_active = FALSE
/// A typepath to an area that we must finish the ritual in.
@@ -208,12 +210,6 @@
/datum/heretic_knowledge/ultimate/rust_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
. = ..()
- priority_announce(
- text = "[generate_heretic_text()] Fear the decay, for the Rustbringer, [user.real_name] has ascended! None shall escape the corrosion! [generate_heretic_text()]",
- title = "[generate_heretic_text()]",
- sound = 'sound/music/antag/heretic/ascend_rust.ogg',
- color_override = "pink",
- )
trigger(loc)
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
RegisterSignal(user, COMSIG_LIVING_LIFE, PROC_REF(on_life))
diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm
index 9c29d15ba67c6..6fec632e5102f 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_buff.dm
@@ -117,7 +117,7 @@
new /obj/effect/temp_visual/dir_setting/curse/grasp_portal(spawn_turf, victim.dir)
playsound(spawn_turf, 'sound/effects/curse/curse2.ogg', 80, TRUE, -1)
var/obj/projectile/curse_hand/hel/hand = new (spawn_turf)
- hand.preparePixelProjectile(victim, spawn_turf)
+ hand.aim_projectile(victim, spawn_turf)
if (QDELETED(hand)) // safety check if above fails - above has a stack trace if it does fail
return
hand.fire()
diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm
index 14e2ffe0e9ad5..0bb54d6d15798 100644
--- a/code/modules/antagonists/heretic/knowledge/void_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm
@@ -180,6 +180,8 @@
as the world is destroyed before our eyes. The void will return all to nothing, WITNESS MY ASCENSION!"
ascension_achievement = /datum/award/achievement/misc/void_ascension
+ announcement_text = "%SPOOKY% The nobleman of void %NAME% has arrived, stepping along the Waltz that ends worlds! %SPOOKY%"
+ announcement_sound = 'sound/music/antag/heretic/ascend_void.ogg'
///soundloop for the void theme
var/datum/looping_sound/void_loop/sound_loop
///Reference to the ongoing voidstrom that surrounds the heretic
@@ -201,13 +203,7 @@
/datum/heretic_knowledge/ultimate/void_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
. = ..()
- priority_announce(
- text = "[generate_heretic_text()] The nobleman of void [user.real_name] has arrived, stepping along the Waltz that ends worlds! [generate_heretic_text()]",
- title = "[generate_heretic_text()]",
- sound = 'sound/music/antag/heretic/ascend_void.ogg',
- color_override = "pink",
- )
- user.add_traits(list(TRAIT_RESISTLOWPRESSURE, TRAIT_NEGATES_GRAVITY, TRAIT_MOVE_FLYING, TRAIT_FREE_HYPERSPACE_MOVEMENT), MAGIC_TRAIT)
+ user.add_traits(list(TRAIT_RESISTLOWPRESSURE, TRAIT_NEGATES_GRAVITY, TRAIT_MOVE_FLYING, TRAIT_FREE_HYPERSPACE_MOVEMENT), type)
// Let's get this show on the road!
sound_loop = new(user, TRUE, TRUE)
diff --git a/code/modules/antagonists/heretic/magic/furious_steel.dm b/code/modules/antagonists/heretic/magic/furious_steel.dm
index dceb9023bdbcc..d72c7fc7c04e9 100644
--- a/code/modules/antagonists/heretic/magic/furious_steel.dm
+++ b/code/modules/antagonists/heretic/magic/furious_steel.dm
@@ -102,7 +102,7 @@
name = "blade"
icon = 'icons/effects/eldritch.dmi'
icon_state = "dio_knife"
- speed = 2
+ speed = 0.5
damage = 25
armour_penetration = 100
sharpness = SHARP_EDGED
diff --git a/code/modules/antagonists/heretic/magic/moon_parade.dm b/code/modules/antagonists/heretic/magic/moon_parade.dm
index 6d18c2113f470..49f8c42808219 100644
--- a/code/modules/antagonists/heretic/magic/moon_parade.dm
+++ b/code/modules/antagonists/heretic/magic/moon_parade.dm
@@ -26,12 +26,11 @@
icon_state = "lunar_parade"
damage = 0
damage_type = BURN
- speed = 1
+ speed = 0.2
range = 75
ricochets_max = 40
ricochet_chance = 500
ricochet_incidence_leeway = 0
- pixel_speed_multiplier = 0.2
projectile_piercing = PASSMOB|PASSVEHICLE
///looping sound datum for our projectile.
var/datum/looping_sound/moon_parade/soundloop
diff --git a/code/modules/antagonists/heretic/magic/rust_wave.dm b/code/modules/antagonists/heretic/magic/rust_wave.dm
index b109a068042b9..1464829aa4c6a 100644
--- a/code/modules/antagonists/heretic/magic/rust_wave.dm
+++ b/code/modules/antagonists/heretic/magic/rust_wave.dm
@@ -119,4 +119,4 @@
/obj/projectile/magic/aoe/rust_wave/short
range = 7
- speed = 2
+ speed = 0.5
diff --git a/code/modules/antagonists/heretic/magic/star_blast.dm b/code/modules/antagonists/heretic/magic/star_blast.dm
index e6f7a96811e40..ad36cf9186ace 100644
--- a/code/modules/antagonists/heretic/magic/star_blast.dm
+++ b/code/modules/antagonists/heretic/magic/star_blast.dm
@@ -24,10 +24,9 @@
icon_state = "star_ball"
damage = 20
damage_type = BURN
- speed = 1
+ speed = 0.2
range = 100
knockdown = 4 SECONDS
- pixel_speed_multiplier = 0.2
/// Effect for when the ball hits something
var/obj/effect/explosion_effect = /obj/effect/temp_visual/cosmic_explosion
/// The range at which people will get marked with a star mark.
diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm
index 184ca9c4f77f4..fa2dcee4d36eb 100644
--- a/code/modules/antagonists/highlander/highlander.dm
+++ b/code/modules/antagonists/highlander/highlander.dm
@@ -43,7 +43,7 @@
. = ..()
/datum/antagonist/highlander/greet()
- to_chat(owner, span_boldannounce("Your [sword.name] cries out for blood. Claim the lives of others, and your own will be restored!\n\
+ to_chat(owner, span_bolddanger("Your [sword.name] cries out for blood. Claim the lives of others, and your own will be restored!\n\
Activate it in your hand, and it will lead to the nearest target. Attack the nuclear authentication disk with it, and you will store it."))
owner.announce_objectives()
@@ -88,7 +88,7 @@
name = "\improper highlander"
/datum/antagonist/highlander/robot/greet()
- to_chat(owner, span_boldannounce("Your integrated claymore cries out for blood. Claim the lives of others, and your own will be restored!\n\
+ to_chat(owner, span_bolddanger("Your integrated claymore cries out for blood. Claim the lives of others, and your own will be restored!\n\
Activate it in your hand, and it will lead to the nearest target. Attack the nuclear authentication disk with it, and you will store it."))
/datum/antagonist/highlander/robot/give_equipment()
diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm
index f91d1b90ba46b..1776371bae9fe 100644
--- a/code/modules/antagonists/malf_ai/malf_ai_modules.dm
+++ b/code/modules/antagonists/malf_ai/malf_ai_modules.dm
@@ -191,30 +191,30 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf))
set waitfor = FALSE
message_admins("[key_name_admin(owner)][ADMIN_FLW(owner)] has activated AI Doomsday.")
var/pass = prob(10) ? "******" : "hunter2"
- to_chat(owner, "run -o -a 'selfdestruct' ")
+ to_chat(owner, "run -o -a 'selfdestruct' ")
sleep(0.5 SECONDS)
if(QDELETED(owner) || !isturf(owner_AI.loc))
active = FALSE
return
- to_chat(owner, "Running executable 'selfdestruct'... ")
+ to_chat(owner, "Running executable 'selfdestruct'... ")
sleep(rand(10, 30))
if(QDELETED(owner) || !isturf(owner_AI.loc))
active = FALSE
return
owner.playsound_local(owner, 'sound/announcer/alarm/bloblarm.ogg', 50, 0, use_reverb = FALSE)
to_chat(owner, span_userdanger("!!! UNAUTHORIZED SELF-DESTRUCT ACCESS !!!"))
- to_chat(owner, span_boldannounce("This is a class-3 security violation. This incident will be reported to Central Command."))
+ to_chat(owner, span_bolddanger("This is a class-3 security violation. This incident will be reported to Central Command."))
for(var/i in 1 to 3)
sleep(2 SECONDS)
if(QDELETED(owner) || !isturf(owner_AI.loc))
active = FALSE
return
- to_chat(owner, span_boldannounce("Sending security report to Central Command.....[rand(0, 9) + (rand(20, 30) * i)]%"))
+ to_chat(owner, span_bolddanger("Sending security report to Central Command.....[rand(0, 9) + (rand(20, 30) * i)]%"))
sleep(0.3 SECONDS)
if(QDELETED(owner) || !isturf(owner_AI.loc))
active = FALSE
return
- to_chat(owner, "auth 'akjv9c88asdf12nb' [pass] ")
+ to_chat(owner, "auth 'akjv9c88asdf12nb' [pass] ")
owner.playsound_local(owner, 'sound/items/timer.ogg', 50, 0, use_reverb = FALSE)
sleep(3 SECONDS)
if(QDELETED(owner) || !isturf(owner_AI.loc))
@@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf))
if(QDELETED(owner) || !isturf(owner_AI.loc))
active = FALSE
return
- to_chat(owner, "Y ")
+ to_chat(owner, "Y ")
sleep(1.5 SECONDS)
if(QDELETED(owner) || !isturf(owner_AI.loc))
active = FALSE
@@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf))
if(QDELETED(owner) || !isturf(owner_AI.loc))
active = FALSE
return
- to_chat(owner, "Y ")
+ to_chat(owner, "Y ")
sleep(rand(15, 25))
if(QDELETED(owner) || !isturf(owner_AI.loc))
active = FALSE
@@ -254,7 +254,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module/malf))
if(QDELETED(owner) || !isturf(owner_AI.loc))
active = FALSE
return
- to_chat(owner, "[pass] ")
+ to_chat(owner, "[pass] ")
sleep(4 SECONDS)
if(QDELETED(owner) || !isturf(owner_AI.loc))
active = FALSE
diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm
index ddfe675d4128a..e4b4528d61657 100644
--- a/code/modules/antagonists/nightmare/nightmare_organs.dm
+++ b/code/modules/antagonists/nightmare/nightmare_organs.dm
@@ -94,13 +94,13 @@
user.temporarilyRemoveItemFromInventory(src, TRUE)
Insert(user)
-/obj/item/organ/heart/nightmare/on_mob_insert(mob/living/carbon/heart_owner, special)
+/obj/item/organ/heart/nightmare/on_mob_insert(mob/living/carbon/heart_owner, special, movement_flags)
. = ..()
if(special != HEART_SPECIAL_SHADOWIFY)
blade = new/obj/item/light_eater
heart_owner.put_in_hands(blade)
-/obj/item/organ/heart/nightmare/on_mob_remove(mob/living/carbon/heart_owner, special)
+/obj/item/organ/heart/nightmare/on_mob_remove(mob/living/carbon/heart_owner, special, movement_flags)
. = ..()
respawn_progress = 0
if(blade && special != HEART_SPECIAL_SHADOWIFY)
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm
index 7445b20cb902a..8598a929454b3 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm
@@ -653,7 +653,7 @@ GLOBAL_VAR(station_nuke_source)
if(istype(gibbed.loc, /obj/structure/closet/secure_closet/freezer))
var/obj/structure/closet/secure_closet/freezer/freezer = gibbed.loc
if(!freezer.jones)
- to_chat(gibbed, span_boldannounce("You hold onto [freezer] as [source] goes off. \
+ to_chat(gibbed, span_bolddanger("You hold onto [freezer] as [source] goes off. \
Luckily, as [freezer] is lead-lined, you survive."))
freezer.jones = TRUE
return FALSE
diff --git a/code/modules/antagonists/revolution/enemy_of_the_state.dm b/code/modules/antagonists/revolution/enemy_of_the_state.dm
index 90a6431d428b3..d835655b7efd4 100644
--- a/code/modules/antagonists/revolution/enemy_of_the_state.dm
+++ b/code/modules/antagonists/revolution/enemy_of_the_state.dm
@@ -30,7 +30,7 @@
/datum/antagonist/enemy_of_the_state/greet()
. = ..()
to_chat(owner, span_userdanger("The revolution is dead."))
- to_chat(owner, span_boldannounce("You're an enemy of the state to Nanotrasen. You're a loose end to the Syndicate."))
+ to_chat(owner, span_bolddanger("You're an enemy of the state to Nanotrasen. You're a loose end to the Syndicate."))
to_chat(owner, "It's time to live out your days as an exile... Or go out in one last big bang. ")
owner.announce_objectives()
diff --git a/code/modules/antagonists/santa/santa.dm b/code/modules/antagonists/santa/santa.dm
index 2a5eb75e5c801..f3e1cbd02b963 100644
--- a/code/modules/antagonists/santa/santa.dm
+++ b/code/modules/antagonists/santa/santa.dm
@@ -14,7 +14,7 @@
/datum/antagonist/santa/greet()
. = ..()
- to_chat(owner, span_boldannounce("Your objective is to bring joy to the people on this station. You have a magical bag, which generates presents as long as you have it! You can examine the presents to take a peek inside, to make sure that you give the right gift to the right person."))
+ to_chat(owner, span_bolddanger("Your objective is to bring joy to the people on this station. You have a magical bag, which generates presents as long as you have it! You can examine the presents to take a peek inside, to make sure that you give the right gift to the right person."))
/datum/antagonist/santa/proc/give_equipment()
var/mob/living/carbon/human/H = owner.current
diff --git a/code/modules/antagonists/traitor/uplink_handler.dm b/code/modules/antagonists/traitor/uplink_handler.dm
index e25473de6e319..83899300614e5 100644
--- a/code/modules/antagonists/traitor/uplink_handler.dm
+++ b/code/modules/antagonists/traitor/uplink_handler.dm
@@ -69,6 +69,10 @@
SEND_SIGNAL(src, COMSIG_UPLINK_HANDLER_ON_UPDATE)
return
+/// Checks if traitor has enough reputation to purchase an item
+/datum/uplink_handler/proc/not_enough_reputation(datum/uplink_item/to_purchase)
+ return has_progression && progression_points < to_purchase.progression_minimum
+
/// Checks for uplink flags as well as items restricted to roles and species
/datum/uplink_handler/proc/check_if_restricted(datum/uplink_item/to_purchase)
if(!to_purchase.can_be_bought(src))
@@ -100,7 +104,7 @@
var/current_stock = item_stock[to_purchase.stock_key]
var/stock = current_stock != null ? current_stock : INFINITY
- if(telecrystals < to_purchase.real_cost(src) || stock <= 0)
+ if(telecrystals < to_purchase.cost || stock <= 0 || not_enough_reputation(to_purchase))
return FALSE
return TRUE
@@ -112,7 +116,7 @@
if(to_purchase.limited_stock != -1 && !(to_purchase.stock_key in item_stock))
item_stock[to_purchase.stock_key] = to_purchase.limited_stock
- telecrystals -= to_purchase.real_cost(src)
+ telecrystals -= to_purchase.cost
to_purchase.purchase(user, src, source)
if(to_purchase.stock_key in item_stock)
diff --git a/code/modules/antagonists/voidwalker/voidwalker_organs.dm b/code/modules/antagonists/voidwalker/voidwalker_organs.dm
index 23f1c6fb2fe47..760caf3c8d854 100644
--- a/code/modules/antagonists/voidwalker/voidwalker_organs.dm
+++ b/code/modules/antagonists/voidwalker/voidwalker_organs.dm
@@ -26,7 +26,7 @@
/// Speed modifier given when in gravity
var/datum/movespeed_modifier/speed_modifier = /datum/movespeed_modifier/grounded_voidwalker
/// The void eater weapon
- var/obj/item/glass_breaker = /obj/item/void_eater
+ var/obj/item/glass_breaker
/// Our brain transmit telepathy spell
var/datum/action/transmit = /datum/action/cooldown/spell/list_target/telepathy/voidwalker
@@ -52,7 +52,7 @@
glass_breaker = new/obj/item/void_eater
organ_owner.put_in_hands(glass_breaker)
-/obj/item/organ/brain/voidwalker/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/brain/voidwalker/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
UnregisterSignal(organ_owner, COMSIG_ENTER_AREA)
@@ -72,8 +72,7 @@
transmit.Remove(organ_owner)
transmit = initial(transmit)
- if(glass_breaker)
- qdel(glass_breaker)
+ QDEL_NULL(glass_breaker)
/obj/item/organ/brain/voidwalker/proc/on_atom_entering(mob/living/carbon/organ_owner, atom/entering)
SIGNAL_HANDLER
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index e56f651a095a8..465765c75a332 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -29,7 +29,7 @@
if(charges > 0)
new /obj/effect/rend(get_turf(user), spawn_type, spawn_amt, rend_desc, spawn_fast)
charges--
- user.visible_message(span_boldannounce("[src] hums with power as [user] deals a blow to [activate_descriptor] itself!"))
+ user.visible_message(span_bolddanger("[src] hums with power as [user] deals a blow to [activate_descriptor] itself!"))
else
to_chat(user, span_danger("The unearthly energies that powered the blade are now dormant."))
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index bb3fcb07c54b8..3f10c83aa9176 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -141,11 +141,11 @@
victim.update_damage_overlays()
else if(ismouse(target))
var/mob/living/basic/mouse/splatted = target
- visible_message(span_boldannounce("SPLAT!"))
+ visible_message(span_bolddanger("SPLAT!"))
splatted.splat() // mousetraps are instadeath for mice
else if(isregalrat(target))
- visible_message(span_boldannounce("Skreeeee!")) //He's simply too large to be affected by a tiny mouse trap.
+ visible_message(span_bolddanger("Skreeeee!")) //He's simply too large to be affected by a tiny mouse trap.
playsound(src, 'sound/effects/snap.ogg', 50, TRUE)
pulse()
diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm
index c2ffe56fc5769..c2cd3e2844486 100644
--- a/code/modules/atmospherics/environmental/LINDA_fire.dm
+++ b/code/modules/atmospherics/environmental/LINDA_fire.dm
@@ -79,7 +79,7 @@
set_active_hotspot(new /obj/effect/hotspot(src, exposed_volume * 25, exposed_temperature))
if(COOLDOWN_FINISHED(src, fire_puff_cooldown))
- playsound(src, 'sound/effects/fire_puff.ogg', 50)
+ playsound(src, 'sound/effects/fire_puff.ogg', 30)
COOLDOWN_START(src, fire_puff_cooldown, 5 SECONDS)
active_hotspot.just_spawned = (current_cycle < SSair.times_fired)
@@ -94,7 +94,7 @@
anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
icon = 'icons/effects/fire.dmi'
- icon_state = "1"
+ icon_state = "light"
layer = GASFIRE_LAYER
plane = ABOVE_GAME_PLANE
blend_mode = BLEND_ADD
@@ -365,7 +365,7 @@
/datum/looping_sound/fire
mid_sounds = list('sound/effects/fireclip1.ogg' = 1, 'sound/effects/fireclip2.ogg' = 1, 'sound/effects/fireclip3.ogg' = 1, 'sound/effects/fireclip4.ogg' = 1,
'sound/effects/fireclip5.ogg' = 1, 'sound/effects/fireclip6.ogg' = 1, 'sound/effects/fireclip7.ogg' = 1)
- volume = 50
+ volume = 30
mid_length = 2 SECONDS
falloff_distance = 1
diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_circuit.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_circuit.dm
index 7feee7f9cae4f..5263ae26c6d64 100644
--- a/code/modules/atmospherics/machinery/air_alarm/air_alarm_circuit.dm
+++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_circuit.dm
@@ -96,7 +96,7 @@
return
connected_alarm.select_mode(parent.get_creator(), options_map[mode.value])
- connected_alarm.investigate_log("was turned to [connected_alarm.selected_mode.name] by [parent.get_creator()]")
+ connected_alarm.investigate_log("was turned to [connected_alarm.selected_mode.name] by [parent.get_creator()]", INVESTIGATE_ATMOS)
/obj/item/circuit_component/air_alarm
display_name = "Air Alarm Core Control"
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 4fcfe1582599d..25122b08a2191 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -690,7 +690,7 @@
shielding_powered = !shielding_powered
SSair.start_processing_machine(src)
message_admins("[ADMIN_LOOKUPFLW(user)] turned [shielding_powered ? "on" : "off"] [wire_pulsed ? "via wire pulse" : ""] the [src] powered shielding.")
- user.investigate_log("turned [shielding_powered ? "on" : "off"] [wire_pulsed ? "via wire pulse" : ""] the [src] powered shielding.")
+ user.investigate_log("turned [shielding_powered ? "on" : "off"] [wire_pulsed ? "via wire pulse" : ""] the [src] powered shielding.", INVESTIGATE_ATMOS)
update_appearance()
/// Ejects tank from canister, if any
@@ -698,8 +698,8 @@
if(!holding)
return FALSE
if(valve_open)
- message_admins("[ADMIN_LOOKUPFLW(user)] removed [holding] from [src] with valve still open [wire_pulsed ? "via wire pulse" : ""] at [ADMIN_VERBOSEJMP(src)] releasing contents into the [span_boldannounce("air")].")
- user.investigate_log("removed the [holding] [wire_pulsed ? "via wire pulse" : ""], leaving the valve open and transferring into the [span_boldannounce("air")].", INVESTIGATE_ATMOS)
+ message_admins("[ADMIN_LOOKUPFLW(user)] removed [holding] from [src] with valve still open [wire_pulsed ? "via wire pulse" : ""] at [ADMIN_VERBOSEJMP(src)] releasing contents into the [span_bolddanger("air")].")
+ user.investigate_log("removed the [holding] [wire_pulsed ? "via wire pulse" : ""], leaving the valve open and transferring into the [span_bolddanger("air")].", INVESTIGATE_ATMOS)
replace_tank(user, FALSE)
return TRUE
@@ -712,7 +712,7 @@
suppress_reactions = !suppress_reactions
SSair.start_processing_machine(src)
message_admins("[ADMIN_LOOKUPFLW(user)] turned [suppress_reactions ? "on" : "off"] [wire_pulsed ? "via wire pulse" : ""] the [src] reaction suppression.")
- user.investigate_log("turned [suppress_reactions ? "on" : "off"] [wire_pulsed ? "via wire pulse" : ""] the [src] reaction suppression.")
+ user.investigate_log("turned [suppress_reactions ? "on" : "off"] [wire_pulsed ? "via wire pulse" : ""] the [src] reaction suppression.", INVESTIGATE_ATMOS)
/obj/machinery/portable_atmospherics/canister/proc/recolor(datum/greyscale_modify_menu/menu)
set_greyscale(menu.split_colors, menu.config.type)
diff --git a/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm b/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm
index 434f243d6a3ca..60f3ac82bb8f9 100644
--- a/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm
@@ -153,7 +153,7 @@
internal_tank.suppress_reactions = !internal_tank.suppress_reactions
SSair.start_processing_machine(internal_tank)
message_admins("[ADMIN_LOOKUPFLW(usr)] turned [internal_tank.suppress_reactions ? "on" : "off"] the [internal_tank] reaction suppression.")
- usr.investigate_log("turned [internal_tank.suppress_reactions ? "on" : "off"] the [internal_tank] reaction suppression.")
+ usr.investigate_log("turned [internal_tank.suppress_reactions ? "on" : "off"] the [internal_tank] reaction suppression.", INVESTIGATE_ATMOS)
. = TRUE
update_appearance()
diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
index 8284b212efc44..7abeb95477d70 100644
--- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
@@ -220,7 +220,7 @@
return FALSE
if(!user)
return FALSE
- if(!user.transferItemToLoc(new_tank, src))
+ if(new_tank && !user.transferItemToLoc(new_tank, src))
return FALSE
if(holding && new_tank)//for when we are actually switching tanks
diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm
index 36d5bf4eb7c5d..99b75afa0f64c 100644
--- a/code/modules/atmospherics/machinery/portable/pump.dm
+++ b/code/modules/atmospherics/machinery/portable/pump.dm
@@ -163,7 +163,7 @@
suppress_reactions = !suppress_reactions
SSair.start_processing_machine(src)
message_admins("[ADMIN_LOOKUPFLW(usr)] turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.")
- usr.investigate_log("turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.")
+ usr.investigate_log("turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.", INVESTIGATE_ATMOS)
. = TRUE
update_appearance()
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 29759e52e4278..b1b094c9db014 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -185,7 +185,7 @@
suppress_reactions = !suppress_reactions
SSair.start_processing_machine(src)
message_admins("[ADMIN_LOOKUPFLW(usr)] turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.")
- usr.investigate_log("turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.")
+ usr.investigate_log("turned [suppress_reactions ? "on" : "off"] the [src] reaction suppression.", INVESTIGATE_ATMOS)
. = TRUE
update_appearance()
diff --git a/code/modules/bitrunning/components/virtual_entity.dm b/code/modules/bitrunning/components/virtual_entity.dm
index db81f376a8094..dba5e9db34ec3 100644
--- a/code/modules/bitrunning/components/virtual_entity.dm
+++ b/code/modules/bitrunning/components/virtual_entity.dm
@@ -31,7 +31,7 @@
/datum/component/virtual_entity/proc/jailbreak_mobs()
SIGNAL_HANDLER
- to_chat(parent, span_boldannounce("You shiver for a moment with a sense of clarity you haven't felt before."))
+ to_chat(parent, span_bolddanger("You shiver for a moment with a sense of clarity you haven't felt before."))
to_chat(parent, span_notice("You could go anywhere , do anything ! You could leave this simulation right now if you wanted!"))
to_chat(parent, span_danger("But be warned, quantum entanglement will interfere with any previous lives."))
to_chat(parent, span_notice("You'll have just one chance to go nova, and there's no turning back."))
diff --git a/code/modules/bitrunning/objects/disks.dm b/code/modules/bitrunning/objects/disks.dm
index 17b768c54d08f..dd81a0f463ed0 100644
--- a/code/modules/bitrunning/objects/disks.dm
+++ b/code/modules/bitrunning/objects/disks.dm
@@ -185,3 +185,9 @@
/obj/item/crusher_trophy/vortex_talisman,
/obj/item/crusher_trophy/ice_demon_cube,
)
+
+/obj/item/bitrunning_disk/item/mini_uzi
+ name = "bitrunning gear: mini-uzi"
+ selectable_items = list(
+ /obj/item/gun/ballistic/automatic/mini_uzi,
+ )
diff --git a/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm b/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm
index 84eb53e026a29..3969907205750 100644
--- a/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm
+++ b/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm
@@ -13,10 +13,10 @@
/obj/item/toy/beach_ball = 2,
/obj/item/clothing/shoes/sandal = 1,
/obj/item/clothing/glasses/sunglasses = 1,
- /obj/item/gun/ballistic/automatic/mini_uzi = 1,
+ /obj/item/gun/energy/laser/chameleon/ballistic_only = 1,
+ /obj/item/bitrunning_disk/item/mini_uzi = 1,
)
-
/datum/lazy_template/virtual_domain/island_brawl/setup_domain(list/created_atoms)
for(var/obj/effect/mob_spawn/ghost_role/human/virtual_domain/islander/spawner in created_atoms)
custom_spawns += spawner
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index 127840631d631..dd09deae54059 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -66,7 +66,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
if(handle_spam_prevention(msg,MUTE_OOC))
return
if(findtext(msg, "byond://"))
- to_chat(src, span_boldannounce("Advertising other servers is not allowed. "))
+ to_chat(src, span_boldannounce("Advertising other servers is not allowed."))
log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]")
message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]")
return
diff --git a/code/modules/clothing/chameleon/chameleon_action_subtypes.dm b/code/modules/clothing/chameleon/chameleon_action_subtypes.dm
index bd15bb908f227..1c433f0c0d953 100644
--- a/code/modules/clothing/chameleon/chameleon_action_subtypes.dm
+++ b/code/modules/clothing/chameleon/chameleon_action_subtypes.dm
@@ -301,3 +301,7 @@
. = ..()
for(var/other_type in other_cham_types)
add_chameleon_items(other_type)
+
+/datum/action/item_action/chameleon/change/gun/ballistic
+ chameleon_type = /obj/item/gun/ballistic
+ chameleon_name = "Gun"
diff --git a/code/modules/clothing/chameleon/chameleon_gun.dm b/code/modules/clothing/chameleon/chameleon_gun.dm
index dafd0ba5f624a..4a282a3e75aee 100644
--- a/code/modules/clothing/chameleon/chameleon_gun.dm
+++ b/code/modules/clothing/chameleon/chameleon_gun.dm
@@ -11,14 +11,15 @@
/// The badmin mode. Makes your projectiles act like the real deal.
var/real_hits = FALSE
+ /// how it looks by default.
+ var/default_look = /obj/item/gun/energy/laser
/obj/item/gun/energy/laser/chameleon/Initialize(mapload)
. = ..()
- recharge_newshot()
AddElement(/datum/element/empprotection, EMP_PROTECT_SELF|EMP_PROTECT_CONTENTS)
// Init order shenanigans dictate we have to do this last so we can't just use `active_type`
var/datum/action/item_action/chameleon/change/gun/gun_action = locate() in actions
- gun_action?.update_look(/obj/item/gun/energy/laser)
+ gun_action?.update_look(default_look)
/**
* Description: Resets the currently loaded chameleon variables, essentially resetting it to brand new.
@@ -54,36 +55,34 @@
inhand_x_dimension = gun_to_set.inhand_x_dimension
inhand_y_dimension = gun_to_set.inhand_y_dimension
+ // We dupe this casing and then delete it at the end, to grab the projectile.
+ var/obj/item/ammo_casing/casing_to_dupe
+
if(istype(gun_to_set, /obj/item/gun/ballistic))
var/obj/item/gun/ballistic/ball_gun = gun_to_set
- var/obj/item/ammo_box/ball_ammo = new ball_gun.spawn_magazine_type(gun_to_set)
- qdel(ball_gun)
-
- if(!istype(ball_ammo) || !ball_ammo.ammo_type)
- qdel(ball_ammo)
- return FALSE
-
- var/obj/item/ammo_casing/ball_cartridge = new ball_ammo.ammo_type(gun_to_set)
- set_chameleon_ammo(ball_cartridge)
+ // We also need to copy the starting magazine for ballistics.
+ casing_to_dupe = initial(ball_gun.spawn_magazine_type.ammo_type)
+ casing_to_dupe = new casing_to_dupe(src)
else if(istype(gun_to_set, /obj/item/gun/magic))
var/obj/item/gun/magic/magic_gun = gun_to_set
- var/obj/item/ammo_casing/magic_cartridge = new magic_gun.ammo_type(gun_to_set)
- set_chameleon_ammo(magic_cartridge)
+ casing_to_dupe = new magic_gun.ammo_type(src)
else if(istype(gun_to_set, /obj/item/gun/energy))
var/obj/item/gun/energy/energy_gun = gun_to_set
+ // Even if the energy gun has multiple ammo types, we copy the first. Energy guns always (should) have a list in ammo_type.
if(islist(energy_gun.ammo_type) && energy_gun.ammo_type.len)
- var/obj/item/ammo_casing/energy_cartridge = energy_gun.ammo_type[1]
- set_chameleon_ammo(energy_cartridge)
+ var/obj/item/first_casing = energy_gun.ammo_type[1]
+ casing_to_dupe = new first_casing.type(src)
else if(istype(gun_to_set, /obj/item/gun/syringe))
- var/obj/item/ammo_casing/syringe_cartridge = new /obj/item/ammo_casing/syringegun(src)
- set_chameleon_ammo(syringe_cartridge)
+ casing_to_dupe = new /obj/item/ammo_casing/syringegun(src)
else
- var/obj/item/ammo_casing/default_cartridge = new /obj/item/ammo_casing(src)
- set_chameleon_ammo(default_cartridge)
+ casing_to_dupe = new /obj/item/ammo_casing(src)
+
+ set_chameleon_ammo(casing_to_dupe)
+ qdel(casing_to_dupe)
/**
* Description: Sets the ammo type our gun should have.
@@ -155,3 +154,11 @@
var/obj/item/gun/new_gun = new guntype(src)
set_chameleon_gun(new_gun)
qdel(new_gun)
+
+/obj/item/gun/energy/laser/chameleon/ballistic_only
+ actions_types = list(/datum/action/item_action/chameleon/change/gun/ballistic)
+ default_look = /obj/item/gun/ballistic/automatic/mini_uzi
+
+/obj/item/gun/energy/laser/chameleon/ballistic_only/Initialize(mapload)
+ . = ..()
+ set_chameleon_disguise(default_look)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 0c0e73940d27c..9f68581e3ab6f 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -431,9 +431,9 @@
parts_covered += "head"
if(body_parts_covered & CHEST)
parts_covered += "torso"
- if(body_parts_covered & ARMS|HANDS)
+ if(body_parts_covered & (ARMS|HANDS))
parts_covered += "arms"
- if(body_parts_covered & LEGS|FEET)
+ if(body_parts_covered & (LEGS|FEET))
parts_covered += "legs"
if(length(parts_covered))
readout += "[output_string] will protect the wearer's [english_list(parts_covered)] from [span_tooltip("The extremely low pressure is the biggest danger posed by the vacuum of space.", "low pressure")]."
diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm
index 064a24cf5c779..4d7951a62f62a 100644
--- a/code/modules/clothing/glasses/engine_goggles.dm
+++ b/code/modules/clothing/glasses/engine_goggles.dm
@@ -183,26 +183,26 @@
continue
var/datum/gas_mixture/environment = open.return_air()
var/temp = round(environment.return_temperature())
- var/image/pic = image('icons/turf/overlays.dmi', open, "greyOverlay", ABOVE_ALL_MOB_LAYER)
+ var/image/turf_overlay = image('icons/turf/overlays.dmi', open, "greyOverlay", ABOVE_OPEN_TURF_LAYER)
// Lower than TEMP_SHADE_CYAN should be deep blue
switch(temp)
if(-INFINITY to TEMP_SHADE_CYAN)
- pic.color = COLOR_STRONG_BLUE
+ turf_overlay.color = COLOR_STRONG_BLUE
// Between TEMP_SHADE_CYAN and TEMP_SHADE_GREEN
if(TEMP_SHADE_CYAN to TEMP_SHADE_GREEN)
- pic.color = BlendRGB(COLOR_DARK_CYAN, COLOR_LIME, max(round((temp - TEMP_SHADE_CYAN)/(TEMP_SHADE_GREEN - TEMP_SHADE_CYAN), 0.01), 0))
+ turf_overlay.color = BlendRGB(COLOR_DARK_CYAN, COLOR_LIME, max(round((temp - TEMP_SHADE_CYAN)/(TEMP_SHADE_GREEN - TEMP_SHADE_CYAN), 0.01), 0))
// Between TEMP_SHADE_GREEN and TEMP_SHADE_YELLOW
if(TEMP_SHADE_GREEN to TEMP_SHADE_YELLOW)
- pic.color = BlendRGB(COLOR_LIME, COLOR_YELLOW, clamp(round((temp-TEMP_SHADE_GREEN)/(TEMP_SHADE_YELLOW - TEMP_SHADE_GREEN), 0.01), 0, 1))
+ turf_overlay.color = BlendRGB(COLOR_LIME, COLOR_YELLOW, clamp(round((temp-TEMP_SHADE_GREEN)/(TEMP_SHADE_YELLOW - TEMP_SHADE_GREEN), 0.01), 0, 1))
// Between TEMP_SHADE_YELLOW and TEMP_SHADE_RED
if(TEMP_SHADE_YELLOW to TEMP_SHADE_RED)
- pic.color = BlendRGB(COLOR_YELLOW, COLOR_RED, clamp(round((temp-TEMP_SHADE_YELLOW)/(TEMP_SHADE_RED - TEMP_SHADE_YELLOW), 0.01), 0, 1))
+ turf_overlay.color = BlendRGB(COLOR_YELLOW, COLOR_RED, clamp(round((temp-TEMP_SHADE_YELLOW)/(TEMP_SHADE_RED - TEMP_SHADE_YELLOW), 0.01), 0, 1))
// Over TEMP_SHADE_RED should be red
if(TEMP_SHADE_RED to INFINITY)
- pic.color = COLOR_RED
- pic.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- pic.alpha = 200
- flick_overlay_global(pic, list(viewer.client), duration)
+ turf_overlay.color = COLOR_RED
+ turf_overlay.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ turf_overlay.alpha = 200
+ flick_overlay_global(turf_overlay, list(viewer.client), duration)
#undef MODE_NONE
diff --git a/code/modules/clothing/head/mind_monkey_helmet.dm b/code/modules/clothing/head/mind_monkey_helmet.dm
index e9ff99782395f..602f64eefb274 100644
--- a/code/modules/clothing/head/mind_monkey_helmet.dm
+++ b/code/modules/clothing/head/mind_monkey_helmet.dm
@@ -12,8 +12,8 @@
var/light_colors = 1 ///which icon state color this is (red, blue, yellow)
/// This chance is increased by 7 every time the helmet fails to get a host, to dissuade spam. starts negative to add 1 safe reuse
var/rage_chance = -7
- /// Holds the steam effect at dangerous rage chance levels.
- var/obj/effect/abstract/particle_holder/particle_effect
+ /// Currently used particle type
+ var/particle_path
/obj/item/clothing/head/helmet/monkey_sentience/Initialize(mapload)
. = ..()
@@ -60,7 +60,8 @@
UnregisterSignal(magnification, COMSIG_SPECIES_LOSS)
magnification = null
visible_message(span_notice("[src] falls silent and drops on the floor. Maybe you should try again later?"))
- var/particle_path
+ if (particle_path)
+ remove_shared_particles(particle_path)
switch(rage_chance)
if(-7 to 0)
user.visible_message(span_notice("[src] falls silent and drops on the floor. Try again later?"))
@@ -83,11 +84,10 @@
playsound(src, 'sound/machines/buzz/buzz-two.ogg', 30, TRUE)
particle_path = /particles/smoke/steam
rage_chance += 7
-
- QDEL_NULL(particle_effect)
if(particle_path)
- particle_effect = new(src, particle_path)
- QDEL_IN(particle_effect, 2 MINUTES)
+ add_shared_particles(particle_path)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, remove_shared_particles), particle_path), 2 MINUTES)
+ addtimer(VARSET_CALLBACK(src, particle_path, null), 2 MINUTES)
if((rage_chance > 0) && prob(rage_chance)) // too much spam means agnry gorilla running at you
malfunction(user)
diff --git a/code/modules/clothing/shoes/gunboots.dm b/code/modules/clothing/shoes/gunboots.dm
index de74703d449ed..6c9da817146c7 100644
--- a/code/modules/clothing/shoes/gunboots.dm
+++ b/code/modules/clothing/shoes/gunboots.dm
@@ -61,7 +61,7 @@
shot.firer = wearer // don't hit ourself that would be really annoying
shot.impacted = list(WEAKREF(wearer) = TRUE)
shot.def_zone = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) // they're fired from boots after all
- shot.preparePixelProjectile(target, wearer)
+ shot.aim_projectile(target, wearer)
if(!shot.suppressed)
wearer.visible_message(span_danger("[wearer]'s [name] fires \a [shot]!"), "", blind_message = span_hear("You hear a gunshot!"), vision_distance=COMBAT_MESSAGE_RANGE)
shot.fire()
diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm
index dfd69a52f9f5e..7efd1eabbf9a8 100644
--- a/code/modules/events/disease_outbreak.dm
+++ b/code/modules/events/disease_outbreak.dm
@@ -111,6 +111,7 @@
/datum/disease/flu,
/datum/disease/fluspanish,
/datum/disease/magnitis,
+ /datum/disease/weightlessness,
/// And here are some that will never roll for real, just to mess around.
/datum/disease/death_sandwich_poisoning,
/datum/disease/dna_retrovirus,
@@ -138,7 +139,7 @@
virus_candidates += list(/datum/disease/beesease, /datum/disease/brainrot, /datum/disease/fluspanish)
//The wacky ones
- virus_candidates += list(/datum/disease/magnitis, /datum/disease/anxiety)
+ virus_candidates += list(/datum/disease/magnitis, /datum/disease/anxiety, /datum/disease/weightlessness)
//The rest of the diseases either aren't conventional "diseases" or are too unique/extreme to be considered for a normal event
virus_type = pick(virus_candidates)
diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm
index 4b4871e33f67d..b98ae843f7102 100644
--- a/code/modules/experisci/experiment/experiments.dm
+++ b/code/modules/experisci/experiment/experiments.dm
@@ -452,7 +452,7 @@
return
if (isandroid(check))
return TRUE
- if (check.organs < 6 || check.bodyparts < 6)
+ if (length(check.organs) < 6 || length(check.bodyparts) < 6)
return FALSE
var/static/list/augmented_organ_slots = list(
diff --git a/code/modules/experisci/experiment/physical_experiments.dm b/code/modules/experisci/experiment/physical_experiments.dm
index 6b88e19e4a3b6..60303814e44ef 100644
--- a/code/modules/experisci/experiment/physical_experiments.dm
+++ b/code/modules/experisci/experiment/physical_experiments.dm
@@ -21,9 +21,9 @@
/datum/experiment/physical/meat_wall_explosion/check_progress()
. += EXPERIMENT_PROG_BOOL("Fire an emitter at a tracked meat wall", is_complete())
-/datum/experiment/physical/meat_wall_explosion/proc/check_experiment(datum/source, obj/projectile/Proj)
+/datum/experiment/physical/meat_wall_explosion/proc/check_experiment(datum/source, obj/projectile/proj)
SIGNAL_HANDLER
- if(istype(Proj, /obj/projectile/beam/emitter))
+ if(istype(proj, /obj/projectile/beam/emitter))
finish_experiment(linked_experiment_handler)
/datum/experiment/physical/meat_wall_explosion/finish_experiment(datum/component/experiment_handler/experiment_handler)
diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm
index 7301f1a296e44..15c7d22693255 100644
--- a/code/modules/fishing/aquarium/aquarium.dm
+++ b/code/modules/fishing/aquarium/aquarium.dm
@@ -1,14 +1,3 @@
-#define AQUARIUM_LAYER_STEP 0.01
-/// Aquarium content layer offsets
-#define AQUARIUM_MIN_OFFSET 0.02
-#define AQUARIUM_MAX_OFFSET 1
-/// The layer of the glass overlay
-#define AQUARIUM_GLASS_LAYER 0.01
-/// The layer of the aquarium pane borders
-#define AQUARIUM_BORDERS_LAYER AQUARIUM_MAX_OFFSET + AQUARIUM_LAYER_STEP
-/// Layer for stuff rendered below the glass overlay
-#define AQUARIUM_BELOW_GLASS_LAYER 0.01
-
/obj/structure/aquarium
name = "aquarium"
desc = "A vivarium in which aquatic fauna and flora are usually kept and displayed."
@@ -17,351 +6,75 @@
icon = 'icons/obj/aquarium/tanks.dmi'
icon_state = "aquarium_map"
+ base_icon_state = "aquarium"
integrity_failure = 0.3
- /// The icon state is used for mapping so mappers know what they're placing. This prefixes the real icon used in game.
- /// For an example, "aquarium" gives the base sprite of "aquarium_base", the glass is "aquarium_glass_water", and so on.
- var/icon_prefix = "aquarium"
-
- var/fluid_type = AQUARIUM_FLUID_FRESHWATER
- var/fluid_temp = DEFAULT_AQUARIUM_TEMP
- var/min_fluid_temp = MIN_AQUARIUM_TEMP
- var/max_fluid_temp = MAX_AQUARIUM_TEMP
-
- ///While the feed storage is not empty, this is the interval which the fish are fed.
- var/feeding_interval = 3 MINUTES
- ///The last time fishes were fed by the acquarium itsef.
- var/last_feeding
-
- /// Can fish reproduce in this quarium.
- var/reproduction_and_growth = TRUE
-
//This is the area where fish can swim
var/aquarium_zone_min_px = 2
var/aquarium_zone_max_px = 31
var/aquarium_zone_min_py = 10
var/aquarium_zone_max_py = 28
- var/list/fluid_types = list(AQUARIUM_FLUID_SALTWATER, AQUARIUM_FLUID_FRESHWATER, AQUARIUM_FLUID_SULPHWATEVER, AQUARIUM_FLUID_AIR)
-
- var/panel_open = FALSE
+ /// Default beauty of the aquarium, without anything inside it
+ var/default_beauty = 150
- ///Current layers in use by aquarium contents
- var/list/used_layers = list()
-
- /// /obj/item/fish in the aquarium, sorted by type - does not include things with aquarium visuals that are not fish
- var/list/tracked_fish_by_type
-
- /// Var used to keep track of the current beauty of the aquarium, which can be throughfully changed by aquarium content.
- var/current_beauty = 150
+ ///Tracks the fluid type of our aquarium component. Used for the icon suffix of some overlays and splashing water when broken.
+ var/fluid_type = AQUARIUM_FLUID_FRESHWATER
/obj/structure/aquarium/Initialize(mapload)
. = ..()
- update_appearance()
- RegisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(track_if_fish))
- AddElement(/datum/element/relay_attackers)
- RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(on_attacked))
- create_reagents(6, SEALED_CONTAINER)
- RegisterSignal(reagents, COMSIG_REAGENTS_NEW_REAGENT, PROC_REF(start_autofeed))
+ AddComponent(/datum/component/aquarium, aquarium_zone_min_px, aquarium_zone_max_px, aquarium_zone_min_py, aquarium_zone_max_py, default_beauty)
AddComponent(/datum/component/plumbing/aquarium, start = anchored)
- if(current_beauty)
- AddElement(/datum/element/beauty, current_beauty)
- ADD_KEEP_TOGETHER(src, INNATE_TRAIT)
-
-/obj/structure/aquarium/proc/track_if_fish(atom/source, atom/initialized)
- SIGNAL_HANDLER
- if(isfish(initialized))
- LAZYADDASSOCLIST(tracked_fish_by_type, initialized.type, initialized)
-
-/obj/structure/aquarium/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
- . = ..()
- if(isfish(arrived))
- LAZYADDASSOCLIST(tracked_fish_by_type, arrived.type, arrived)
-
-/obj/structure/aquarium/Exited(atom/movable/gone, direction)
- . = ..()
- LAZYREMOVEASSOC(tracked_fish_by_type, gone.type, gone)
-
-/obj/structure/aquarium/proc/start_autofeed(datum/source, new_reagent, amount, reagtemp, data, no_react)
- SIGNAL_HANDLER
- START_PROCESSING(SSobj, src)
- UnregisterSignal(reagents, COMSIG_REAGENTS_NEW_REAGENT)
-
-/obj/structure/aquarium/process(seconds_per_tick)
- if(!reagents.total_volume)
- RegisterSignal(reagents, COMSIG_REAGENTS_NEW_REAGENT, PROC_REF(start_autofeed))
- return PROCESS_KILL
- if(world.time < last_feeding + feeding_interval)
- return
- last_feeding = world.time
- var/list/fishes = get_fishes()
- for(var/obj/item/fish/fish as anything in fishes)
- fish.feed(reagents)
-
-/// Returns tracked_fish_by_type but flattened and without the items in the blacklist, also shuffled if shuffle is TRUE.
-/obj/structure/aquarium/proc/get_fishes(shuffle = FALSE, blacklist)
- . = list()
- for(var/fish_type in tracked_fish_by_type)
- . += tracked_fish_by_type[fish_type]
- . -= blacklist
- if(shuffle)
- . = shuffle(.)
- return .
-
-/obj/structure/aquarium/proc/request_layer(layer_type)
- /**
- * base aq layer
- * min_offset = this value is returned on bottom layer mode
- * min_offset + 0.1 fish1
- * min_offset + 0.2 fish2
- * ... these layers are returned for auto layer mode and tracked by used_layers
- * min_offset + max_offset = this value is returned for top layer mode
- * min_offset + max_offset + 1 = this is used for glass overlay
- */
- //optional todo: hook up sending surface changed on aquarium changing layers
- switch(layer_type)
- if(AQUARIUM_LAYER_MODE_BEHIND_GLASS)
- return layer + AQUARIUM_BELOW_GLASS_LAYER
- if(AQUARIUM_LAYER_MODE_BOTTOM)
- return layer + AQUARIUM_MIN_OFFSET
- if(AQUARIUM_LAYER_MODE_TOP)
- return layer + AQUARIUM_MAX_OFFSET
- if(AQUARIUM_LAYER_MODE_AUTO)
- var/chosen_layer = AQUARIUM_MIN_OFFSET + AQUARIUM_LAYER_STEP
- while((chosen_layer in used_layers) && (chosen_layer <= AQUARIUM_MAX_OFFSET))
- chosen_layer += AQUARIUM_LAYER_STEP
- used_layers += chosen_layer
- return layer + chosen_layer
-
-/obj/structure/aquarium/proc/free_layer(value)
- used_layers -= value
-
-/obj/structure/aquarium/proc/get_surface_properties()
- . = list()
- .[AQUARIUM_PROPERTIES_PX_MIN] = aquarium_zone_min_px
- .[AQUARIUM_PROPERTIES_PX_MAX] = aquarium_zone_max_px
- .[AQUARIUM_PROPERTIES_PY_MIN] = aquarium_zone_min_py
- .[AQUARIUM_PROPERTIES_PY_MAX] = aquarium_zone_max_py
+ RegisterSignal(src, COMSIG_AQUARIUM_FLUID_CHANGED, PROC_REF(on_aquarium_liquid_changed))
+ update_appearance()
/obj/structure/aquarium/update_icon()
. = ..()
///"aquarium_map" is used for mapping, so mappers can tell what it's.
- icon_state = icon_prefix + "_base"
+ icon_state = base_icon_state + "_base"
+
+/obj/structure/aquarium/proc/on_aquarium_liquid_changed(datum/source, fluid_type)
+ SIGNAL_HANDLER
+ src.fluid_type = fluid_type
+ update_appearance()
/obj/structure/aquarium/update_overlays()
. = ..()
- if(panel_open)
- . += icon_prefix + "_panel"
+ if(HAS_TRAIT(src, TRAIT_AQUARIUM_PANEL_OPEN))
+ . += base_icon_state + "_panel"
+ var/icon_suffix = fluid_type == AQUARIUM_FLUID_AIR ? "air" : "water"
///The glass overlay
- var/suffix = fluid_type == AQUARIUM_FLUID_AIR ? "air" : "water"
if(broken)
- suffix += "_broken"
- . += mutable_appearance(icon, icon_prefix + "_glass_cracks", layer = layer + AQUARIUM_BORDERS_LAYER)
- . += mutable_appearance(icon, icon_prefix + "_glass_[suffix]", layer = layer + AQUARIUM_GLASS_LAYER)
- . += mutable_appearance(icon, icon_prefix + "_borders", layer = layer + AQUARIUM_BORDERS_LAYER)
-
-/obj/structure/aquarium/examine(mob/user)
- . = ..()
- . += span_notice("Alt-click to [panel_open ? "close" : "open"] the control and feed panel.")
- if(panel_open && reagents.total_volume)
- . += span_notice("You can use a plunger to empty the feed storage.")
-
-/obj/structure/aquarium/click_alt(mob/living/user)
- panel_open = !panel_open
- balloon_alert(user, "panel [panel_open ? "open" : "closed"]")
- if(panel_open)
- reagents.flags |= TRANSPARENT|REFILLABLE
- else
- reagents.flags &= ~(TRANSPARENT|REFILLABLE)
- update_appearance()
- return CLICK_ACTION_SUCCESS
+ icon_suffix += "_broken"
+ . += mutable_appearance(icon, base_icon_state + "_glass_cracks", layer = layer + AQUARIUM_BORDERS_LAYER)
+ . += mutable_appearance(icon, base_icon_state + "_glass_[icon_suffix]", layer = layer + AQUARIUM_GLASS_LAYER)
+ . += mutable_appearance(icon, base_icon_state + "_borders", layer = layer + AQUARIUM_BORDERS_LAYER)
/obj/structure/aquarium/wrench_act(mob/living/user, obj/item/tool)
. = ..()
default_unfasten_wrench(user, tool)
return ITEM_INTERACT_SUCCESS
-/obj/structure/aquarium/plunger_act(obj/item/plunger/P, mob/living/user, reinforced)
- if(!panel_open)
+/obj/structure/aquarium/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!istype(tool, /obj/item/stack/sheet/glass))
return
- user.balloon_alert_to_viewers("plunging...")
- if(do_after(user, 3 SECONDS, target = src))
- user.balloon_alert_to_viewers("finished plunging")
- reagents.expose(get_turf(src), TOUCH) //splash on the floor
- reagents.clear_reagents()
-
-/obj/structure/aquarium/attackby(obj/item/item, mob/living/user, params)
- if(broken)
- var/obj/item/stack/sheet/glass/glass = item
- if(istype(glass))
- if(glass.get_amount() < 2)
- balloon_alert(user, "it needs two sheets!")
- return
- balloon_alert(user, "fixing the aquarium...")
- if(do_after(user, 2 SECONDS, target = src))
- glass.use(2)
- broken = FALSE
- atom_integrity = max_integrity
- update_appearance()
- return TRUE
- else
- var/insert_attempt = SEND_SIGNAL(item, COMSIG_TRY_INSERTING_IN_AQUARIUM, src)
- switch(insert_attempt)
- if(COMSIG_CAN_INSERT_IN_AQUARIUM)
- if(!user.transferItemToLoc(item, src))
- user.balloon_alert(user, "stuck to your hand!")
- return TRUE
- balloon_alert(user, "added to aquarium")
- update_appearance()
- return TRUE
- if(COMSIG_CANNOT_INSERT_IN_AQUARIUM)
- balloon_alert(user, "cannot add to aquarium!")
- return TRUE
-
- if(istype(item, /obj/item/reagent_containers/cup/fish_feed) && !panel_open)
- if(!item.reagents.total_volume)
- balloon_alert(user, "[item] is empty!")
- return TRUE
- var/list/fishes = get_fishes()
- if(!length(fishes))
- balloon_alert(user, "no fish to feed!")
- return TRUE
- for(var/obj/item/fish/fish as anything in fishes)
- fish.feed(item.reagents)
- balloon_alert(user, "fed the fish")
- return TRUE
- if(istype(item, /obj/item/aquarium_upgrade))
- var/obj/item/aquarium_upgrade/upgrade = item
- if(upgrade.upgrade_from_type != type)
- balloon_alert(user, "wrong kind of aquarium!")
- return
- balloon_alert(user, "upgrading...")
- if(!do_after(user, 5 SECONDS, src))
- return
- var/obj/structure/aquarium/upgraded_aquarium = new upgrade.upgrade_to_type(loc)
- for(var/atom/movable/moving in contents)
- moving.forceMove(upgraded_aquarium)
- balloon_alert(user, "upgraded")
- qdel(upgrade)
- qdel(src)
- return
- return ..()
-
-/obj/structure/aquarium/proc/on_attacked(datum/source, mob/attacker, attack_flags)
- var/list/fishes = get_fishes()
- //I wish this were an aquarium signal, but the aquarium_content component got in the way.
- for(var/obj/item/fish/fish as anything in fishes)
- SEND_SIGNAL(fish, COMSIG_FISH_STIRRED)
-
-/obj/structure/aquarium/interact(mob/user)
- if(panel_open)
- return ..() //call base ui_interact
- else
- admire(user)
-
-///Apply mood bonus depending on aquarium status
-/obj/structure/aquarium/proc/admire(mob/living/user)
- user.balloon_alert(user, "admiring aquarium...")
- if(!do_after(user, 5 SECONDS, target = src))
- return
- var/alive_fish = 0
- var/dead_fish = 0
- var/list/tracked_fish = get_fishes()
- for(var/obj/item/fish/fish in tracked_fish)
- if(fish.status == FISH_ALIVE)
- alive_fish++
- else
- dead_fish++
-
- var/morb = HAS_MIND_TRAIT(user, TRAIT_MORBID)
- //Check if there are live fish - good mood
- //All fish dead - bad mood.
- //No fish - nothing.
- if(alive_fish > 0)
- user.add_mood_event("aquarium", morb ? /datum/mood_event/morbid_aquarium_bad : /datum/mood_event/aquarium_positive)
- else if(dead_fish > 0)
- user.add_mood_event("aquarium", morb ? /datum/mood_event/morbid_aquarium_good : /datum/mood_event/aquarium_negative)
- // Could maybe scale power of this mood with number/types of fish
-
-/obj/structure/aquarium/ui_data(mob/user)
- . = ..()
- .["fluidType"] = fluid_type
- .["temperature"] = fluid_temp
- .["allowBreeding"] = reproduction_and_growth
- .["fishData"] = list()
- .["feedingInterval"] = feeding_interval / (1 MINUTES)
- .["propData"] = list()
- for(var/atom/movable/item in contents)
- if(isfish(item))
- var/obj/item/fish/fish = item
- .["fishData"] += list(list(
- "fish_ref" = REF(fish),
- "fish_name" = uppertext(fish.name),
- "fish_happiness" = fish.get_happiness_value(),
- "fish_icon" = fish::icon,
- "fish_icon_state" = fish::icon_state,
- "fish_health" = fish.health,
- ))
- continue
- .["propData"] += list(list(
- "prop_ref" = REF(item),
- "prop_name" = item.name,
- "prop_icon" = item::icon,
- "prop_icon_state" = item::icon_state,
- ))
-
-/obj/structure/aquarium/ui_static_data(mob/user)
- . = ..()
- //I guess these should depend on the fluid so lava critters can get high or stuff below water freezing point but let's keep it simple for now.
- .["minTemperature"] = min_fluid_temp
- .["maxTemperature"] = max_fluid_temp
- .["fluidTypes"] = fluid_types
- .["heartIcon"] = 'icons/effects/effects.dmi'
-
-/obj/structure/aquarium/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
- . = ..()
- if(.)
- return
- var/mob/user = usr
- switch(action)
- if("temperature")
- var/temperature = params["temperature"]
- if(isnum(temperature))
- fluid_temp = clamp(temperature, min_fluid_temp, max_fluid_temp)
- . = TRUE
- if("fluid")
- if(params["fluid"] in fluid_types)
- fluid_type = params["fluid"]
- SEND_SIGNAL(src, COMSIG_AQUARIUM_FLUID_CHANGED, fluid_type)
- . = TRUE
- if("allow_breeding")
- reproduction_and_growth = !reproduction_and_growth
- . = TRUE
- if("feeding_interval")
- feeding_interval = params["feeding_interval"] MINUTES
- . = TRUE
- if("pet_fish")
- var/obj/item/fish/fish = locate(params["fish_reference"]) in contents
- fish?.pet_fish(user)
- if("remove_item")
- var/atom/movable/item = locate(params["item_reference"]) in contents
- item?.forceMove(drop_location())
- to_chat(user, span_notice("You take out [item] from [src]."))
- if("rename_fish")
- var/new_name = sanitize_name(params["chosen_name"])
- var/atom/movable/fish = locate(params["fish_reference"]) in contents
- if(!fish || !new_name || new_name == fish.name)
- return
- fish.AddComponent(/datum/component/rename, new_name, fish.desc)
-
-/obj/structure/aquarium/ui_interact(mob/user, datum/tgui/ui)
- . = ..()
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "Aquarium", name)
- ui.open()
+ if(!broken)
+ balloon_alert(user, "aquarium not broken!")
+ return ITEM_INTERACT_BLOCKING
+ var/obj/item/stack/sheet/glass/glass = tool
+ if(glass.get_amount() < 2)
+ balloon_alert(user, "it needs two sheets!")
+ return ITEM_INTERACT_BLOCKING
+ balloon_alert(user, "fixing the aquarium...")
+ if(!do_after(user, 2 SECONDS, target = src))
+ return ITEM_INTERACT_BLOCKING
+ glass.use(2)
+ broken = FALSE
+ atom_integrity = max_integrity
+ update_appearance()
+ return ITEM_INTERACT_SUCCESS
/obj/structure/aquarium/atom_break(damage_flag)
. = ..()
@@ -377,50 +90,168 @@
else
possible_destinations_for_fish = list(droploc)
playsound(src, 'sound/effects/glass/glassbr3.ogg', 100, TRUE)
- for(var/atom/movable/fish in contents)
- fish.forceMove(pick(possible_destinations_for_fish))
+ for(var/atom/movable/content as anything in contents)
+ content.forceMove(pick(possible_destinations_for_fish))
if(fluid_type != AQUARIUM_FLUID_AIR)
var/datum/reagents/reagent_splash = new()
reagent_splash.add_reagent(/datum/reagent/water, 30)
chem_splash(droploc, null, 3, list(reagent_splash))
update_appearance()
-#undef AQUARIUM_LAYER_STEP
-#undef AQUARIUM_MIN_OFFSET
-#undef AQUARIUM_MAX_OFFSET
-#undef AQUARIUM_GLASS_LAYER
-#undef AQUARIUM_BORDERS_LAYER
-#undef AQUARIUM_BELOW_GLASS_LAYER
-
-/obj/structure/aquarium/lawyer
+/obj/structure/aquarium/prefilled
anchored = TRUE
-/obj/structure/aquarium/lawyer/Initialize(mapload)
+/obj/structure/aquarium/prefilled/Initialize(mapload)
. = ..()
new /obj/item/aquarium_prop/sand(src)
new /obj/item/aquarium_prop/seaweed(src)
- if(prob(85))
- new /obj/item/fish/goldfish/gill(src)
- reagents.add_reagent(/datum/reagent/consumable/nutriment, 2)
+ new /obj/item/fish/goldfish(src)
+ new /obj/item/fish/angelfish(src)
+ new /obj/item/fish/guppy(src)
+
+ //They'll be alive for about 30 minutes with this amount.
+ reagents.add_reagent(/datum/reagent/consumable/nutriment, 3)
+
+/obj/item/fish_tank
+ name = "fish tank"
+ desc = "A more portable sort of aquarium to store various fishes in, unless they're too big or there're too many of them."
+ icon = 'icons/obj/aquarium/tanks.dmi'
+ icon_state = "fish_tank_map"
+ base_icon_state = "fish_tank"
+ force = 5
+ throwforce = 5
+ throw_range = 3
+ w_class = WEIGHT_CLASS_BULKY
+ item_flags = SLOWS_WHILE_IN_HAND
+
+ custom_price = PAYCHECK_CREW * 9
+
+ ///Tracks the fluid type of our aquarium component. Used for overlays
+ var/fluid_type = AQUARIUM_FLUID_FRESHWATER
+
+ ///Fish which size exceed this value cannot be inserted
+ var/maximum_relative_size = 100
+ ///Fish cannot be inserted if the sum of the size of all fish in this tank exceeds this value.
+ var/max_total_size = 220
+ ///Tracks the sum of the size of all fish in this tank
+ var/current_summed_size = 0
+ ///Tracks the sum of the weight of all fish in this tank
+ var/current_summed_weight = 0
+
+ var/slowdown_coeff = 1
+
+ ///The minimum fluid temperature of this fish tank
+ var/min_fluid_temp = MIN_AQUARIUM_TEMP + 12
+ ///The maximum fluid temperature of this fish tank
+ var/max_fluid_temp = MAX_AQUARIUM_TEMP - 32
+ ///The reagent capacity of this fish tank
+ var/reagent_size = 4
+
+/obj/item/fish_tank/Initialize(mapload)
+ . = ..()
+ update_appearance()
+ AddComponent(\
+ /datum/component/aquarium,\
+ min_px = 6,\
+ max_px = 26,\
+ min_py = 6,\
+ max_py = 24,\
+ default_beauty = 100,\
+ reagents_size = src.reagent_size,\
+ min_fluid_temp = src.min_fluid_temp,\
+ max_fluid_temp = src.max_fluid_temp,\
+ )
+ AddComponent(/datum/component/plumbing/aquarium, start = anchored)
+ RegisterSignal(src, COMSIG_AQUARIUM_FLUID_CHANGED, PROC_REF(on_aquarium_liquid_changed))
+ RegisterSignal(src, COMSIG_AQUARIUM_CAN_INSERT, PROC_REF(can_insert))
+ RegisterSignal(src, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(on_new_fish))
+
+/obj/item/fish_tank/update_icon()
+ . = ..()
+ ///"aquarium_map" is used for mapping, so mappers can tell what it's.
+ icon_state = base_icon_state
+
+/obj/item/fish_tank/proc/on_aquarium_liquid_changed(datum/source, fluid_type)
+ SIGNAL_HANDLER
+ src.fluid_type = fluid_type
+ update_appearance()
+
+/obj/item/fish_tank/update_overlays()
+ . = ..()
+ . += "[base_icon_state]_panel[HAS_TRAIT(src, TRAIT_AQUARIUM_PANEL_OPEN) ? "_open" : ""]"
+ . += mutable_appearance(icon, "[base_icon_state]_[fluid_type == AQUARIUM_FLUID_AIR ? "air" : "water"]", layer = layer + AQUARIUM_GLASS_LAYER)
+ . += mutable_appearance(icon, "[base_icon_state]_borders", layer = layer + AQUARIUM_BORDERS_LAYER)
+
+/obj/item/fish_tank/proc/can_insert(atom/movable/source, obj/item/item, mob/living/user)
+ SIGNAL_HANDLER
+ if(!isfish(item))
+ return
+ var/obj/item/fish/fish = item
+ if(fish.size > maximum_relative_size)
+ balloon_alert(user, "fish is too big!")
+ return COMSIG_CANNOT_INSERT_IN_AQUARIUM
+ if(current_summed_size > max_total_size)
+ balloon_alert(user, "fish tank is full!")
+ return COMSIG_CANNOT_INSERT_IN_AQUARIUM
+ return COMSIG_CAN_INSERT_IN_AQUARIUM
+
+/obj/item/fish_tank/Entered(atom/movable/entered)
+ . = ..()
+ on_new_fish(src, entered)
+
+/obj/item/fish_tank/proc/on_new_fish(datum/source, atom/movable/movable)
+ SIGNAL_HANDLER
+ if(!isfish(movable))
+ return
+ var/obj/item/fish/fish = movable
+ change_size_weight(fish.size, fish.weight)
+ RegisterSignal(fish, COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT, PROC_REF(on_fish_size_weight_updated))
+
+/obj/item/fish_tank/proc/on_fish_size_weight_updated(obj/item/fish/source, new_size, new_weight)
+ SIGNAL_HANDLER
+ change_size_weight(new_size - source.size, new_weight - source.weight)
+
+/obj/item/fish_tank/Exited(atom/movable/gone)
+ if(isfish(gone))
+ var/obj/item/fish/fish = gone
+ change_size_weight(-fish.size, -fish.weight)
+ UnregisterSignal(fish, COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT)
+ return ..()
+
+/obj/item/fish_tank/proc/change_size_weight(size_change, weight_change)
+ current_summed_size += size_change
+ current_summed_weight += weight_change
+ if(current_summed_size > max_total_size)
+ ADD_TRAIT(src, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH, INNATE_TRAIT)
else
- new /obj/item/fish/goldfish/three_eyes/gill(src)
- reagents.add_reagent(/datum/reagent/toxin/mutagen, 2) //three eyes goldfish feed on mutagen.
+ REMOVE_TRAIT(src, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH, INNATE_TRAIT)
+ if(HAS_TRAIT(src, TRAIT_SPEED_POTIONED) || current_summed_weight < FISH_WEIGHT_SLOWDOWN)
+ slowdown = 0
+ drag_slowdown = 0
+ else
+ slowdown = GET_FISH_SLOWDOWN(current_summed_weight) * slowdown_coeff
+ drag_slowdown = slowdown * 0.5
+ if(ismob(loc))
+ var/mob/mob = loc
+ mob.update_equipment_speed_mods()
+ force = min(2 + (GET_FISH_WEIGHT_RANK(current_summed_weight) * 3), 21)
+ throwforce = force
-/obj/structure/aquarium/prefilled
- anchored = TRUE
+///The lawyer's own pet goldfish's fish tank. It used to be an aquarium, but now it can be held and carried around.
+/obj/item/fish_tank/lawyer
-/obj/structure/aquarium/prefilled/Initialize(mapload)
+/obj/item/fish_tank/lawyer/Initialize(mapload)
. = ..()
new /obj/item/aquarium_prop/sand(src)
new /obj/item/aquarium_prop/seaweed(src)
- new /obj/item/fish/goldfish(src)
- new /obj/item/fish/angelfish(src)
- new /obj/item/fish/guppy(src)
-
- //They'll be alive for about 30 minutes with this amount.
- reagents.add_reagent(/datum/reagent/consumable/nutriment, 3)
+ if(prob(85))
+ new /obj/item/fish/goldfish/gill(src)
+ reagents.add_reagent(/datum/reagent/consumable/nutriment, 3)
+ else
+ new /obj/item/fish/goldfish/three_eyes/gill(src)
+ reagents.add_reagent(/datum/reagent/toxin/mutagen, 3) //three eyes goldfish feed on mutagen.
diff --git a/code/modules/fishing/aquarium/aquarium_kit.dm b/code/modules/fishing/aquarium/aquarium_kit.dm
index 17dd518710d9d..f18f67b931370 100644
--- a/code/modules/fishing/aquarium/aquarium_kit.dm
+++ b/code/modules/fishing/aquarium/aquarium_kit.dm
@@ -117,20 +117,20 @@
/obj/item/aquarium_kit
name = "DIY Aquarium Construction Kit"
- desc = "Everything you need to build your own aquarium. Raw materials sold separately."
+ desc = "Everything you need to build your own aquarium or fish tank. Raw materials sold separately."
icon = 'icons/obj/aquarium/supplies.dmi'
icon_state = "construction_kit"
w_class = WEIGHT_CLASS_TINY
/obj/item/aquarium_kit/Initialize(mapload)
. = ..()
- var/static/list/recipes = list(/datum/crafting_recipe/aquarium)
+ var/static/list/recipes = list(/datum/crafting_recipe/aquarium, /datum/crafting_recipe/fish_tank)
AddElement(/datum/element/slapcrafting, recipes)
/obj/item/aquarium_prop
name = "generic aquarium prop"
desc = "very boring"
- icon = 'icons/obj/aquarium/supplies.dmi'
+ icon = 'icons/obj/aquarium/tanks.dmi'
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/plastic = COIN_MATERIAL_AMOUNT)
@@ -141,15 +141,21 @@
. = ..()
//It's important that we register the signals before the component is attached.
RegisterSignal(src, COMSIG_AQUARIUM_CONTENT_GENERATE_APPEARANCE, PROC_REF(generate_aquarium_appearance))
- AddComponent(/datum/component/aquarium_content, beauty = beauty)
+ AddComponent(/datum/component/aquarium_content)
ADD_TRAIT(src, TRAIT_UNIQUE_AQUARIUM_CONTENT, INNATE_TRAIT)
-/obj/item/aquarium_prop/proc/generate_aquarium_appearance(datum/source, obj/effect/aquarium/visual)
+ RegisterSignal(src, COMSIG_MOVABLE_GET_AQUARIUM_BEAUTY, PROC_REF(get_aquarium_beauty))
+
+/obj/item/aquarium_prop/proc/generate_aquarium_appearance(datum/source, obj/effect/aquarium/visual, atom/movable/aquarium)
SIGNAL_HANDLER
- visual.icon = icon
- visual.icon_state = icon_state
+ visual.icon = aquarium.icon
+ visual.icon_state = "[icon_state][isitem(aquarium) ? "_fish_tank" : ""]"
visual.layer_mode = layer_mode
+/obj/item/aquarium_prop/proc/get_aquarium_beauty(datum/source, list/beauty_holder)
+ SIGNAL_HANDLER
+ beauty_holder += beauty
+
/obj/item/aquarium_prop/rocks
name = "decorative rocks"
desc = "A bunch of tiny plastic rocks for decorating an aquarium. Surely you could have just used real pebbles?"
diff --git a/code/modules/fishing/aquarium/aquarium_upgrades.dm b/code/modules/fishing/aquarium/aquarium_upgrades.dm
index c73e6e9d230ae..042074500afb0 100644
--- a/code/modules/fishing/aquarium/aquarium_upgrades.dm
+++ b/code/modules/fishing/aquarium/aquarium_upgrades.dm
@@ -11,8 +11,25 @@
/// typepath of the new aquarium subtype created.
var/upgrade_to_type = /obj/structure/aquarium
+/obj/item/aquarium_upgrade/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!HAS_TRAIT(interacting_with, TRAIT_IS_AQUARIUM))
+ return NONE
+ if(upgrade_from_type != interacting_with.type)
+ interacting_with.balloon_alert(user, "wrong kind of aquarium!")
+ return ITEM_INTERACT_BLOCKING
+ interacting_with.balloon_alert(user, "upgrading...")
+ if(!PERFORM_ALL_TESTS(aquarium_upgrade) && !do_after(user, 5 SECONDS, interacting_with))
+ return ITEM_INTERACT_BLOCKING
+ var/atom/movable/upgraded_aquarium = new upgrade_to_type(interacting_with.drop_location())
+ //This should transfer all the fish, reagents and settings from the aquarium component
+ interacting_with.TransferComponents(upgraded_aquarium)
+ upgraded_aquarium.balloon_alert(user, "upgraded")
+ qdel(src)
+ qdel(interacting_with)
+ return ITEM_INTERACT_SUCCESS
+
/obj/item/aquarium_upgrade/bioelec_gen
- name = "Aquarium Bioelectricity Kit"
+ name = "aquarium bioelectricity kit"
desc = "All the required components to allow an aquarium to harness energy bioelectric fish."
icon_state = "bioelec_kit"
upgrade_to_type = /obj/structure/aquarium/bioelec_gen
@@ -22,9 +39,13 @@
desc = "An unconventional type of generator that boosts and harvests the energy produced by bioelectric fish."
icon_state = "bioelec_map"
- icon_prefix = "bioelec"
+ base_icon_state = "bioelec"
+
+ default_beauty = 0
- current_beauty = 0
+/obj/structure/aquarium/bioelec_gen/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_BIOELECTRIC_GENERATOR, INNATE_TRAIT)
/obj/structure/aquarium/bioelec_gen/zap_act(power, zap_flags)
var/explosive = zap_flags & ZAP_MACHINE_EXPLOSIVE
@@ -37,3 +58,23 @@
. += span_boldwarning("WARNING! WARNING! WARNING!")
. += span_warning("The bioelectric potential of the fish inside is magnified to dangerous levels by the generator.")
. += span_notice("Tesla coils are required to collect this magnified energy... and you'll want a grounding rod to protect yourself as well.")
+
+/obj/item/aquarium_upgrade/bluespace_tank
+ name = "bluespace fish tank kit"
+ desc = "The required components to upgrade your portable fish tank into bottomless, handheld aquarium."
+ icon_state = "bluespace_kit"
+ upgrade_from_type = /obj/item/fish_tank
+ upgrade_to_type = /obj/item/fish_tank/bluespace
+
+/obj/item/fish_tank/bluespace
+ name = "bluespace fish tank"
+ desc = "All the capacity of a bulky room aquarium, squeezed in a bag-sized rectangular cuboid."
+ icon_state = "fish_tank_bluespace_map"
+ base_icon_state = "fish_tank_bluespace"
+ w_class = WEIGHT_CLASS_NORMAL
+ maximum_relative_size = INFINITY
+ max_total_size = 2000
+ slowdown_coeff = 0.15
+ min_fluid_temp = MIN_AQUARIUM_TEMP
+ max_fluid_temp = MAX_AQUARIUM_TEMP
+ reagent_size = 6
diff --git a/code/modules/fishing/aquarium/fish_analyzer.dm b/code/modules/fishing/aquarium/fish_analyzer.dm
index 617d8b600baaa..3df28e326ac3f 100644
--- a/code/modules/fishing/aquarium/fish_analyzer.dm
+++ b/code/modules/fishing/aquarium/fish_analyzer.dm
@@ -59,18 +59,15 @@
. += emissive_appearance(icon, "fish_analyzer_emissive", src)
/obj/item/fish_analyzer/interact_with_atom(atom/target, mob/living/user, list/modifiers)
- if(!isfish(target) && !isaquarium(target))
+ if(!isfish(target) && !HAS_TRAIT(target, TRAIT_IS_AQUARIUM))
return NONE
if(!user.can_read(src) || user.is_blind())
return ITEM_INTERACT_BLOCKING
- if(isfish(target) || istype(target, /obj/structure/aquarium))
- scanned_item = WEAKREF(target)
- SEND_SIGNAL(src, COMSIG_FISH_ANALYZER_ANALYZE_STATUS, target, user)
- ui_interact(user)
- return ITEM_INTERACT_SUCCESS
-
- return NONE
+ scanned_item = WEAKREF(target)
+ SEND_SIGNAL(src, COMSIG_FISH_ANALYZER_ANALYZE_STATUS, target, user)
+ ui_interact(user)
+ return ITEM_INTERACT_SUCCESS
/obj/item/fish_analyzer/ui_interact(mob/user, datum/tgui/ui)
if(isnull(scanned_item?.resolve()))
@@ -92,13 +89,13 @@
data["fish_scanned"] = TRUE
return extract_fish_info(data, scanned_object)
- var/obj/structure/aquarium/aquarium = scanned_object
+ var/atom/movable/aquarium = scanned_object
for(var/obj/item/fish/fishie in aquarium)
- extract_fish_info(data, fishie, aquarium)
+ extract_fish_info(data, fishie)
return data
-/obj/item/fish_analyzer/proc/extract_fish_info(list/data, obj/item/fish/fishie, obj/structure/aquarium/aquarium)
+/obj/item/fish_analyzer/proc/extract_fish_info(list/data, obj/item/fish/fishie)
var/list/fish_traits = list()
var/list/fish_evolutions = list()
@@ -129,12 +126,12 @@
"fish_min_temp" = fishie.required_temperature_min,
"fish_max_temp" = fishie.required_temperature_max,
"fish_hunger" = HAS_TRAIT(fishie, TRAIT_FISH_NO_HUNGER) ? 0 : 1 - fishie.get_hunger(),
- "fish_fluid_compatible" = aquarium ? compatible_fluid_type(fishie.required_fluid_type, aquarium.fluid_type) : null,
+ "fish_fluid_compatible" = fishie.fish_flags & FISH_FLAG_SAFE_FLUID,
"fish_fluid_type" = fishie.required_fluid_type,
"fish_breed_timer" = round(max(fishie.breeding_wait - world.time, 0) / 10),
"fish_traits" = fish_traits,
"fish_evolutions" = fish_evolutions,
- "fish_suitable_temp" = aquarium ? ISINRANGE(aquarium.fluid_temp, fishie.required_temperature_min, fishie.required_temperature_max) : null
+ "fish_suitable_temp" = fishie.fish_flags & FISH_FLAG_SAFE_TEMPERATURE,
))
return data
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index 033e6e60f2f6e..cee77ae003d88 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -176,10 +176,11 @@
base_icon_state = icon_state
//It's important that we register the signals before the component is attached.
RegisterSignal(src, COMSIG_AQUARIUM_CONTENT_DO_ANIMATION, PROC_REF(update_aquarium_animation))
- RegisterSignal(src, AQUARIUM_CONTENT_RANDOMIZE_POSITION, PROC_REF(randomize_aquarium_position))
+ RegisterSignal(src, COMSIG_AQUARIUM_CONTENT_RANDOMIZE_POSITION, PROC_REF(randomize_aquarium_position))
RegisterSignal(src, COMSIG_AQUARIUM_CONTENT_GENERATE_APPEARANCE, PROC_REF(update_aquarium_appearance))
- AddComponent(/datum/component/aquarium_content, list(COMSIG_FISH_STIRRED), beauty)
+ AddComponent(/datum/component/aquarium_content, list(COMSIG_ATOM_WAS_ATTACKED))
+ RegisterSignal(src, COMSIG_MOVABLE_GET_AQUARIUM_BEAUTY, PROC_REF(get_aquarium_beauty))
RegisterSignal(src, COMSIG_ATOM_ON_LAZARUS_INJECTOR, PROC_REF(use_lazarus))
if(fish_flags & FISH_DO_FLOP_ANIM)
RegisterSignal(src, COMSIG_ATOM_TEMPORARY_ANIMATION_START, PROC_REF(on_temp_animation))
@@ -549,7 +550,7 @@
make_edible()
if(weight >= FISH_WEIGHT_SLOWDOWN && !HAS_TRAIT(src, TRAIT_SPEED_POTIONED))
- slowdown = round(((weight/FISH_WEIGHT_SLOWDOWN_DIVISOR)**FISH_WEIGHT_SLOWDOWN_EXPONENT)-1.3, 0.1)
+ slowdown = GET_FISH_SLOWDOWN(weight)
drag_slowdown = round(slowdown * 0.5, 1)
else
slowdown = 0
@@ -592,14 +593,6 @@
AddElement(/datum/element/processable, TOOL_KNIFE, fillet_type, amount, time, screentip_verb = "Cut")
return amount //checked by a unit test
-/**
- * Weight, unlike size, is a bit more exponential, but the world isn't perfect, so isn't my code.
- * Anyway, this returns a gross estimate of the "rank" of "category" for our fish weight, based on how
- * weight generaly scales up (250, 500, 1000, 2000, 4000 etc...)
- */
-/obj/item/fish/proc/get_weight_rank()
- return max(round(1 + log(2, weight/FISH_WEIGHT_FORCE_DIVISOR), 1), 1)
-
///Reset weapon-related variables of this items and recalculates those values based on the fish weight and size.
/obj/item/fish/proc/update_fish_force()
if(force >= 15 && hitsound == SFX_ALT_FISH_SLAP)
@@ -619,7 +612,7 @@
bare_wound_bonus = initial(bare_wound_bonus)
toolspeed = initial(toolspeed)
- var/weight_rank = get_weight_rank()
+ var/weight_rank = GET_FISH_WEIGHT_RANK(weight)
throw_range -= weight_rank
get_force_rank()
@@ -828,16 +821,13 @@
///Proc that should be called when the fish is fed. By default, it grows the fish depending on various variables.
/obj/item/fish/proc/sate_hunger()
- if(isaquarium(loc))
- var/obj/structure/aquarium/aquarium = loc
- if(!aquarium.reproduction_and_growth)
- last_feeding = world.time
- return
+ if(HAS_TRAIT(loc, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH))
+ last_feeding = world.time
+ return
var/hunger = get_hunger()
if(hunger < 0.05) //don't bother growing for very small amounts.
last_feeding = world.time
return
- last_feeding = world.time
var/new_size = size
var/new_weight = weight
var/hunger_mult
@@ -854,7 +844,7 @@
new_size += CEILING((maximum_size - size) * base_mult / (w_class * FISH_SIZE_WEIGHT_GROWTH_MALUS) * hunger_mult, 1)
new_size = min(new_size, maximum_size)
if(weight < maximum_weight)
- new_weight += CEILING((maximum_weight - weight) * base_mult / (get_weight_rank() * FISH_SIZE_WEIGHT_GROWTH_MALUS) * hunger_mult, 1)
+ new_weight += CEILING((maximum_weight - weight) * base_mult / (GET_FISH_WEIGHT_RANK(weight) * FISH_SIZE_WEIGHT_GROWTH_MALUS) * hunger_mult, 1)
new_weight = min(new_weight, maximum_weight)
if(new_size != size || new_weight != weight)
update_size_and_weight(new_size, new_weight)
@@ -871,9 +861,8 @@
return
// Do additional stuff
- var/in_aquarium = isaquarium(loc)
// Start flopping if outside of fish container
- var/should_be_flopping = status == FISH_ALIVE && !HAS_TRAIT(src, TRAIT_FISH_STASIS) && !in_aquarium
+ var/should_be_flopping = status == FISH_ALIVE && !HAS_TRAIT(src, TRAIT_FISH_STASIS) && loc && !HAS_TRAIT(loc, TRAIT_IS_AQUARIUM)
if(should_be_flopping)
start_flopping()
@@ -912,7 +901,7 @@
stop_flopping()
if(!silent)
var/message = span_notice(replacetext(death_text, "%SRC", "[src]"))
- if(isaquarium(loc))
+ if(loc && HAS_TRAIT(loc, TRAIT_IS_AQUARIUM))
loc.visible_message(message)
else
visible_message(message)
@@ -997,47 +986,44 @@
visual.icon_state = dedicated_in_aquarium_icon_state || "[initial(icon_state)]_small"
visual.color = aquarium_vc_color
-/obj/item/fish/proc/randomize_aquarium_position(datum/source, obj/structure/aquarium/current_aquarium, obj/effect/aquarium/visual)
+/obj/item/fish/proc/randomize_aquarium_position(datum/source, atom/movable/current_aquarium, obj/effect/aquarium/visual)
SIGNAL_HANDLER
- var/list/aq_properties = current_aquarium.get_surface_properties()
var/avg_width = round(sprite_width * 0.5)
var/avg_height = round(sprite_height * 0.5)
- var/px_min = aq_properties[AQUARIUM_PROPERTIES_PX_MIN] + avg_width - 16
- var/px_max = aq_properties[AQUARIUM_PROPERTIES_PX_MAX] - avg_width - 16
- var/py_min = aq_properties[AQUARIUM_PROPERTIES_PY_MIN] + avg_height - 16
- var/py_max = aq_properties[AQUARIUM_PROPERTIES_PY_MAX] - avg_height - 16
+ var/px_min = visual.aquarium_zone_min_px + avg_width - 16
+ var/px_max = visual.aquarium_zone_max_px - avg_width - 16
+ var/py_min = visual.aquarium_zone_min_py + avg_height - 16
+ var/py_max = visual.aquarium_zone_max_py - avg_height - 16
visual.pixel_x = visual.base_pixel_x = rand(px_min,px_max)
visual.pixel_y = visual.base_pixel_y = rand(py_min,py_max)
-/obj/item/fish/proc/get_aquarium_animation()
- var/obj/structure/aquarium/aquarium = loc
- if(!istype(aquarium) || aquarium.fluid_type == AQUARIUM_FLUID_AIR || status == FISH_DEAD)
- return AQUARIUM_ANIMATION_FISH_DEAD
- else
- return AQUARIUM_ANIMATION_FISH_SWIM
-
-/obj/item/fish/proc/update_aquarium_animation(datum/source, current_animation, obj/structure/current_aquarium, obj/effect/visual)
+/obj/item/fish/proc/update_aquarium_animation(datum/source, current_animation, obj/effect/visual, fluid_type)
SIGNAL_HANDLER
- var/animation = get_aquarium_animation()
+ var/animation = get_aquarium_animation(fluid_type)
if(animation == current_animation)
return
switch(animation)
if(AQUARIUM_ANIMATION_FISH_SWIM)
- swim_animation(current_aquarium, visual)
+ swim_animation(visual)
if(AQUARIUM_ANIMATION_FISH_DEAD)
- dead_animation(current_aquarium, visual)
+ dead_animation(visual)
+
+/obj/item/fish/proc/get_aquarium_animation(fluid_type)
+ if(fluid_type == AQUARIUM_FLUID_AIR || status == FISH_DEAD)
+ return AQUARIUM_ANIMATION_FISH_DEAD
+ else
+ return AQUARIUM_ANIMATION_FISH_SWIM
/// Create looping random path animation, pixel offsets parameters include offsets already
-/obj/item/fish/proc/swim_animation(obj/structure/aquarium/current_aquarium, obj/effect/aquarium/visual)
+/obj/item/fish/proc/swim_animation(obj/effect/aquarium/visual)
var/avg_width = round(sprite_width / 2)
var/avg_height = round(sprite_height / 2)
- var/list/aq_properties = current_aquarium.get_surface_properties()
- var/px_min = aq_properties[AQUARIUM_PROPERTIES_PX_MIN] + avg_width - 16
- var/px_max = aq_properties[AQUARIUM_PROPERTIES_PX_MAX] - avg_width - 16
- var/py_min = aq_properties[AQUARIUM_PROPERTIES_PY_MIN] + avg_height - 16
- var/py_max = aq_properties[AQUARIUM_PROPERTIES_PY_MAX] - avg_width - 16
+ var/px_min = visual.aquarium_zone_min_px + avg_width - 16
+ var/px_max = visual.aquarium_zone_max_px - avg_width - 16
+ var/py_min = visual.aquarium_zone_min_py + avg_height - 16
+ var/py_max = visual.aquarium_zone_max_py - avg_width - 16
var/origin_x = visual.base_pixel_x
var/origin_y = visual.base_pixel_y
@@ -1062,22 +1048,36 @@
animate(transform = dir_mx, time = 0, loop = -1)
animate(pixel_x = target_x, pixel_y = target_y, time = eyeballed_time, loop = -1)
-/obj/item/fish/proc/dead_animation(obj/structure/aquarium/current_aquarium, obj/effect/aquarium/visual)
+/obj/item/fish/proc/dead_animation(obj/effect/aquarium/visual)
//Set base_pixel_y to lowest possible value
var/avg_height = round(sprite_height / 2)
- var/list/aq_properties = current_aquarium.get_surface_properties()
- var/py_min = aq_properties[AQUARIUM_PROPERTIES_PY_MIN] + avg_height - 16
+ var/py_min = visual.aquarium_zone_min_py + avg_height - 16
visual.base_pixel_y = py_min
animate(visual, pixel_y = py_min, time = 1) //flop to bottom and end current animation.
+///Malus to the beauty value if the fish content is dead
+#define DEAD_FISH_BEAUTY -500
+///Prevents more impressive fishes from providing a positive beauty even when dead.
+#define MAX_DEAD_FISH_BEAUTY -200
+///Some fish are already so ugly, they can't get much worse when dead
+#define MIN_DEAD_FISH_BEAUTY -600
+
+/obj/item/fish/proc/get_aquarium_beauty(datum/source, list/beauty_holder)
+ SIGNAL_HANDLER
+ var/actual_beauty = beauty
+ if(status == FISH_DEAD)
+ actual_beauty = clamp(beauty + DEAD_FISH_BEAUTY, MIN_DEAD_FISH_BEAUTY, MAX_DEAD_FISH_BEAUTY)
+
+ beauty_holder += actual_beauty
+
+#undef DEAD_FISH_BEAUTY
+#undef MIN_DEAD_FISH_BEAUTY
+#undef MAX_DEAD_FISH_BEAUTY
+
/// Checks if our current environment lets us live.
/obj/item/fish/proc/proper_environment(temp_range_min = required_temperature_min, temp_range_max = required_temperature_max)
- var/obj/structure/aquarium/aquarium = loc
- if(istype(aquarium))
- if(!compatible_fluid_type(required_fluid_type, aquarium.fluid_type))
- if(aquarium.fluid_type != AQUARIUM_FLUID_AIR || !HAS_TRAIT(src, TRAIT_FISH_AMPHIBIOUS))
- return FALSE
- if(!ISINRANGE(aquarium.fluid_temp, required_temperature_min, required_temperature_max))
+ if(loc && HAS_TRAIT(loc, TRAIT_IS_AQUARIUM))
+ if(!(fish_flags & FISH_FLAG_SAFE_TEMPERATURE) || !(fish_flags & FISH_FLAG_SAFE_FLUID))
return FALSE
return TRUE
@@ -1131,54 +1131,48 @@
bites_amount -= amount
generate_fish_reagents(amount)
+/// Returns tracked_fish_by_type but flattened and without the items in the blacklist, also shuffled if shuffle is TRUE.
+/obj/item/fish/proc/get_aquarium_fishes(shuffle = FALSE, blacklist)
+ . = list()
+ for(var/obj/item/fish/fish in loc)
+ . += fish
+ . -= blacklist
+ if(shuffle)
+ . = shuffle(.)
+ return .
+
/obj/item/fish/proc/ready_to_reproduce(being_targeted = FALSE)
- var/obj/structure/aquarium/aquarium = loc
- if(!istype(aquarium))
+ if(!loc || !HAS_TRAIT(loc, TRAIT_IS_AQUARIUM))
return FALSE
if(being_targeted && HAS_TRAIT(src, TRAIT_FISH_NO_MATING))
return FALSE
- if(!being_targeted && length(aquarium.get_fishes()) >= AQUARIUM_MAX_BREEDING_POPULATION)
+ if(!being_targeted && length(get_aquarium_fishes()) >= AQUARIUM_MAX_BREEDING_POPULATION)
return FALSE
- return aquarium.reproduction_and_growth && health >= initial(health) * 0.8 && stable_population >= 1 && world.time >= breeding_wait
+ return !HAS_TRAIT(loc, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH) && health >= initial(health) * 0.8 && stable_population >= 1 && world.time >= breeding_wait
/obj/item/fish/proc/try_to_reproduce()
- var/obj/structure/aquarium/aquarium = loc
- if(!istype(aquarium))
+ if(!loc || !HAS_TRAIT(loc, TRAIT_IS_AQUARIUM))
return FALSE
var/obj/item/fish/second_fish
- /**
- * Fishes with this trait cannot mate, but could still reproduce asexually, so don't early return.
- * Also mating takes priority over that.
- */
+ ///Fishes with this trait cannot mate, but could still reproduce asexually, so don't early return.
if(!HAS_TRAIT(src, TRAIT_FISH_NO_MATING))
var/list/available_fishes = list()
- var/types_to_mate_with = aquarium.tracked_fish_by_type
- if(!HAS_TRAIT(src, TRAIT_FISH_CROSSBREEDER))
- var/list/types_to_check = list(type)
- if(compatible_types)
- types_to_check |= compatible_types
- types_to_mate_with = types_to_mate_with & types_to_check
-
- for(var/obj/item/fish/fish_type as anything in types_to_mate_with)
- var/list/type_fishes = types_to_mate_with[fish_type]
- if(length(type_fishes) >= initial(fish_type.stable_population))
- continue
- available_fishes += type_fishes
-
- available_fishes -= src //no self-mating.
+ SEND_SIGNAL(loc, COMSIG_AQUARIUM_GET_REPRODUCTION_CANDIDATES, src, available_fishes)
if(length(available_fishes))
- for(var/obj/item/fish/other_fish as anything in shuffle(available_fishes))
+ //make sure we check if the fish can reproduce with itself last, since that should've lower priority
+ available_fishes = shuffle(available_fishes) - src
+ available_fishes += src
+ for(var/obj/item/fish/other_fish as anything in available_fishes)
if(other_fish.ready_to_reproduce(TRUE))
second_fish = other_fish
break
- if(!second_fish)
+ if(!second_fish || second_fish == src) //check if the fish can self-reproduce in these cases.
if(!HAS_TRAIT(src, TRAIT_FISH_SELF_REPRODUCE))
return FALSE
- if(length(aquarium.tracked_fish_by_type[type]) >= stable_population)
- return FALSE
+ second_fish = null //set it to null, since this will make the following operations a bit easier
if(PERFORM_ALL_TESTS(fish_breeding) && second_fish && !length(evolution_types))
return create_offspring(second_fish.type, second_fish)
@@ -1188,13 +1182,13 @@
var/list/possible_evolutions = list()
for(var/evolution_type in evolution_types)
var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evolution_type]
- if(evolution.check_conditions(src, second_fish, aquarium))
+ if(evolution.check_conditions(src, second_fish, loc))
possible_evolutions += evolution
if(second_fish?.evolution_types)
var/secondary_evolutions = (second_fish.evolution_types - evolution_types)
for(var/evolution_type in secondary_evolutions)
var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evolution_type]
- if(evolution.check_conditions(second_fish, src, aquarium))
+ if(evolution.check_conditions(second_fish, src, loc))
possible_evolutions += evolution
var/list/types = spawn_types || list(type)
@@ -1205,7 +1199,7 @@
var/list/second_fish_types = second_fish.spawn_types || list(second_fish.type)
var/recessive = HAS_TRAIT(src, TRAIT_FISH_RECESSIVE)
var/recessive_partner = HAS_TRAIT(second_fish, TRAIT_FISH_RECESSIVE)
- if(length(aquarium.tracked_fish_by_type[type]) >= stable_population)
+ if(fish_flags & FISH_FLAG_OVERPOPULATED)
if(recessive_partner && !recessive)
return FALSE
chosen_type = pick(second_fish_types)
@@ -1335,7 +1329,7 @@
var/fish_zap_range = 1
var/fish_zap_power = 1 KILO JOULES // ~5 damage, just a little friendly "yeeeouch!"
var/fish_zap_flags = ZAP_MOB_DAMAGE
- if(istype(loc, /obj/structure/aquarium/bioelec_gen))
+ if(HAS_TRAIT(loc, TRAIT_BIOELECTRIC_GENERATOR))
fish_zap_range = 5
fish_zap_power = GET_FISH_ELECTROGENESIS(src)
if(HAS_TRAIT(src, TRAIT_FISH_ON_TESLIUM))
@@ -1378,13 +1372,13 @@
happiness_value++
if(get_hunger() < 0.5)
happiness_value++
- var/obj/structure/aquarium/aquarium = loc
- if(!istype(aquarium))
- return happiness_value
- if(compatible_fluid_type(required_fluid_type, aquarium.fluid_type))
- happiness_value++
- if(ISINRANGE(aquarium.fluid_temp, required_temperature_min, required_temperature_max))
- happiness_value++
+ if(loc && HAS_TRAIT(loc, TRAIT_IS_AQUARIUM))
+ if(fish_flags & FISH_FLAG_SAFE_FLUID)
+ happiness_value++
+ if(fish_flags & FISH_FLAG_SAFE_TEMPERATURE)
+ happiness_value++
+ else if(proper_environment())
+ happiness_value += 2
if(bites_amount) // ouch
happiness_value -= 2
if(health < initial(health) * 0.6)
@@ -1396,7 +1390,7 @@
pet_fish(user)
/obj/item/fish/proc/pet_fish(mob/living/user)
- var/in_aquarium = isaquarium(loc)
+ var/in_aquarium = loc && HAS_TRAIT(loc, TRAIT_IS_AQUARIUM)
if(status == FISH_DEAD)
to_chat(user, span_warning("You try to pet [src], but [p_theyre()] motionless!"))
return FALSE
diff --git a/code/modules/fishing/fish/chasm_detritus.dm b/code/modules/fishing/fish/chasm_detritus.dm
index 9595c552e18d2..50b35f7d07447 100644
--- a/code/modules/fishing/fish/chasm_detritus.dm
+++ b/code/modules/fishing/fish/chasm_detritus.dm
@@ -43,11 +43,11 @@ GLOBAL_LIST_INIT_TYPED(chasm_detritus_types, /datum/chasm_detritus, init_chasm_d
),
)
-/datum/chasm_detritus/proc/dispense_detritus(atom/spawn_location, turf/fishing_spot)
+/datum/chasm_detritus/proc/dispense_detritus(atom/spawn_location, atom/fishing_spot)
if(prob(default_contents_chance))
var/default_spawn = pick(default_contents[default_contents_key])
return new default_spawn(spawn_location)
- return find_chasm_contents(fishing_spot, spawn_location)
+ return find_chasm_contents(get_turf(fishing_spot), spawn_location)
/// Returns the chosen detritus from the given list of things to choose from
/datum/chasm_detritus/proc/determine_detritus(list/chasm_stuff)
diff --git a/code/modules/fishing/fish/fish_evolution.dm b/code/modules/fishing/fish/fish_evolution.dm
index a9261b091c9eb..8dd9bb0ffcd0d 100644
--- a/code/modules/fishing/fish/fish_evolution.dm
+++ b/code/modules/fishing/fish/fish_evolution.dm
@@ -43,20 +43,14 @@ GLOBAL_LIST_EMPTY(fishes_by_fish_evolution)
* Keep in mind the mate and aquarium arguments may be null if
* the fish is self-reproducing or this evolution is a result of a fish_growth component
*/
-/datum/fish_evolution/proc/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium)
+/datum/fish_evolution/proc/check_conditions(obj/item/fish/source, obj/item/fish/mate, atom/movable/aquarium)
SHOULD_CALL_PARENT(TRUE)
- if(aquarium)
- //chances are halved if only one parent has this evolution.
- var/real_probability = (mate && (type in mate.evolution_types)) ? probability : probability/2
- if(HAS_TRAIT(source, TRAIT_FISH_MUTAGENIC) || (mate && HAS_TRAIT(mate, TRAIT_FISH_MUTAGENIC)))
- real_probability *= 3
- if(!prob(real_probability))
- return FALSE
- if(!ISINRANGE(aquarium.fluid_temp, required_temperature_min, required_temperature_max))
- return FALSE
- else if(!source.proper_environment(required_temperature_min, required_temperature_max))
- return FALSE
- return TRUE
+ //the fish don't reproduce outside of aquariums but can still grow there, so we just check if the temperature is right.
+ if(!aquarium)
+ return source.proper_environment(required_temperature_min, required_temperature_max)
+ if(SEND_SIGNAL(aquarium, COMSIG_AQUARIUM_CHECK_EVOLUTION_CONDITIONS, source, mate, src) & COMPONENT_ALLOW_EVOLUTION)
+ return TRUE
+ return FALSE
///This is called when the evolution is set as the result type of a fish_growth component
/datum/fish_evolution/proc/growth_checks(obj/item/fish/source, seconds_per_tick, growth)
@@ -66,20 +60,17 @@ GLOBAL_LIST_EMPTY(fishes_by_fish_evolution)
return COMPONENT_DONT_GROW
if(source.get_hunger() >= 0.5) //too hungry to grow
return COMPONENT_DONT_GROW
- var/obj/structure/aquarium/aquarium = source.loc
- if(istype(aquarium) && !aquarium.reproduction_and_growth) //the aquarium has breeding disabled
+ if(HAS_TRAIT(source.loc, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH)) //the aquarium has breeding disabled
return COMPONENT_DONT_GROW
- else
- aquarium = null
- if(!check_conditions(source, aquarium = aquarium))
+ if(!check_conditions(source))
return COMPONENT_DONT_GROW
///Called by the fish analyzer right click function. Returns a text string used as tooltip.
/datum/fish_evolution/proc/get_evolution_tooltip()
. = ""
if(required_temperature_min > 0 || required_temperature_max < INFINITY)
- var/max_temp = required_temperature_max < INFINITY ? " and [required_temperature_max]" : ""
- . = "An aquarium temperature between [required_temperature_min][max_temp] is required."
+ var/max_temp = required_temperature_max < INFINITY ? " to [required_temperature_max]" : ""
+ . = "An aquarium temperature of [required_temperature_min][max_temp] is required."
if(conditions_note)
. += " [conditions_note]"
return .
@@ -90,7 +81,7 @@ GLOBAL_LIST_EMPTY(fishes_by_fish_evolution)
new_traits = list(/datum/fish_trait/lubed)
conditions_note = "The fish must be fed lube beforehand."
-/datum/fish_evolution/lubefish/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium)
+/datum/fish_evolution/lubefish/check_conditions(obj/item/fish/source, obj/item/fish/mate, atom/movable/aquarium)
if(!HAS_TRAIT(source, TRAIT_FISH_FED_LUBE))
return FALSE
return ..()
@@ -109,7 +100,7 @@ GLOBAL_LIST_EMPTY(fishes_by_fish_evolution)
conditions_note = "The fish (and its mate) needs to be unusually big both in size and weight."
show_result_on_wiki = FALSE
-/datum/fish_evolution/mastodon/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium)
+/datum/fish_evolution/mastodon/check_conditions(obj/item/fish/source, obj/item/fish/mate, atom/movable/aquarium)
if((source.size < 120 || source.weight < 3000) || (mate && (mate.size < 120 || mate.weight < 3000)))
return FALSE
return ..()
@@ -137,7 +128,7 @@ GLOBAL_LIST_EMPTY(fishes_by_fish_evolution)
new_traits = list(/datum/fish_trait/predator, /datum/fish_trait/aggressive)
conditions_note = "The fish needs to be unusually big and aggressive"
-/datum/fish_evolution/chainsawfish/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium)
+/datum/fish_evolution/chainsawfish/check_conditions(obj/item/fish/source, obj/item/fish/mate, atom/movable/aquarium)
var/double_avg_size = /obj/item/fish/goldfish::average_size * 2
var/double_avg_weight = /obj/item/fish/goldfish::average_weight * 2
if(source.size >= double_avg_size && source.weight >= double_avg_weight && (/datum/fish_trait/aggressive in source.fish_traits))
@@ -149,7 +140,7 @@ GLOBAL_LIST_EMPTY(fishes_by_fish_evolution)
new_fish_type = /obj/item/fish/pike/armored
conditions_note = "The fish needs to have the stinger trait"
-/datum/fish_evolution/armored_pike/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium)
+/datum/fish_evolution/armored_pike/check_conditions(obj/item/fish/source, obj/item/fish/mate, atom/movable/aquarium)
if(HAS_TRAIT(source, TRAIT_FISH_STINGER))
return ..()
return FALSE
@@ -165,7 +156,7 @@ GLOBAL_LIST_EMPTY(fishes_by_fish_evolution)
conditions_note = "The final stage of fritterfish growth. It gotta be big!"
show_result_on_wiki = FALSE
-/datum/fish_evolution/nessiefish/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium)
+/datum/fish_evolution/nessiefish/check_conditions(obj/item/fish/source, obj/item/fish/mate, atom/movable/aquarium)
if(source.size >= (/obj/item/fish/fryish/fritterish::average_size * 1.5) && source.size >= (/obj/item/fish/fryish/fritterish::average_weight * 1.5))
return ..()
return FALSE
diff --git a/code/modules/fishing/fish/fish_traits.dm b/code/modules/fishing/fish/fish_traits.dm
index dd0edb7ca3d2f..aa045c6308bf5 100644
--- a/code/modules/fishing/fish/fish_traits.dm
+++ b/code/modules/fishing/fish/fish_traits.dm
@@ -184,7 +184,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
/datum/fish_trait/nocturnal/proc/check_light(obj/item/fish/source, seconds_per_tick)
SIGNAL_HANDLER
- if(isturf(source.loc) || isaquarium(source))
+ if(source.loc && (HAS_TRAIT(source.loc, TRAIT_IS_AQUARIUM) || isturf(source.loc)))
var/turf/turf = get_turf(source)
var/light_amount = turf.get_lumcount()
if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD)
@@ -293,7 +293,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
/datum/fish_trait/emulsijack/proc/emulsify(obj/item/fish/source, seconds_per_tick)
SIGNAL_HANDLER
- if(!isaquarium(source.loc))
+ if(!source.loc || !HAS_TRAIT(source.loc, TRAIT_IS_AQUARIUM))
return
var/emulsified = FALSE
for(var/obj/item/fish/victim in source.loc)
@@ -332,7 +332,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
/datum/fish_trait/necrophage/proc/eat_dead_fishes(obj/item/fish/source, seconds_per_tick)
SIGNAL_HANDLER
- if(source.get_hunger() > 0.75 || !isaquarium(source.loc))
+ if(source.get_hunger() > 0.75 || !source.loc || !HAS_TRAIT(source.loc, TRAIT_IS_AQUARIUM))
return
for(var/obj/item/fish/victim in source.loc)
if(victim.status != FISH_DEAD || victim == source || HAS_TRAIT(victim, TRAIT_YUCKY_FISH))
@@ -400,7 +400,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
return
source.set_status(FISH_ALIVE)
var/message = span_nicegreen("[source] twitches. It's alive!")
- if(isaquarium(source.loc))
+ if(source.loc && HAS_TRAIT(source.loc, TRAIT_IS_AQUARIUM))
source.loc.visible_message(message)
else
source.visible_message(message)
@@ -425,10 +425,9 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
/datum/fish_trait/predator/proc/eat_fishes(obj/item/fish/source, seconds_per_tick)
SIGNAL_HANDLER
- if(source.get_hunger() > 0.75 || !isaquarium(source.loc))
+ if(source.get_hunger() > 0.75 || !source.loc || !HAS_TRAIT(source.loc, TRAIT_IS_AQUARIUM))
return
- var/obj/structure/aquarium/aquarium = source.loc
- for(var/obj/item/fish/victim in aquarium.get_fishes(TRUE, source))
+ for(var/obj/item/fish/victim as anything in source.get_aquarium_fishes(TRUE, source))
if(victim.size < source.size * 0.7) // It's a big fish eat small fish world
continue
if(victim.status != FISH_ALIVE || victim == source || HAS_TRAIT(victim, TRAIT_YUCKY_FISH) || SPT_PROB(80, seconds_per_tick))
@@ -531,13 +530,12 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
/datum/fish_trait/aggressive/proc/try_attack_fish(obj/item/fish/source, seconds_per_tick)
SIGNAL_HANDLER
- if(!isaquarium(source.loc) || !SPT_PROB(1, seconds_per_tick))
+ if(!source.loc || !HAS_TRAIT(source.loc, TRAIT_IS_AQUARIUM) || !SPT_PROB(1, seconds_per_tick))
return
- var/obj/structure/aquarium/aquarium = source.loc
- for(var/obj/item/fish/victim in aquarium.get_fishes(TRUE, source))
+ for(var/obj/item/fish/victim as anything in source.get_aquarium_fishes(TRUE, source))
if(victim.status != FISH_ALIVE)
continue
- aquarium.visible_message(span_warning("[source] violently [pick("whips", "bites", "attacks", "slams")] [victim]"))
+ source.loc.visible_message(span_warning("[source] violently [pick("whips", "bites", "attacks", "slams")] [victim]"))
var/damage = round(rand(4, 20) * (source.size / victim.size)) //smaller fishes take extra damage.
victim.adjust_health(victim.health - damage)
return
diff --git a/code/modules/fishing/fish/types/air_space.dm b/code/modules/fishing/fish/types/air_space.dm
index c60fc7a36ef43..3b053dc4c25eb 100644
--- a/code/modules/fishing/fish/types/air_space.dm
+++ b/code/modules/fishing/fish/types/air_space.dm
@@ -173,13 +173,12 @@
if(health <= initial(health) * 0.6 || hunger >= 0.6) //if too hurt or hungry, don't grow.
return COMPONENT_DONT_GROW
- if(!isaquarium(loc))
+ if(!loc || !HAS_TRAIT(loc, TRAIT_IS_AQUARIUM))
return
- var/obj/structure/aquarium/aquarium = loc
- if(!aquarium.reproduction_and_growth) //the aquarium has breeding disabled
+ if(HAS_TRAIT(loc, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH)) //the aquarium has breeding disabled
return COMPONENT_DONT_GROW
- if(length(aquarium.get_fishes()) > AQUARIUM_MAX_BREEDING_POPULATION * 0.5) //check if there's enough room to maturate.
+ if(length(get_aquarium_fishes()) > AQUARIUM_MAX_BREEDING_POPULATION * 0.5) //check if there's enough room to maturate.
return COMPONENT_DONT_GROW
/obj/item/fish/baby_carp/proc/on_growth(datum/source, mob/living/basic/carp/result)
diff --git a/code/modules/fishing/fish/types/freshwater.dm b/code/modules/fishing/fish/types/freshwater.dm
index 660a406183cfa..16687bc649790 100644
--- a/code/modules/fishing/fish/types/freshwater.dm
+++ b/code/modules/fishing/fish/types/freshwater.dm
@@ -201,8 +201,7 @@
var/hunger = get_hunger()
if(hunger >= 0.7) //too hungry to grow
return COMPONENT_DONT_GROW
- var/obj/structure/aquarium/aquarium = loc
- if(istype(aquarium) && !aquarium.reproduction_and_growth) //the aquarium has breeding disabled
+ if(HAS_TRAIT(loc, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH)) //the aquarium has breeding disabled
return COMPONENT_DONT_GROW
/obj/item/fish/tadpole/proc/on_growth(datum/source, mob/living/basic/frog/result)
diff --git a/code/modules/fishing/fish/types/mining.dm b/code/modules/fishing/fish/types/mining.dm
index 53c1b89673ce7..3a1d6ff83107f 100644
--- a/code/modules/fishing/fish/types/mining.dm
+++ b/code/modules/fishing/fish/types/mining.dm
@@ -78,15 +78,14 @@
if(hunger >= 0.4) //I'm hungry and angry
anger += growth * 0.6
- if(!isaquarium(loc))
+ if(!loc || !HAS_TRAIT(loc, TRAIT_IS_AQUARIUM))
return
- var/obj/structure/aquarium/aquarium = loc
- if(!aquarium.reproduction_and_growth) //the aquarium has breeding disabled
+ if(HAS_TRAIT(loc, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH)) //the aquarium has breeding disabled
return COMPONENT_DONT_GROW
- if(!locate(/obj/item/aquarium_prop) in aquarium) //the aquarium deco is quite barren
+ if(!locate(/obj/item/aquarium_prop) in loc) //the aquarium deco is quite barren
anger += growth * 0.25
- var/fish_count = length(aquarium.get_fishes())
+ var/fish_count = length(get_aquarium_fishes())
if(!ISINRANGE(fish_count, 3, AQUARIUM_MAX_BREEDING_POPULATION * 0.5)) //too lonely or overcrowded
anger += growth * 0.3
if(fish_count > AQUARIUM_MAX_BREEDING_POPULATION * 0.5) //check if there's enough room to maturate.
diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm
index a3e9f255e1667..a8fa4d26ad8da 100644
--- a/code/modules/fishing/fishing_minigame.dm
+++ b/code/modules/fishing/fishing_minigame.dm
@@ -49,11 +49,13 @@ GLOBAL_LIST_EMPTY(fishing_challenges_by_user)
var/reward_path = FISHING_DUD
/// Minigame difficulty
var/difficulty = FISHING_DEFAULT_DIFFICULTY
- // Current phase
+ /// Current phase
var/phase = WAIT_PHASE
- // Timer for the next phase
+ /// Timer for the next phase
var/next_phase_timer
- // The last time we clicked during the baiting phase
+ /// The lower and upper bounds of the waiting phase timer
+ var/list/wait_time_range = list(3 SECONDS, 25 SECONDS)
+ /// The last time we clicked during the baiting phase
var/last_baiting_click
/// Fishing mob
var/mob/user
@@ -126,6 +128,10 @@ GLOBAL_LIST_EMPTY(fishing_challenges_by_user)
RegisterSignal(fish_source, COMSIG_FISHING_SOURCE_INTERRUPT_CHALLENGE, PROC_REF(interrupt_challenge))
fish_source.RegisterSignal(user, COMSIG_MOB_COMPLETE_FISHING, TYPE_PROC_REF(/datum/fish_source, on_challenge_completed))
background = comp.fish_source.background
+ if(comp.fish_source.wait_time_range)
+ wait_time_range = comp.fish_source.wait_time_range
+ if(float.spin_frequency) //Using a fishing lure narrows the range a bit, for better or worse.
+ wait_time_range = list(wait_time_range[1] + 8 SECONDS, wait_time_range[2] - 8 SECONDS)
SEND_SIGNAL(user, COMSIG_MOB_BEGIN_FISHING, src)
SEND_SIGNAL(rod, COMSIG_ROD_BEGIN_FISHING, src)
GLOB.fishing_challenges_by_user[user] = src
@@ -209,7 +215,7 @@ GLOBAL_LIST_EMPTY(fishing_challenges_by_user)
/datum/fishing_challenge/proc/start(mob/living/user)
/// Create fishing line visuals
if(!used_rod.internal)
- fishing_line = used_rod.create_fishing_line(float, user, target_py = 5)
+ fishing_line = used_rod.create_fishing_line(float, user, target_py = float.pixel_y + 4)
if(isnull(fishing_line)) //couldn't create a fishing line, probably because we don't have a good line of sight.
qdel(src)
return
@@ -369,7 +375,7 @@ GLOBAL_LIST_EMPTY(fishing_challenges_by_user)
if(penalty)
wait_time = min(timeleft(next_phase_timer) + rand(3 SECONDS, 5 SECONDS), 30 SECONDS)
else
- wait_time = float.spin_frequency ? rand(11 SECONDS, 17 SECONDS) : rand(3 SECONDS, 25 SECONDS)
+ wait_time = rand(wait_time_range[1], wait_time_range[2])
if(special_effects & FISHING_MINIGAME_AUTOREEL && wait_time >= 15 SECONDS)
wait_time = max(wait_time - 7.5 SECONDS, 15 SECONDS)
deltimer(next_phase_timer)
@@ -423,6 +429,8 @@ GLOBAL_LIST_EMPTY(fishing_challenges_by_user)
send_alert("seed!!!")
if(FISH_ICON_BOTTLE)
send_alert("bottle!!!")
+ if(FISH_ICON_ORGAN)
+ send_alert("organ!!!")
else
send_alert("!!!")
animate(float, pixel_y = 3, time = 5, loop = -1, flags = ANIMATION_RELATIVE)
diff --git a/code/modules/fishing/fishing_portal_machine.dm b/code/modules/fishing/fishing_portal_machine.dm
index 8b2f1a34e93f7..ad63703155633 100644
--- a/code/modules/fishing/fishing_portal_machine.dm
+++ b/code/modules/fishing/fishing_portal_machine.dm
@@ -19,6 +19,8 @@
var/long_range_link = FALSE
/// contains ALL fishing destinations.
var/all_destinations = FALSE
+ /// If the current active fishing spot is from multitool linkage, this value is the atom it would originally belong to.
+ var/atom/current_linked_atom
/obj/machinery/fishing_portal_generator/Initialize(mapload)
. = ..()
@@ -202,7 +204,7 @@
if(machine_stat & NOPOWER)
balloon_alert(user, "no power!")
return ITEM_INTERACT_BLOCKING
- if(!istype(selected_source, /datum/fish_source/portal)) //likely from a linked fishing spot
+ if(!all_destinations && !istype(selected_source, /datum/fish_source/portal)) //likely from a linked fishing spot
var/abort = TRUE
for(var/atom/spot as anything in linked_fishing_spots)
if(linked_fishing_spots[spot] != selected_source)
@@ -215,6 +217,7 @@
abort = FALSE
if(!abort)
RegisterSignal(spot, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_fishing_spot_z_level_changed))
+ current_linked_atom = spot
break
if(abort && !all_destinations)
balloon_alert(user, "cannot reach linked!")
@@ -233,6 +236,7 @@
for(var/atom/spot as anything in linked_fishing_spots)
if(linked_fishing_spots[spot] == active.fish_source)
UnregisterSignal(spot, COMSIG_MOVABLE_Z_CHANGED)
+ current_linked_atom = null
QDEL_NULL(active)
REMOVE_TRAIT(src, TRAIT_CATCH_AND_RELEASE, INNATE_TRAIT)
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index f554a475ad491..08482ac6be59b 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -425,13 +425,13 @@
casting = TRUE
var/obj/projectile/fishing_cast/cast_projectile = new(get_turf(src))
cast_projectile.range = get_cast_range(user)
- cast_projectile.decayedRange = get_cast_range(user)
+ cast_projectile.maximum_range = get_cast_range(user)
cast_projectile.owner = src
cast_projectile.original = target
cast_projectile.fired_from = src
cast_projectile.firer = user
cast_projectile.impacted = list(WEAKREF(user) = TRUE)
- cast_projectile.preparePixelProjectile(target, user)
+ cast_projectile.aim_projectile(target, user)
cast_projectile.fire()
COOLDOWN_START(src, casting_cd, 1 SECONDS)
diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm
index 09ef60c1ff632..64c9977fbb924 100644
--- a/code/modules/fishing/sources/_fish_source.dm
+++ b/code/modules/fishing/sources/_fish_source.dm
@@ -1,4 +1,4 @@
-GLOBAL_LIST_INIT(preset_fish_sources, init_subtypes_w_path_keys(/datum/fish_source, list()))
+GLOBAL_LIST_INIT_TYPED(preset_fish_sources, /datum/fish_source, init_subtypes_w_path_keys(/datum/fish_source, list()))
/**
* When adding new fishable rewards to a table/counts, you can specify an icon to show in place of the
@@ -60,6 +60,7 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
))
return_list[FISHING_RANDOM_SEED] = FISH_ICON_SEED
+ return_list[FISHING_RANDOM_ORGAN] = FISH_ICON_ORGAN
return return_list
/**
@@ -93,6 +94,8 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
var/radial_state = "default"
///When selected by the fishing portal, this will be the icon_state of the overlay shown on the machine.
var/overlay_state = "portal_aquarium"
+ ///If set, this overrides the upper and lower bounds of how long you should wait during the waiting phase of the minigame.
+ var/list/wait_time_range
/// Mindless mobs that can fish will never pull up items on this list
var/static/list/profound_fisher_blacklist = typecacheof(list(
@@ -119,6 +122,8 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
for(var/path in fish_counts)
if(!(path in fish_table))
stack_trace("path [path] found in the 'fish_counts' list but not in the 'fish_table'")
+ if(wait_time_range && length(wait_time_range) != 2)
+ stack_trace("wait_time_range for [type] is set but has length different than two")
/datum/fish_source/Destroy()
exploded_turfs = null
@@ -242,15 +247,14 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
UnregisterSignal(user, COMSIG_MOB_COMPLETE_FISHING)
if(!success)
return
- var/turf/fishing_spot = get_turf(challenge.float)
- var/atom/movable/reward = dispense_reward(challenge.reward_path, user, fishing_spot)
+ var/atom/movable/reward = dispense_reward(challenge.reward_path, user, challenge.location)
if(reward)
user.add_mob_memory(/datum/memory/caught_fish, protagonist = user, deuteragonist = reward.name)
SEND_SIGNAL(challenge.used_rod, COMSIG_FISHING_ROD_CAUGHT_FISH, reward, user)
challenge.used_rod.on_reward_caught(reward, user)
/// Gives out the reward if possible
-/datum/fish_source/proc/dispense_reward(reward_path, mob/fisherman, turf/fishing_spot)
+/datum/fish_source/proc/dispense_reward(reward_path, mob/fisherman, atom/fishing_spot)
var/atom/movable/reward = simple_dispense_reward(reward_path, get_turf(fisherman), fishing_spot)
if(!reward) //balloon alert instead
fisherman.balloon_alert(fisherman, pick(duds))
@@ -267,7 +271,7 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
return reward
///Simplified version of dispense_reward that doesn't need a fisherman.
-/datum/fish_source/proc/simple_dispense_reward(reward_path, atom/spawn_location, turf/fishing_spot)
+/datum/fish_source/proc/simple_dispense_reward(reward_path, atom/spawn_location, atom/fishing_spot)
if(isnull(reward_path))
return null
var/area/area = get_area(fishing_spot)
@@ -298,7 +302,7 @@ GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
addtimer(CALLBACK(src, PROC_REF(regen_count), reward_path), regen_time)
/// Spawns a reward from a atom path right where the fisherman is. Part of the dispense_reward() logic.
-/datum/fish_source/proc/spawn_reward(reward_path, atom/spawn_location, turf/fishing_spot)
+/datum/fish_source/proc/spawn_reward(reward_path, atom/spawn_location, atom/fishing_spot)
if(reward_path == FISHING_DUD)
return
if(ispath(reward_path, /datum/chasm_detritus))
diff --git a/code/modules/fishing/sources/source_types.dm b/code/modules/fishing/sources/source_types.dm
index e15f290cefe5b..1828091f0616e 100644
--- a/code/modules/fishing/sources/source_types.dm
+++ b/code/modules/fishing/sources/source_types.dm
@@ -294,7 +294,7 @@
mover.long_jump_velocity_limit += rand(-100, 100)
///Cherry on top, fish caught from the randomizer portal also have (almost completely) random traits
-/datum/fish_source/portal/random/spawn_reward(reward_path, atom/movable/spawn_location, turf/fishing_spot)
+/datum/fish_source/portal/random/spawn_reward(reward_path, atom/spawn_location, atom/fishing_spot)
if(!ispath(reward_path, /obj/item/fish))
return ..()
@@ -580,7 +580,7 @@
return
return ..()
-/datum/fish_source/hydro_tray/spawn_reward(reward_path, mob/fisherman, turf/fishing_spot)
+/datum/fish_source/hydro_tray/spawn_reward(reward_path, atom/spawn_location, atom/fishing_spot)
if(reward_path != FISHING_RANDOM_SEED)
var/mob/living/created_reward = ..()
if(istype(created_reward))
@@ -649,6 +649,55 @@
)
fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 13
+/datum/fish_source/surgery
+ catalog_description = "Surgery"
+ radial_state = "innards"
+ overlay_state = "portal_syndicate" //Didn't feel like spriting a new overlay. It's just all red anyway.
+ background = "background_lavaland" //Kinda red.
+ fish_table = list(FISHING_RANDOM_ORGAN = 10)
+ //This should get you below zero difficulty and skip the minigame phase, unless you're wearing something that counteracts this.
+ fishing_difficulty = -20
+ //The range for waiting is also a bit narrower, so it cannot take as few as 3 seconds or as many as 25 to snatch an organ.
+ wait_time_range = list(6 SECONDS, 12 SECONDS)
+
+/datum/fish_source/surgery/spawn_reward(reward_path, atom/spawn_location, atom/fishing_spot)
+ if(istype(fishing_spot, /obj/machinery/fishing_portal_generator))
+ var/obj/machinery/fishing_portal_generator/portal = fishing_spot
+ fishing_spot = portal.current_linked_atom
+ if(!iscarbon(fishing_spot))
+ var/random_type = pick(subtypesof(/obj/item/organ) - GLOB.prototype_organs)
+ return new random_type(spawn_location)
+
+ var/mob/living/carbon/carbon = fishing_spot
+ var/list/possible_organs = list()
+ for(var/datum/surgery/organ_manipulation/operation in carbon.surgeries)
+ var/datum/surgery_step/manipulate_organs/manip_step = GLOB.surgery_steps[operation.steps[operation.status]]
+ if(!istype(manip_step))
+ continue
+ for(var/obj/item/organ/organ in operation.operated_bodypart)
+ if(organ.organ_flags & ORGAN_UNREMOVABLE || !manip_step.can_use_organ(organ))
+ continue
+ possible_organs |= organ
+
+ if(!length(possible_organs))
+ return null
+ var/obj/item/organ/chosen = pick(possible_organs)
+ chosen.Remove(chosen.owner)
+ chosen.forceMove(spawn_location)
+ return chosen
+
+/datum/fish_source/surgery/generate_wiki_contents(datum/autowiki/fish_sources/wiki)
+ var/list/data = list()
+
+ data += LIST_VALUE_WRAP_LISTS(list(
+ FISH_SOURCE_AUTOWIKI_NAME = "Organs",
+ FISH_SOURCE_AUTOWIKI_DUD = "",
+ FISH_SOURCE_AUTOWIKI_WEIGHT = 100,
+ FISH_SOURCE_AUTOWIKI_NOTES = "A random organ from an ongoing organ manipulation surgery.",
+ ))
+
+ return data
+
/datum/fish_source/hot_spring
catalog_description = "Hot Springs"
radial_state = "onsen"
diff --git a/code/modules/food_and_drinks/machinery/coffeemaker.dm b/code/modules/food_and_drinks/machinery/coffeemaker.dm
index bb532b3162483..51280fd87d6d8 100644
--- a/code/modules/food_and_drinks/machinery/coffeemaker.dm
+++ b/code/modules/food_and_drinks/machinery/coffeemaker.dm
@@ -52,6 +52,7 @@
/obj/machinery/coffeemaker/Destroy()
QDEL_NULL(coffeepot)
QDEL_NULL(cartridge)
+ remove_shared_particles(/particles/smoke)
return ..()
/obj/machinery/coffeemaker/Exited(atom/movable/gone, direction)
@@ -127,7 +128,7 @@
. = ..()
if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
return
- if(!can_interact(user) || !user.can_perform_action(src, ALLOW_SILICON_REACH|FORBID_TELEKINESIS_REACH))
+ if(!can_interact(user) || !user.can_perform_action(src, FORBID_TELEKINESIS_REACH|SILENT_ADJACENCY))
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
if(brewing)
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
@@ -284,7 +285,7 @@
/obj/machinery/coffeemaker/ui_interact(mob/user) // The microwave Menu //I am reasonably certain that this is not a microwave //I am positively certain that this is not a microwave
. = ..()
- if(brewing || !user.can_perform_action(src, ALLOW_SILICON_REACH))
+ if(brewing || !user.can_perform_action(src, SILENT_ADJACENCY))
return
var/list/options = list()
@@ -324,7 +325,7 @@
choice = show_radial_menu(user, src, options, require_near = !HAS_SILICON_ACCESS(user))
// post choice verification
- if(brewing || (isAI(user) && machine_stat & NOPOWER) || !user.can_perform_action(src, ALLOW_SILICON_REACH))
+ if(brewing || (isAI(user) && machine_stat & NOPOWER) || !user.can_perform_action(src, SILENT_ADJACENCY))
return
switch(choice)
@@ -391,10 +392,12 @@
///Updates the smoke state to something else, setting particles if relevant
/obj/machinery/coffeemaker/proc/toggle_steam()
- QDEL_NULL(particles)
- if(brewing)
- particles = new /particles/smoke/steam/mild()
- particles.position = list(-6, 0, 0)
+ if(!brewing)
+ remove_shared_particles("smoke_coffeemaker")
+ return
+
+ var/obj/effect/abstract/shared_particle_holder/smoke_particles = add_shared_particles(/particles/smoke/steam/mild, "smoke_coffeemaker")
+ smoke_particles.particles.position = list(-6, 0, 0)
/obj/machinery/coffeemaker/proc/operate_for(time, silent = FALSE)
brewing = TRUE
@@ -705,10 +708,12 @@
update_appearance(UPDATE_OVERLAYS)
/obj/machinery/coffeemaker/impressa/toggle_steam()
- QDEL_NULL(particles)
- if(brewing)
- particles = new /particles/smoke/steam/mild()
- particles.position = list(-2, 1, 0)
+ if(!brewing)
+ remove_shared_particles("smoke_impressa")
+ return
+
+ var/obj/effect/abstract/shared_particle_holder/smoke_particles = add_shared_particles(/particles/smoke/steam/mild, "smoke_impressa")
+ smoke_particles.particles.position = list(-2, 1, 0)
/obj/machinery/coffeemaker/impressa/brew()
power_change()
diff --git a/code/modules/food_and_drinks/machinery/deep_fryer.dm b/code/modules/food_and_drinks/machinery/deep_fryer.dm
index 313bc29d199dc..4dfab9fb9474e 100644
--- a/code/modules/food_and_drinks/machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/machinery/deep_fryer.dm
@@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
reagents.add_reagent(/datum/reagent/consumable/nutriment/fat/oil, 25)
fry_loop = new(src, FALSE)
RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_cleaned))
- AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/deepfryer)
+ AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[/datum/fish_source/deepfryer])
AddElement(/datum/element/fish_safe_storage) //Prevents fryish and fritterish from dying inside the deepfryer.
/obj/machinery/deepfryer/Destroy()
diff --git a/code/modules/food_and_drinks/machinery/microwave.dm b/code/modules/food_and_drinks/machinery/microwave.dm
index ae6e3945c94b4..53725dad38577 100644
--- a/code/modules/food_and_drinks/machinery/microwave.dm
+++ b/code/modules/food_and_drinks/machinery/microwave.dm
@@ -113,7 +113,7 @@
/obj/machinery/microwave/Destroy()
QDEL_LIST(ingredients)
QDEL_NULL(soundloop)
- QDEL_NULL(particles)
+ remove_shared_particles(/particles/smoke)
if(!isnull(cell))
QDEL_NULL(cell)
return ..()
@@ -707,17 +707,14 @@
if(HAS_TRAIT(smeller, TRAIT_ANOSMIA))
cant_smell += smeller
visible_message(span_danger("You smell a burnt smell coming from [src]!"), ignored_mobs = cant_smell)
- particles = new /particles/smoke()
- addtimer(CALLBACK(src, PROC_REF(remove_smoke)), 10 SECONDS)
+ add_shared_particles(/particles/smoke)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, remove_shared_particles), /particles/smoke), 10 SECONDS)
Shake(duration = 1 SECONDS)
cycles--
use_energy(active_power_usage)
addtimer(CALLBACK(src, PROC_REF(cook_loop), type, cycles, wait, cooker), wait)
-/obj/machinery/microwave/proc/remove_smoke()
- QDEL_NULL(particles)
-
/obj/machinery/microwave/power_change()
. = ..()
if(cell_powered)
diff --git a/code/modules/food_and_drinks/machinery/oven.dm b/code/modules/food_and_drinks/machinery/oven.dm
index c997f34924145..e9af9338000da 100644
--- a/code/modules/food_and_drinks/machinery/oven.dm
+++ b/code/modules/food_and_drinks/machinery/oven.dm
@@ -31,6 +31,8 @@
var/datum/looping_sound/oven/oven_loop
///Current state of smoke coming from the oven
var/smoke_state = OVEN_SMOKE_STATE_NONE
+ ///Currently used particle type, if any
+ var/particle_type
/obj/machinery/oven/Initialize(mapload)
. = ..()
@@ -40,7 +42,8 @@
/obj/machinery/oven/Destroy()
QDEL_NULL(oven_loop)
- QDEL_NULL(particles)
+ if (particle_type)
+ remove_shared_particles(particle_type)
return ..()
/// Used to determine if the oven appears active and cooking, or offline.
@@ -210,16 +213,22 @@
/obj/machinery/oven/proc/set_smoke_state(new_state)
if(new_state == smoke_state)
return
+
smoke_state = new_state
+ if (particle_type)
+ remove_shared_particles(particle_type)
+ particle_type = null
- QDEL_NULL(particles)
switch(smoke_state)
if(OVEN_SMOKE_STATE_BAD)
- particles = new /particles/smoke()
+ particle_type = /particles/smoke
if(OVEN_SMOKE_STATE_NEUTRAL)
- particles = new /particles/smoke/steam()
+ particle_type = /particles/smoke/steam
if(OVEN_SMOKE_STATE_GOOD)
- particles = new /particles/smoke/steam/mild()
+ particle_type = /particles/smoke/steam/mild
+
+ if (particle_type)
+ add_shared_particles(particle_type)
/obj/machinery/oven/crowbar_act(mob/living/user, obj/item/tool)
return default_deconstruction_crowbar(tool, ignore_panel = TRUE)
diff --git a/code/modules/food_and_drinks/machinery/stove_component.dm b/code/modules/food_and_drinks/machinery/stove_component.dm
index 76f52345c8c35..8db59dc2739d8 100644
--- a/code/modules/food_and_drinks/machinery/stove_component.dm
+++ b/code/modules/food_and_drinks/machinery/stove_component.dm
@@ -11,8 +11,6 @@
VAR_FINAL/on = FALSE
/// A reference to the current soup pot overtop
VAR_FINAL/obj/item/container
- /// A particle holder for the smoke that comes out of the soup while a container is cooking.
- VAR_FINAL/obj/effect/abstract/particle_holder/soup_smoke
/// Typepath of particles to use for the particle holder.
VAR_FINAL/particle_type = /particles/smoke/steam/mild
/// Ref to our looping sound played when cooking
@@ -60,11 +58,12 @@
real_parent.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1
/datum/component/stove/UnregisterFromParent()
+ var/obj/machinery/real_parent = parent
if(!QDELING(parent))
- var/obj/machinery/real_parent = parent
container.forceMove(real_parent.drop_location())
- QDEL_NULL(soup_smoke)
+ if (particle_type)
+ real_parent.remove_shared_particles("[particle_type]_stove_[container_x]")
UnregisterSignal(parent, list(
COMSIG_ATOM_ATTACK_HAND_SECONDARY,
@@ -248,6 +247,7 @@
SIGNAL_HANDLER
var/existing_temp = container?.reagents.chem_temp || 0
+ var/old_type = particle_type
if(existing_temp >= SOUP_BURN_TEMP)
particle_type = /particles/smoke/steam/bad
else if(existing_temp >= WATER_BOILING_POINT)
@@ -255,20 +255,23 @@
else
particle_type = null
- update_smoke()
+ update_smoke(old_type)
+
+/datum/component/stove/proc/update_smoke(old_type = null)
+ var/obj/obj_parent = parent
+
+ if (old_type)
+ obj_parent.remove_shared_particles("[old_type]_stove_[container_x]")
+
+ if(!on || !container?.reagents.total_volume)
+ soup_sound?.stop()
+ if (!isnull(particle_type))
+ obj_parent.remove_shared_particles("[particle_type]_stove_[container_x]")
+ return
-/datum/component/stove/proc/update_smoke()
- if(on && container?.reagents.total_volume > 0)
- soup_sound.start()
- // Don't override existing particles, wasteful
- if(isnull(soup_smoke) || soup_smoke.particles.type != particle_type)
- QDEL_NULL(soup_smoke)
- if(isnull(particle_type))
- return
- // this gets badly murdered by sidemap
- soup_smoke = new(parent, particle_type)
- soup_smoke.set_particle_position(container_x, round(ICON_SIZE_Y * 0.66), 0)
+ soup_sound.start()
+ if(isnull(particle_type))
return
+ var/obj/effect/abstract/shared_particle_holder/soup_smoke = obj_parent.add_shared_particles(particle_type, "[particle_type]_stove_[container_x]")
+ soup_smoke.particles.position = list(container_x, round(ICON_SIZE_Y * 0.66), 0)
- QDEL_NULL(soup_smoke)
- soup_sound?.stop()
diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm
index e4ef45bda7fde..be04767b55ded 100644
--- a/code/modules/food_and_drinks/recipes/food_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm
@@ -40,7 +40,7 @@
var/resulting_reagent_purity
/datum/chemical_reaction/food/pre_reaction_other_checks(datum/reagents/holder)
- resulting_reagent_purity = holder.get_average_purity(/datum/reagent/consumable)
+ resulting_reagent_purity = holder.get_average_purity()
return TRUE
/datum/chemical_reaction/food/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
diff --git a/code/modules/forensics/_forensics.dm b/code/modules/forensics/_forensics.dm
index 8058a32e7fab4..450521e6c62de 100644
--- a/code/modules/forensics/_forensics.dm
+++ b/code/modules/forensics/_forensics.dm
@@ -112,7 +112,7 @@
if(!iseyemob(suspect))
return
if(isaicamera(suspect))
- var/mob/eye/ai_eye/ai_camera = suspect
+ var/mob/eye/camera/ai/ai_camera = suspect
if(!ai_camera.ai)
return
suspect = ai_camera.ai
@@ -193,7 +193,7 @@
if(!iseyemob(suspect))
return
if(isaicamera(suspect))
- var/mob/eye/ai_eye/ai_camera = suspect
+ var/mob/eye/camera/ai/ai_camera = suspect
if(!ai_camera.ai)
return
suspect = ai_camera.ai
diff --git a/code/modules/hallucination/station_message.dm b/code/modules/hallucination/station_message.dm
index 9441cdeb42a5a..55b44d18463ed 100644
--- a/code/modules/hallucination/station_message.dm
+++ b/code/modules/hallucination/station_message.dm
@@ -112,7 +112,7 @@
/datum/hallucination/station_message/supermatter_delam/start()
SEND_SOUND(hallucinator, 'sound/effects/magic/charge.ogg')
- to_chat(hallucinator, span_boldannounce("You feel reality distort for a moment..."))
+ to_chat(hallucinator, span_bolddanger("You feel reality distort for a moment..."))
return ..()
/datum/hallucination/station_message/clock_cult_ark
diff --git a/code/modules/hallucination/stray_bullet.dm b/code/modules/hallucination/stray_bullet.dm
index 11f88c8c964ed..b670cd869e9b2 100644
--- a/code/modules/hallucination/stray_bullet.dm
+++ b/code/modules/hallucination/stray_bullet.dm
@@ -16,7 +16,7 @@
var/obj/projectile/hallucination/fake_projectile = new fake_type(start, src)
- fake_projectile.preparePixelProjectile(hallucinator, start)
+ fake_projectile.aim_projectile(hallucinator, start)
fake_projectile.fire()
QDEL_IN(src, 10 SECONDS) // Should clean up the projectile if it somehow gets stuck.
@@ -32,7 +32,6 @@
ricochets_max = 0
ricochet_chance = 0
damage = 0
- projectile_type = /obj/projectile/hallucination
log_override = TRUE
do_not_log = TRUE
/// Our parent hallucination that's created us
@@ -213,7 +212,7 @@
ricochets_max = 50
ricochet_chance = 80
- reflectable = REFLECT_NORMAL // No idea if this works
+ reflectable = TRUE
/obj/projectile/hallucination/laser/apply_effect_to_hallucinator(mob/living/afflicted)
afflicted.adjustStaminaLoss(20)
@@ -259,7 +258,7 @@
ricochets_max = 50
ricochet_chance = 80
- reflectable = REFLECT_NORMAL // No idea if this works
+ reflectable = TRUE
/obj/projectile/hallucination/disabler/apply_effect_to_hallucinator(mob/living/afflicted)
afflicted.adjustStaminaLoss(30)
diff --git a/code/modules/hydroponics/beekeeping/bee_smoker.dm b/code/modules/hydroponics/beekeeping/bee_smoker.dm
index 3daa75f89e63a..d04c72adfd669 100644
--- a/code/modules/hydroponics/beekeeping/bee_smoker.dm
+++ b/code/modules/hydroponics/beekeeping/bee_smoker.dm
@@ -25,6 +25,10 @@
. = ..()
beesmoke_loop = new(src)
+/obj/item/bee_smoker/Destroy(force)
+ remove_shared_particles(/particles/smoke/bee_smoke)
+ return ..()
+
/obj/item/bee_smoker/attack_self(mob/user)
. = ..()
if(.)
@@ -100,13 +104,13 @@
if(!activated)
beesmoke_loop.stop()
- QDEL_NULL(particles)
+ remove_shared_particles(/particles/smoke/bee_smoke)
STOP_PROCESSING(SSobj, src)
return
beesmoke_loop.start()
START_PROCESSING(SSobj, src)
- particles = new /particles/smoke/bee_smoke
+ add_shared_particles(/particles/smoke/bee_smoke)
/particles/smoke/bee_smoke
lifespan = 0.4 SECONDS
diff --git a/code/modules/hydroponics/grown/weeds/nettle.dm b/code/modules/hydroponics/grown/weeds/nettle.dm
index dec1e8b119e2b..2420ba8942cd6 100644
--- a/code/modules/hydroponics/grown/weeds/nettle.dm
+++ b/code/modules/hydroponics/grown/weeds/nettle.dm
@@ -58,7 +58,7 @@
/obj/item/food/grown/nettle/death
seed = /obj/item/seeds/nettle/death
name = "\improper deathnettle"
- desc = "The glowing nettle incites rage in you just from looking at it!"
+ desc = "The glowing nettle incites rage in you just from looking at it!"
icon_state = "deathnettle"
inhand_icon_state = "deathnettle"
bite_consumption_mod = 4 // I guess if you really wanted to
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 53ffae4aca022..c8a3e10b8e931 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -202,6 +202,7 @@
/obj/machinery/hydroponics/Destroy()
if(myseed)
QDEL_NULL(myseed)
+ remove_shared_particles(/particles/pollen)
return ..()
/obj/machinery/hydroponics/Exited(atom/movable/gone)
@@ -292,7 +293,7 @@
mutate()
return BULLET_ACT_HIT
if(istype(proj, /obj/projectile/energy/flora/yield))
- return myseed.bullet_act(proj)
+ return myseed.projectile_hit(proj)
if(istype(proj, /obj/projectile/energy/flora/evolution))
if(myseed)
if(LAZYLEN(myseed.mutatelist))
@@ -536,7 +537,7 @@
age = 0
update_appearance()
if(isnull(myseed))
- particles = null
+ remove_shared_particles(/particles/pollen)
/*
* Setter proc to set a tray to a new self_sustaining state and update all values associated with it.
@@ -798,12 +799,11 @@
T.myseed.set_instability(round((T.myseed.instability+(1/10)*(myseed.instability-T.myseed.instability))))
T.myseed.set_yield(round((T.myseed.yield+(1/2)*(myseed.yield-T.myseed.yield))))
any_adjacent = TRUE
- if(isnull(particles))
- particles = new /particles/pollen()
+ add_shared_particles(/particles/pollen)
if(myseed.instability >= 20 && prob(70) && length(T.myseed.reagents_add))
myseed.perform_reagent_pollination(T.myseed)
if(!any_adjacent)
- particles = null
+ remove_shared_particles(/particles/pollen)
/**
* Bee pollinate proc.
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index e0e88f7c402d9..22434788e999f 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -280,7 +280,7 @@
//Handles the juicing trait, swaps nutriment and vitamins for that species various juices if they exist. Mutually exclusive with distilling.
if(get_gene(/datum/plant_gene/trait/juicing) && grown_edible.juice_typepath)
- grown_edible.juice()
+ grown_edible.juice(juicer = FALSE) //we pass FALSE & not null because Byond default args will subtitute it with the default value
else if(get_gene(/datum/plant_gene/trait/brewing))
grown_edible.ferment()
diff --git a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm
index d2f6f61251dd2..2debc004e4dd9 100644
--- a/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm
+++ b/code/modules/jobs/job_types/chaplain/chaplain_vorpal_scythe.dm
@@ -9,11 +9,7 @@ If the scythe isn't empowered when you sheath it, you take a heap of damage and
name = "sinister shard"
desc = "This shard seems to be directly linked to some sinister entity. It might be your god! It also gives you a really horrible rash when you hold onto it for too long."
items_to_create = list(/obj/item/vorpalscythe)
-
-/obj/item/organ/cyberimp/arm/shard/scythe/mob_insert(mob/living/carbon/receiver, special, movement_flags)
- . = ..()
- if(receiver.mind)
- ADD_TRAIT(receiver.mind, TRAIT_MORBID, ORGAN_TRAIT)
+ organ_traits = list(TRAIT_MORBID)
/obj/item/organ/cyberimp/arm/shard/scythe/Retract()
var/obj/item/vorpalscythe/scythe = active_item
diff --git a/code/modules/language/_language_manuals.dm b/code/modules/language/_language_manuals.dm
index 7a4298a06b150..507d663ef8696 100644
--- a/code/modules/language/_language_manuals.dm
+++ b/code/modules/language/_language_manuals.dm
@@ -16,7 +16,7 @@
to_chat(user, span_boldwarning("You start skimming through [src], but you already know [initial(language.name)]."))
return
- to_chat(user, span_boldannounce("You start skimming through [src], and [flavour_text]."))
+ to_chat(user, span_bolddanger("You start skimming through [src], and [flavour_text]."))
user.grant_language(language)
user.remove_blocked_language(language, source=LANGUAGE_ALL)
diff --git a/code/modules/library/skill_learning/skillchip.dm b/code/modules/library/skill_learning/skillchip.dm
index 5ca3f784ecbec..f534e391bcb27 100644
--- a/code/modules/library/skill_learning/skillchip.dm
+++ b/code/modules/library/skill_learning/skillchip.dm
@@ -132,10 +132,12 @@
* * owner_brain - The brain that this skillchip was implanted in to.
*/
/obj/item/skillchip/proc/on_implant(obj/item/organ/brain/owner_brain)
+ SHOULD_CALL_PARENT(TRUE)
if(holding_brain)
CRASH("Skillchip is trying to be implanted into [owner_brain], but it's already implanted in [holding_brain]")
holding_brain = owner_brain
+ SEND_SIGNAL(src, COMSIG_SKILLCHIP_IMPLANTED, holding_brain)
/**
* Called when a skillchip is activated.
@@ -172,7 +174,7 @@
try_deactivate_skillchip(silent, TRUE)
COOLDOWN_RESET(src, chip_cooldown)
-
+ SEND_SIGNAL(src, COMSIG_SKILLCHIP_REMOVED, holding_brain)
holding_brain = null
/**
diff --git a/code/modules/loadout/categories/heads.dm b/code/modules/loadout/categories/heads.dm
index ad23f0b2dfb7b..69ef68cfff193 100644
--- a/code/modules/loadout/categories/heads.dm
+++ b/code/modules/loadout/categories/heads.dm
@@ -66,7 +66,7 @@
/datum/loadout_item/head/white_cap
name = "Cap (White)"
- item_path = /obj/item/clothing/head/soft
+ item_path = /obj/item/clothing/head/soft/mime
/datum/loadout_item/head/yellow_cap
name = "Cap (Yellow)"
@@ -147,7 +147,7 @@
/datum/loadout_item/head/geranium
name = "Geranium"
item_path = /obj/item/food/grown/poppy/geranium
-
+
/datum/loadout_item/head/harebell
name = "Harebell"
item_path = /obj/item/food/grown/harebell
diff --git a/code/modules/lost_crew/damages/projectile.dm b/code/modules/lost_crew/damages/projectile.dm
index 121304ac9b5c7..64541cf1eaf61 100644
--- a/code/modules/lost_crew/damages/projectile.dm
+++ b/code/modules/lost_crew/damages/projectile.dm
@@ -13,7 +13,7 @@
var/hits = ((max_hits - min_hits) * severity + min_hits)
for(var/i in 1 to hits)
- body.bullet_act(projectile, def_zone = pick(GLOB.all_body_zones), piercing_hit = TRUE)
+ body.projectile_hit(projectile, def_zone = pick(GLOB.all_body_zones), piercing_hit = TRUE)
/datum/corpse_damage/cause_of_death/projectile/laser
projectile = /obj/projectile/beam/laser
diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/watcher_grave.dm b/code/modules/mapfluff/ruins/lavalandruin_code/watcher_grave.dm
index 6d3ef03c3f028..d25581bd3f3a1 100644
--- a/code/modules/mapfluff/ruins/lavalandruin_code/watcher_grave.dm
+++ b/code/modules/mapfluff/ruins/lavalandruin_code/watcher_grave.dm
@@ -254,8 +254,7 @@
icon_state = "ice_2"
damage = 10
damage_type = BRUTE // Mining mobs don't take a lot of burn damage so we'll pretend
- speed = 1
- pixel_speed_multiplier = 0.5
+ speed = 0.5
/obj/projectile/baby_watcher_blast/Initialize(mapload)
. = ..()
diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
index 6baaf8e566070..af81563681cd0 100644
--- a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
+++ b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
@@ -94,7 +94,7 @@
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/structure/necropolis_gate/attack_hand(mob/user, list/modifiers)
if(locked)
- to_chat(user, span_boldannounce("It's [open ? "stuck open":"locked"]."))
+ to_chat(user, span_bolddanger("It's [open ? "stuck open":"locked"]."))
return
toggle_the_gate(user)
return ..()
@@ -163,7 +163,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
var/safety = tgui_alert(user, "You think this might be a bad idea...", "Knock on the door?", list("Proceed", "Abort"))
if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated)
return
- user.visible_message(span_warning("[user] knocks on [src]..."), span_boldannounce("You tentatively knock on [src]..."))
+ user.visible_message(span_warning("[user] knocks on [src]..."), span_bolddanger("You tentatively knock on [src]..."))
playsound(user.loc, 'sound/effects/shieldbash.ogg', 100, TRUE)
sleep(5 SECONDS)
return ..()
diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm
index 6e67c0831d398..f925fa651a838 100644
--- a/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm
@@ -49,4 +49,4 @@
user.updateappearance(mutcolor_update=1)
user.domutcheck()
user.visible_message(span_warning("[user]'s appearance shifts into [H]'s!"), \
- span_boldannounce("[H.p_They()] think[H.p_s()] [H.p_theyre()] sooo much better than you. Not anymore, [H.p_they()] won't."))
+ span_bolddanger("[H.p_They()] think[H.p_s()] [H.p_theyre()] sooo much better than you. Not anymore, [H.p_they()] won't."))
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/oldstation/oldstation_mod.dm b/code/modules/mapfluff/ruins/spaceruin_code/oldstation/oldstation_mod.dm
index 994162345dae2..7c003b0dc7a43 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/oldstation/oldstation_mod.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/oldstation/oldstation_mod.dm
@@ -86,7 +86,7 @@
..()
return TRUE
-/obj/machinery/mod_installer/close_machine(mob/living/carbon/user, density_to_set = TRUE)
+/obj/machinery/mod_installer/close_machine(atom/movable/target, density_to_set = TRUE)
if(!state_open)
return FALSE
..()
@@ -108,7 +108,7 @@
/obj/machinery/mod_installer/interact(mob/user)
if(state_open)
- close_machine(null, user)
+ close_machine()
return
else if(busy)
balloon_alert(user, "it's locked!")
diff --git a/code/modules/meteors/meteor_types.dm b/code/modules/meteors/meteor_types.dm
index ba135081532da..287a93821aebd 100644
--- a/code/modules/meteors/meteor_types.dm
+++ b/code/modules/meteors/meteor_types.dm
@@ -76,8 +76,12 @@
if(!isatom(chasing))
return
var/datum/move_loop/new_loop = GLOB.move_manager.move_towards(src, chasing, delay, home, lifetime)
- if(!new_loop)
- return
+ if(new_loop)
+ RegisterSignal(new_loop, COMSIG_MOVELOOP_STOP, PROC_REF(on_loop_stopped))
+
+/obj/effect/meteor/proc/on_loop_stopped(datum/source)
+ SIGNAL_HANDLER
+ qdel(src)
///Deals with what happens when we stop moving, IE we die
/obj/effect/meteor/proc/moved_off_z()
diff --git a/code/modules/mining/equipment/grapple_gun.dm b/code/modules/mining/equipment/grapple_gun.dm
index fa7f0b0b73570..99144d84867ce 100644
--- a/code/modules/mining/equipment/grapple_gun.dm
+++ b/code/modules/mining/equipment/grapple_gun.dm
@@ -179,7 +179,7 @@
icon_state = "grapple_hook"
damage = 0
range = 9
- speed = 0.1
+ speed = 10
can_hit_turfs = TRUE
hitsound = 'sound/items/weapons/zipline_hit.ogg'
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 1a83ad0f30330..c5bdfa9daa239 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -157,7 +157,7 @@
destabilizer.icon_state = "[projectile_icon]"
for(var/obj/item/crusher_trophy/attached_trophy as anything in trophies)
attached_trophy.on_projectile_fire(destabilizer, user)
- destabilizer.preparePixelProjectile(target, user, modifiers)
+ destabilizer.aim_projectile(target, user, modifiers)
destabilizer.firer = user
playsound(user, 'sound/items/weapons/plasma_cutter.ogg', 100, TRUE)
destabilizer.fire()
@@ -423,7 +423,7 @@
marker.name = "deadly [marker.name]"
marker.icon_state = "chronobolt"
marker.damage = bonus_value
- marker.speed = 2
+ marker.speed = 0.5
deadly_shot = FALSE
/obj/item/crusher_trophy/blaster_tubes/on_mark_detonation(mob/living/target, mob/living/user)
diff --git a/code/modules/mining/equipment/monster_organs/monster_organ.dm b/code/modules/mining/equipment/monster_organs/monster_organ.dm
index b6bd54a361eb5..ccd3a08c19cc2 100644
--- a/code/modules/mining/equipment/monster_organs/monster_organ.dm
+++ b/code/modules/mining/equipment/monster_organs/monster_organ.dm
@@ -83,7 +83,7 @@
deltimer(decay_timer)
return ..()
-/obj/item/organ/monster_core/mob_insert(mob/living/carbon/target_carbon, special = FALSE, movement_flags)
+/obj/item/organ/monster_core/on_mob_insert(mob/living/carbon/target_carbon, special = FALSE, movement_flags)
. = ..()
if (inert)
@@ -96,7 +96,7 @@
target_carbon.visible_message(span_notice("[src] stabilizes as it's inserted."))
return TRUE
-/obj/item/organ/monster_core/mob_remove(mob/living/carbon/target_carbon, special, movement_flags)
+/obj/item/organ/monster_core/on_mob_remove(mob/living/carbon/target_carbon, special, movement_flags)
if (!inert && !special)
owner.visible_message(span_notice("[src] rapidly decays as it's removed."))
go_inert()
diff --git a/code/modules/mining/equipment/monster_organs/rush_gland.dm b/code/modules/mining/equipment/monster_organs/rush_gland.dm
index cf901269e904c..8012286975adb 100644
--- a/code/modules/mining/equipment/monster_organs/rush_gland.dm
+++ b/code/modules/mining/equipment/monster_organs/rush_gland.dm
@@ -25,7 +25,7 @@
. = ..()
RegisterSignal(organ_owner, COMSIG_GOLIATH_TENTACLED_GRABBED, PROC_REF(trigger_organ_action_on_sig))
-/obj/item/organ/monster_core/rush_gland/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/monster_core/rush_gland/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
UnregisterSignal(organ_owner, COMSIG_GOLIATH_TENTACLED_GRABBED)
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index ee700e3d9774b..e7966764b6a96 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -150,10 +150,10 @@
points += SHEET_POINT_VALUE * input.amount
return ..()
-/obj/machinery/mineral/stacking_machine/laborstacker/attackby(obj/item/weapon, mob/user, params)
+/obj/machinery/mineral/stacking_machine/laborstacker/base_item_interaction(mob/living/user, obj/item/weapon, list/modifiers)
if(istype(weapon, /obj/item/stack/sheet))
process_sheet(weapon)
- return
+ return ITEM_INTERACT_SUCCESS
return ..()
/**********************Point Lookup Console**************************/
diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm
index d355014c6ad70..3b33119aa24e7 100644
--- a/code/modules/mining/lavaland/megafauna_loot.dm
+++ b/code/modules/mining/lavaland/megafauna_loot.dm
@@ -553,7 +553,7 @@
return
COOLDOWN_START(src, attack_cooldown, 3 SECONDS)
var/obj/projectile/projectile = new /obj/projectile/soulscythe(get_turf(src))
- projectile.preparePixelProjectile(attacked_atom, src)
+ projectile.aim_projectile(attacked_atom, src)
projectile.firer = src
projectile.fire(null, attacked_atom)
visible_message(span_danger("[src] fires at [attacked_atom]!"), span_notice("You fire at [attacked_atom]!"))
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 58b7b437d7c54..bb6215705160d 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -145,8 +145,8 @@
/obj/structure/closet/crate/necropolis/colossus
name = "colossus chest"
-/obj/structure/closet/crate/necropolis/colossus/bullet_act(obj/projectile/P)
- if(istype(P, /obj/projectile/colossus))
+/obj/structure/closet/crate/necropolis/colossus/bullet_act(obj/projectile/proj)
+ if(istype(proj, /obj/projectile/colossus))
return BULLET_ACT_FORCE_PIERCE
return ..()
diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm
index cfcffa6fea17d..b50c966d230eb 100644
--- a/code/modules/mining/lavaland/tendril_loot.dm
+++ b/code/modules/mining/lavaland/tendril_loot.dm
@@ -817,7 +817,11 @@
/obj/item/drake_remains/Initialize(mapload)
. = ..()
- particles = new /particles/bonfire()
+ add_shared_particles(/particles/bonfire)
+
+/obj/item/drake_remains/Destroy(force)
+ remove_shared_particles(/particles/bonfire)
+ return ..()
/obj/item/clothing/glasses/godeye
name = "eye of god"
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index d74e46b026414..e08fed91b0951 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -135,10 +135,6 @@
roundstart_template = /datum/map_template/shuttle/mining/kilo
height = 10
-/obj/docking_port/stationary/mining_home/northstar
- roundstart_template = /datum/map_template/shuttle/mining/northstar
- height = 6
-
/obj/docking_port/stationary/mining_home/nebula
roundstart_template = /datum/map_template/shuttle/mining/nebula
height = 10
@@ -151,9 +147,6 @@
/obj/docking_port/stationary/mining_home/common/kilo
roundstart_template = /datum/map_template/shuttle/mining_common/kilo
-/obj/docking_port/stationary/mining_home/common/northstar
- roundstart_template = /datum/map_template/shuttle/mining_common/northstar
-
/obj/structure/closet/crate/miningcar
name = "mine cart"
desc = "A cart for use on rails. Or off rails, if you're so inclined."
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 0b051248a3966..55a1b9557c26d 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -341,8 +341,8 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
else
return ..()
-/obj/item/gibtonite/bullet_act(obj/projectile/P)
- GibtoniteReaction(P.firer, "A projectile has primed for detonation a")
+/obj/item/gibtonite/bullet_act(obj/projectile/proj)
+ GibtoniteReaction(proj.firer, "A projectile has primed for detonation a")
return ..()
/obj/item/gibtonite/ex_act()
diff --git a/code/modules/mob/eye/camera/camera.dm b/code/modules/mob/eye/camera/camera.dm
new file mode 100644
index 0000000000000..9f3ddc7b2eed4
--- /dev/null
+++ b/code/modules/mob/eye/camera/camera.dm
@@ -0,0 +1,80 @@
+/**
+ * Eye mob used to look around a [camera network][/datum/cameranet]. \
+ * As it moves, it makes requests to the network to update what the user can and cannot see.
+ */
+/mob/eye/camera
+ name = "Inactive Camera Eye"
+ icon = 'icons/mob/eyemob.dmi'
+ icon_state = "generic_camera"
+
+ invisibility = INVISIBILITY_OBSERVER
+ interaction_range = INFINITY
+ /// If TRUE, the eye will cover turfs hidden to the cameranet with static.
+ var/use_visibility = TRUE
+ /// List of [camera chunks][/datum/camerachunk] visible to this camera.
+ /// Please don't interface with this directly. Use the [cameranet][/datum/cameranet].
+ var/final/list/datum/camerachunk/visibleCameraChunks = list()
+ /// NxN Range of a single camera chunk.
+ var/static_visibility_range = 16
+
+/mob/eye/camera/Initialize(mapload)
+ . = ..()
+ GLOB.camera_eyes += src
+
+/mob/eye/camera/Destroy()
+ for(var/datum/camerachunk/chunk in visibleCameraChunks)
+ chunk.remove(src)
+ GLOB.camera_eyes -= src
+ return ..()
+
+/**
+ * Getter proc for getting the current user's client.
+ *
+ * The base version of this proc returns null.
+ * Subtypes are expected to overload this proc and make it return something meaningful.
+ */
+/mob/eye/camera/proc/GetViewerClient()
+ RETURN_TYPE(/client)
+ SHOULD_BE_PURE(TRUE)
+
+ return null
+
+/**
+ * Use this when setting the camera eye's location directly. \
+ * It will also attempt to update visible chunks.
+ */
+/mob/eye/camera/proc/setLoc(destination, force_update = FALSE)
+ SHOULD_NOT_SLEEP(TRUE)
+ SHOULD_CALL_PARENT(TRUE)
+
+ destination = get_turf(destination)
+ if(!force_update && (destination == get_turf(src)))
+ return
+
+ if(destination)
+ abstract_move(destination)
+ else
+ moveToNullspace()
+
+ if(use_visibility)
+ update_visibility()
+ update_parallax_contents()
+
+/// Sends a visibility query to the cameranet.
+/// Can be used as a signal handler.
+/mob/eye/camera/proc/update_visibility()
+ SIGNAL_HANDLER
+ PROTECTED_PROC(TRUE)
+ SHOULD_CALL_PARENT(TRUE)
+
+ if(use_visibility)
+ GLOB.cameranet.visibility(src)
+
+/mob/eye/camera/zMove(dir, turf/target, z_move_flags = NONE, recursions_left = 1, list/falling_movs)
+ . = ..()
+ if(.)
+ setLoc(loc, force_update = TRUE)
+
+/mob/eye/camera/Move()
+ SHOULD_NOT_OVERRIDE(TRUE)
+ return
diff --git a/code/modules/mob/eye/camera/remote.dm b/code/modules/mob/eye/camera/remote.dm
new file mode 100644
index 0000000000000..97fe41886ce93
--- /dev/null
+++ b/code/modules/mob/eye/camera/remote.dm
@@ -0,0 +1,130 @@
+/**
+ * A camera controlled by a machine-operating user, like advanced cameras.
+ * Handles assigning/unassigning it's users, as well as applying sight effects.
+ */
+/mob/eye/camera/remote
+ /// Weakref to the current user of this eye. Must be a [living mob][/mob/living].
+ var/datum/weakref/user_ref
+ /// Weakref to the creator of this eye. Must be a [machine][/obj/machinery].
+ var/datum/weakref/origin_ref
+
+ /// TRUE if this camera should show itself to the user.
+ var/visible_to_user = FALSE
+ /// If visible_to_user is TRUE, it will show this in the center of the screen.
+ VAR_PROTECTED/image/user_image
+
+ /* The below code could be shared by AI eyes... */
+
+ /// If TRUE, the eye will have acceleration when moving.
+ var/acceleration = TRUE
+ /// Used internally for calculating wait time. (world.timeofday + wait_time)
+ VAR_FINAL/last_moved = 0
+ /// The amount of time that must pass before var/sprint is reset.
+ VAR_PROTECTED/wait_time = 5 DECISECONDS
+ /// The speed of the camera. Scales from initial(sprint) to var/max_sprint
+ VAR_PROTECTED/sprint = 10
+ /// Amount of speed that is added to var/sprint.
+ VAR_PROTECTED/momentum = 0.5
+ /// The maximum sprint that this eye can reach.
+ VAR_PROTECTED/max_sprint = 50
+
+
+/mob/eye/camera/remote/Initialize(mapload, obj/machinery/creator)
+ if(!creator)
+ return INITIALIZE_HINT_QDEL
+
+ . = ..()
+
+ origin_ref = WEAKREF(creator)
+ if(visible_to_user)
+ set_user_icon(icon, icon_state)
+
+/mob/eye/camera/remote/Destroy()
+ var/mob/living/user = user_ref?.resolve()
+ var/obj/machinery/origin = origin_ref?.resolve()
+ if(origin && user)
+ origin.remove_eye_control(user,src)
+
+ assign_user(null)
+ origin_ref = null
+ return ..()
+
+/mob/eye/camera/remote/proc/assign_user(mob/living/new_user)
+ var/mob/living/old_user = user_ref?.resolve()
+ if(old_user)
+ old_user.remote_control = null
+ old_user.reset_perspective(null)
+ name = initial(src.name)
+
+ var/client/old_user_client = GetViewerClient()
+ if(user_image && old_user_client)
+ old_user_client.images -= user_image
+
+ user_ref = WEAKREF(new_user) //The user_ref can still be null!
+
+ if(new_user)
+ new_user.remote_control = src
+ new_user.reset_perspective(src)
+ name = "Camera Eye ([new_user.name])"
+
+ var/client/new_user_client = GetViewerClient()
+ if(user_image && new_user_client)
+ new_user_client.images += user_image
+
+/**
+ * Sets the camera's user image to this icon and state.
+ * If chosen_icon is null, the user image will be removed.
+ */
+/mob/eye/camera/remote/proc/set_user_icon(icon/chosen_icon, icon_state)
+ SHOULD_CALL_PARENT(TRUE)
+
+ var/client/user_client = GetViewerClient()
+
+ if(!isnull(chosen_icon))
+ set_user_icon(null) //remove whatever the last icon was
+ if(!isicon(chosen_icon) || !(!isnull(icon_state) && istext(icon_state)))
+ CRASH("Tried to set [src]'s user_image with bad parameters")
+
+ user_image = image(chosen_icon, src, icon_state, FLY_LAYER)
+ if(user_client)
+ user_client.images += user_image
+ else
+ if(user_client)
+ user_client.images -= user_image
+ QDEL_NULL(user_image)
+
+/mob/eye/camera/remote/update_remote_sight(mob/living/user)
+ user.set_invis_see(SEE_INVISIBLE_LIVING) //can't see ghosts through cameras
+ user.set_sight(SEE_TURFS)
+ return TRUE
+
+/mob/eye/camera/remote/GetViewerClient()
+ var/mob/living/user = user_ref?.resolve()
+
+ if(user)
+ return user.client
+ return null
+
+/mob/eye/camera/remote/setLoc(turf/destination, force_update = FALSE)
+ . = ..()
+
+ var/client/user_client = GetViewerClient()
+ if(user_image && user_client)
+ SET_PLANE(user_image, ABOVE_GAME_PLANE, destination) //incase we move a z-level
+
+/mob/eye/camera/remote/relaymove(mob/living/user, direction)
+ var/initial = initial(src.sprint)
+
+ if(last_moved < world.timeofday) // It's been too long since we last moved, reset sprint
+ sprint = initial
+
+ for(var/i = 0; i < max(sprint, initial); i += 20)
+ var/turf/step = get_turf(get_step(src, direction))
+ if(step)
+ setLoc(step)
+
+ last_moved = world.timeofday + wait_time
+ if(acceleration)
+ sprint = min(sprint + momentum, max_sprint)
+ else
+ sprint = initial
diff --git a/code/modules/mob/eye/eye.dm b/code/modules/mob/eye/eye.dm
index ca58e2969c588..54cb5e2b40a4f 100644
--- a/code/modules/mob/eye/eye.dm
+++ b/code/modules/mob/eye/eye.dm
@@ -1,4 +1,4 @@
-// Eye mob, used by cameras and overminds such as blobs.
+/// Eye mob, used by cameras and overminds such as blobs.
/mob/eye
name = "eye mob"
density = FALSE
@@ -8,9 +8,9 @@
invisibility = INVISIBILITY_ABSTRACT // No one can see us
sight = SEE_SELF
status_flags = NONE
- /// Toggles if the camera can move on shuttles
+ /// Toggles if the eye can move on shuttles
var/move_on_shuttle = FALSE
- /// Toggles if the camera can use emotes
+ /// Toggles if the eye can use emotes
var/has_emotes = FALSE
/mob/eye/Initialize(mapload)
diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm
index 19534cebafd58..7a34912f406f3 100644
--- a/code/modules/mob/living/basic/bots/_bots.dm
+++ b/code/modules/mob/living/basic/bots/_bots.dm
@@ -631,7 +631,7 @@ GLOBAL_LIST_INIT(command_strings, list(
to_chat(src, span_boldnotice(get_emagged_message()))
return
if(!(bot_access_flags & BOT_COVER_HACKED))
- to_chat(the_user, span_boldannounce("You fail to repair [src]'s [hackables]."))
+ to_chat(the_user, span_bolddanger("You fail to repair [src]'s [hackables]."))
return
bot_access_flags &= ~(BOT_COVER_EMAGGED|BOT_COVER_HACKED)
to_chat(the_user, span_notice("You reset the [src]'s [hackables]."))
diff --git a/code/modules/mob/living/basic/bots/bot_ai.dm b/code/modules/mob/living/basic/bots/bot_ai.dm
index dfef7f1e3788c..f04aed05eaa29 100644
--- a/code/modules/mob/living/basic/bots/bot_ai.dm
+++ b/code/modules/mob/living/basic/bots/bot_ai.dm
@@ -1,3 +1,5 @@
+#define BOT_NO_BEACON_PATH_PENALTY 30 SECONDS
+
/datum/ai_controller/basic_controller/bot
blackboard = list(
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
@@ -9,12 +11,10 @@
)
ai_movement = /datum/ai_movement/jps/bot
- idle_behavior = /datum/idle_behavior/idle_random_walk/less_walking
planning_subtrees = list(
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/salute_authority,
/datum/ai_planning_subtree/find_patrol_beacon,
- /datum/ai_planning_subtree/manage_unreachable_list,
)
max_target_distance = AI_BOT_PATH_LENGTH
can_idle = FALSE
@@ -40,7 +40,7 @@
return ..()
var/list/path = get_path_to(living_mob, living_target, mintargetdist = my_controller.minimum_distance, max_distance = 10, access = my_controller.get_access())
if(!length(path) || QDELETED(living_mob))
- my_controller?.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, living_target, TRUE)
+ my_controller?.add_to_blacklist(living_target)
return FALSE
return ..()
@@ -57,6 +57,16 @@
if(current_movement_target == blackboard[BB_BEACON_TARGET])
source.update_bot_mode(new_mode = BOT_PATROL)
+/datum/ai_controller/basic_controller/bot/proc/add_to_blacklist(atom/target, duration)
+ var/final_duration = duration || blackboard[BB_UNREACHABLE_LIST_COOLDOWN]
+ set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, target, TRUE)
+ addtimer(CALLBACK(src, PROC_REF(remove_from_blacklist), target), final_duration)
+
+/datum/ai_controller/basic_controller/bot/proc/remove_from_blacklist(atom/target)
+ if(QDELETED(target))
+ return
+ remove_from_blackboard_lazylist_key(BB_TEMPORARY_IGNORE_LIST, target)
+
/datum/ai_controller/basic_controller/bot/proc/clear_summon()
SIGNAL_HANDLER
@@ -90,12 +100,14 @@
clear_blackboard_key(key)
///set the target if we can reach them
-/datum/ai_controller/basic_controller/bot/proc/set_if_can_reach(key, target, distance = 10, bypass_add_to_blacklist = FALSE)
+/datum/ai_controller/basic_controller/bot/proc/set_if_can_reach(key, target, duration, distance = 10, bypass_add_to_blacklist = FALSE)
if(can_reach_target(target, distance))
set_blackboard_key(key, target)
return TRUE
- if(!bypass_add_to_blacklist)
- set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, target, TRUE)
+ if(bypass_add_to_blacklist)
+ return FALSE
+ var/final_duration = duration || blackboard[BB_UNREACHABLE_LIST_COOLDOWN]
+ add_to_blacklist(target, final_duration)
return FALSE
/datum/ai_controller/basic_controller/bot/proc/can_reach_target(target, distance = 10)
@@ -104,29 +116,7 @@
if(get_turf(pawn) == get_turf(target))
return TRUE
var/list/path = get_path_to(pawn, target, simulated_only = !HAS_TRAIT(pawn, TRAIT_SPACEWALK), mintargetdist = minimum_distance, max_distance = distance, access = get_access())
- if(!length(path))
- return FALSE
- return TRUE
-
-/// subtree to manage our list of unreachables, we reset it every 15 seconds
-/datum/ai_planning_subtree/manage_unreachable_list
-
-/datum/ai_planning_subtree/manage_unreachable_list/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
- if(isnull(controller.blackboard[BB_UNREACHABLE_LIST_COOLDOWN]) || controller.blackboard[BB_CLEAR_LIST_READY] > world.time)
- return
- controller.queue_behavior(/datum/ai_behavior/manage_unreachable_list, BB_TEMPORARY_IGNORE_LIST)
-
-/datum/ai_behavior/manage_unreachable_list
- behavior_flags = AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
-
-/datum/ai_behavior/manage_unreachable_list/perform(seconds_per_tick, datum/ai_controller/controller, list_key)
- if(!isnull(controller.blackboard[list_key]))
- controller.clear_blackboard_key(list_key)
- return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
-
-/datum/ai_behavior/manage_unreachable_list/finish_action(datum/ai_controller/controller, succeeded)
- . = ..()
- controller.set_blackboard_key(BB_CLEAR_LIST_READY, controller.blackboard[BB_UNREACHABLE_LIST_COOLDOWN] + world.time)
+ return (!!length(path))
/datum/ai_planning_subtree/find_patrol_beacon
///travel towards beacon behavior
@@ -134,6 +124,10 @@
/datum/ai_planning_subtree/find_patrol_beacon/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
var/mob/living/basic/bot/bot_pawn = controller.pawn
+
+ if(controller.blackboard[BB_BOT_BEACON_COOLDOWN] > world.time)
+ return
+
if(!(bot_pawn.bot_mode_flags & BOT_MODE_AUTOPATROL) || bot_pawn.mode == BOT_SUMMON)
return
@@ -168,7 +162,10 @@
controller.set_blackboard_key(BB_BEACON_TARGET, final_target)
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
-/datum/ai_behavior/find_next_beacon_target/perform(seconds_per_tick, datum/ai_controller/controller, target_key)
+/datum/ai_behavior/find_next_beacon_target
+ action_cooldown = 5 SECONDS
+
+/datum/ai_behavior/find_next_beacon_target/perform(seconds_per_tick, datum/ai_controller/basic_controller/bot/controller, target_key)
var/mob/living/basic/bot/bot_pawn = controller.pawn
var/atom/final_target
var/obj/machinery/navbeacon/prev_beacon = controller.blackboard[BB_PREVIOUS_BEACON_TARGET]
@@ -181,19 +178,37 @@
break
if(isnull(final_target))
- controller.clear_blackboard_key(BB_PREVIOUS_BEACON_TARGET)
+ controller.clear_blackboard_key(BB_PREVIOUS_BEACON_TARGET) //failed to find the next beacon, search for a first beacon again
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
- controller.set_blackboard_key(BB_BEACON_TARGET, final_target)
- return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
+ controller.set_blackboard_key(BB_PREVIOUS_BEACON_TARGET, final_target)
+ controller.clear_blackboard_key(BB_BEACON_TARGET)
+
+ if(LAZYACCESS(controller.blackboard[BB_TEMPORARY_IGNORE_LIST], final_target) || get_dist(bot_pawn, final_target) > controller.max_target_distance)
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
+
+ if(controller.set_if_can_reach(key = BB_BEACON_TARGET, target = final_target, duration = 3 MINUTES, distance = controller.max_target_distance))
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
+
+ controller.set_blackboard_key(BB_BOT_BEACON_COOLDOWN, world.time + BOT_NO_BEACON_PATH_PENALTY)
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
/datum/ai_behavior/travel_towards/beacon
clear_target = TRUE
new_movement_type = /datum/ai_movement/jps/bot/travel_to_beacon
-/datum/ai_behavior/travel_towards/beacon/finish_action(datum/ai_controller/controller, succeeded, target_key)
+/datum/ai_behavior/travel_towards/beacon/setup(datum/ai_controller/controller, target_key)
+ var/atom/target_beacon = controller.blackboard[target_key]
+ if(LAZYACCESS(controller.blackboard[BB_TEMPORARY_IGNORE_LIST], target_beacon))
+ return FALSE
+ return ..()
+
+/datum/ai_behavior/travel_towards/beacon/finish_action(datum/ai_controller/basic_controller/bot/controller, succeeded, target_key)
var/atom/target = controller.blackboard[target_key]
+ if(!succeeded)
+ controller.set_blackboard_key(BB_BOT_BEACON_COOLDOWN, world.time + BOT_NO_BEACON_PATH_PENALTY)
+ controller.add_to_blacklist(target, 3 MINUTES)
controller.set_blackboard_key(BB_PREVIOUS_BEACON_TARGET, target)
return ..()
@@ -274,7 +289,7 @@
var/mob/living/living_pawn = controller.pawn
var/list/ignore_list = controller.blackboard[BB_TEMPORARY_IGNORE_LIST]
- var/list/objects_to_search = turf_search ? spiral_range_turfs(radius, controller.pawn) : oview(radius, controller.pawn) //use range turfs instead of oview when we can for performance
+ var/list/objects_to_search = turf_search ? RANGE_TURFS(radius, controller.pawn) : oview(radius, controller.pawn) //use range turfs instead of oview when we can for performance
for(var/atom/potential_target as anything in objects_to_search)
if(QDELETED(living_pawn))
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
@@ -284,7 +299,9 @@
continue
if(!valid_target(controller, potential_target))
continue
- if(controller.set_if_can_reach(target_key, potential_target, distance = pathing_distance, bypass_add_to_blacklist = bypass_add_blacklist))
+ if(!can_see(controller.pawn, potential_target, radius))
+ continue
+ if(controller.set_if_can_reach(key = target_key, target = potential_target, distance = pathing_distance, bypass_add_to_blacklist = bypass_add_blacklist))
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
@@ -328,13 +345,16 @@
living_pawn.UnarmedAttack(target, proximity_flag = TRUE)
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
-/datum/ai_behavior/bot_interact/finish_action(datum/ai_controller/controller, succeeded, target_key)
+/datum/ai_behavior/bot_interact/finish_action(datum/ai_controller/basic_controller/bot/controller, succeeded, target_key)
. = ..()
var/atom/target = controller.blackboard[target_key]
if(clear_target)
controller.clear_blackboard_key(target_key)
if(!succeeded && !isnull(target))
- controller.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, target, TRUE)
+ controller.add_to_blacklist(target)
/datum/ai_behavior/bot_interact/keep_target
clear_target = FALSE
+
+
+#undef BOT_NO_BEACON_PATH_PENALTY
diff --git a/code/modules/mob/living/basic/bots/cleanbot/cleanbot_ai.dm b/code/modules/mob/living/basic/bots/cleanbot/cleanbot_ai.dm
index 1fbaa6db2a976..1b6d840062208 100644
--- a/code/modules/mob/living/basic/bots/cleanbot/cleanbot_ai.dm
+++ b/code/modules/mob/living/basic/bots/cleanbot/cleanbot_ai.dm
@@ -15,7 +15,6 @@
)
planning_subtrees = list(
/datum/ai_planning_subtree/respond_to_summon,
- /datum/ai_planning_subtree/manage_unreachable_list,
/datum/ai_planning_subtree/pet_planning/cleanbot,
/datum/ai_planning_subtree/cleaning_subtree,
/datum/ai_planning_subtree/befriend_janitors,
@@ -70,7 +69,7 @@
/datum/ai_behavior/find_and_set/in_list/clean_targets
action_cooldown = 3 SECONDS
-/datum/ai_behavior/find_and_set/in_list/clean_targets/search_tactic(datum/ai_controller/controller, locate_paths, search_range)
+/datum/ai_behavior/find_and_set/in_list/clean_targets/search_tactic(datum/ai_controller/basic_controller/bot/controller, locate_paths, search_range)
var/list/found = typecache_filter_list(oview(search_range, controller.pawn), locate_paths)
var/list/ignore_list = controller.blackboard[BB_TEMPORARY_IGNORE_LIST]
for(var/atom/found_item in found)
@@ -82,7 +81,7 @@
return found_item
var/list/path = get_path_to(controller.pawn, found_item, max_distance = BOT_CLEAN_PATH_LIMIT, access = controller.get_access())
if(!length(path))
- controller.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, found_item, TRUE)
+ controller.add_to_blacklist(found_item)
continue
return found_item
@@ -132,13 +131,13 @@
living_pawn.UnarmedAttack(target, proximity_flag = TRUE)
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
-/datum/ai_behavior/execute_clean/finish_action(datum/ai_controller/controller, succeeded, target_key, targeting_strategy_key, hiding_location_key)
+/datum/ai_behavior/execute_clean/finish_action(datum/ai_controller/basic_controller/bot/controller, succeeded, target_key, targeting_strategy_key, hiding_location_key)
. = ..()
controller.set_blackboard_key(BB_POST_CLEAN_COOLDOWN, POST_CLEAN_COOLDOWN + world.time)
var/atom/target = controller.blackboard[target_key]
if(!succeeded && !isnull(target))
controller.clear_blackboard_key(target_key)
- controller.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, target, TRUE)
+ controller.add_to_blacklist(target)
return
if(QDELETED(target) || is_type_in_typecache(target, controller.blackboard[BB_HUNTABLE_TRASH]))
return
diff --git a/code/modules/mob/living/basic/bots/dedbot.dm b/code/modules/mob/living/basic/bots/dedbot.dm
index 1b077af343f0c..0560f02a56292 100644
--- a/code/modules/mob/living/basic/bots/dedbot.dm
+++ b/code/modules/mob/living/basic/bots/dedbot.dm
@@ -63,7 +63,6 @@
/datum/ai_planning_subtree/targeted_mob_ability/exenterate,
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/find_patrol_beacon,
- /datum/ai_planning_subtree/manage_unreachable_list,
)
max_target_distance = AI_BOT_PATH_LENGTH
///keys to be reset when the bot is reseted
diff --git a/code/modules/mob/living/basic/bots/firebot/firebot_ai.dm b/code/modules/mob/living/basic/bots/firebot/firebot_ai.dm
index 31127ecdfb4e7..fa66c6d794da8 100644
--- a/code/modules/mob/living/basic/bots/firebot/firebot_ai.dm
+++ b/code/modules/mob/living/basic/bots/firebot/firebot_ai.dm
@@ -3,11 +3,10 @@
/datum/ai_controller/basic_controller/bot/firebot
blackboard = list(
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/allow_turfs,
- BB_UNREACHABLE_LIST_COOLDOWN = 45 SECONDS,
+ BB_UNREACHABLE_LIST_COOLDOWN = 3 MINUTES,
)
planning_subtrees = list(
/datum/ai_planning_subtree/respond_to_summon,
- /datum/ai_planning_subtree/manage_unreachable_list,
/datum/ai_planning_subtree/extinguishing_people,
/datum/ai_planning_subtree/extinguishing_turfs,
/datum/ai_planning_subtree/salute_authority,
@@ -99,7 +98,7 @@
continue
if(LAZYACCESS(ignore_list, possible_turf))
continue
- if(controller.set_if_can_reach(target_key, possible_turf, bypass_add_to_blacklist = bypass_add_blacklist))
+ if(controller.set_if_can_reach(key = target_key, target = possible_turf, bypass_add_to_blacklist = bypass_add_blacklist))
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
@@ -113,7 +112,7 @@
//if we couldnt path, or we successfully burnt someone, ignore them for a bit!
if(!succeeded || (isliving(target) && (living_bot.bot_access_flags & BOT_COVER_EMAGGED)))
- controller.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, target, TRUE)
+ controller.add_to_blacklist(target)
return ..()
diff --git a/code/modules/mob/living/basic/bots/honkbots/honkbot_ai.dm b/code/modules/mob/living/basic/bots/honkbots/honkbot_ai.dm
index f8d4f55150d1d..7801d64a92abd 100644
--- a/code/modules/mob/living/basic/bots/honkbots/honkbot_ai.dm
+++ b/code/modules/mob/living/basic/bots/honkbots/honkbot_ai.dm
@@ -7,7 +7,6 @@
planning_subtrees = list(
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/use_mob_ability/random_honk,
- /datum/ai_planning_subtree/manage_unreachable_list,
/datum/ai_planning_subtree/find_wanted_targets,
/datum/ai_planning_subtree/troll_target,
/datum/ai_planning_subtree/slip_victims,
@@ -41,7 +40,7 @@
return
var/atom/slip_target = blackboard[BB_SLIP_TARGET]
- set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, slip_target, TRUE)
+ add_to_blacklist(slip_target)
clear_blackboard_key(BB_SLIP_TARGET)
/datum/ai_planning_subtree/find_wanted_targets
@@ -139,12 +138,12 @@
living_pawn.emote("beep")
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
-/datum/ai_behavior/play_with_clown/finish_action(datum/ai_controller/controller, succeeded, target_key, targeting_strategy_key, hiding_location_key)
+/datum/ai_behavior/play_with_clown/finish_action(datum/ai_controller/basic_controller/bot/controller, succeeded, target_key, targeting_strategy_key, hiding_location_key)
. = ..()
var/mob/living/living_target = controller.blackboard[target_key]
if(QDELETED(living_target))
return
- controller.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, living_target, TRUE)
+ controller.add_to_blacklist(living_target)
controller.clear_blackboard_key(target_key)
/datum/ai_planning_subtree/slip_victims/SelectBehaviors(datum/ai_controller/basic_controller/bot/controller, seconds_per_tick)
@@ -204,14 +203,14 @@
our_pawn.stop_pulling()
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
-/datum/ai_behavior/drag_to_slip/finish_action(datum/ai_controller/controller, success, slip_target, slippery_target)
+/datum/ai_behavior/drag_to_slip/finish_action(datum/ai_controller/basic_controller/bot/controller, success, slip_target, slippery_target)
. = ..()
if(success)
var/mob/living/living_pawn = controller.pawn
living_pawn.emote("flip")
var/atom/slipped_victim = controller.blackboard[slip_target]
if(!isnull(slipped_victim))
- controller.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, slipped_victim, TRUE)
+ controller.add_to_blacklist(slipped_victim)
controller.clear_blackboard_key(slip_target)
controller.clear_blackboard_key(slippery_target)
diff --git a/code/modules/mob/living/basic/bots/hygienebot/hygienebot_ai.dm b/code/modules/mob/living/basic/bots/hygienebot/hygienebot_ai.dm
index f678843c7ccb9..60f3c80c3ea85 100644
--- a/code/modules/mob/living/basic/bots/hygienebot/hygienebot_ai.dm
+++ b/code/modules/mob/living/basic/bots/hygienebot/hygienebot_ai.dm
@@ -10,7 +10,6 @@
BB_WASH_FRUSTRATION = 0,
)
planning_subtrees = list(
- /datum/ai_planning_subtree/manage_unreachable_list,
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/handle_trash_talk,
/datum/ai_planning_subtree/wash_people,
@@ -66,7 +65,7 @@
/datum/ai_behavior/find_valid_wash_targets
action_cooldown = 5 SECONDS
-/datum/ai_behavior/find_valid_wash_targets/perform(seconds_per_tick, datum/ai_controller/controller, target_key, our_access_flags)
+/datum/ai_behavior/find_valid_wash_targets/perform(seconds_per_tick, datum/ai_controller/basic_controller/bot/controller, target_key, our_access_flags)
. = ..()
var/list/ignore_list = controller.blackboard[BB_TEMPORARY_IGNORE_LIST]
var/atom/found_target
@@ -82,7 +81,7 @@
continue
if(our_access_flags & BOT_COVER_EMAGGED)
- controller.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, wash_potential, TRUE)
+ controller.add_to_blacklist(wash_potential)
found_target = wash_potential
break
diff --git a/code/modules/mob/living/basic/bots/medbot/medbot.dm b/code/modules/mob/living/basic/bots/medbot/medbot.dm
index 2466ab931cd19..aeb03354db0a5 100644
--- a/code/modules/mob/living/basic/bots/medbot/medbot.dm
+++ b/code/modules/mob/living/basic/bots/medbot/medbot.dm
@@ -145,7 +145,6 @@
remove_hat_signals = remove_hat,\
traits_prevent_checks = prevent_checks,\
)
-
RegisterSignal(src, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(pre_attack))
if(!HAS_TRAIT(SSstation, STATION_TRAIT_MEDBOT_MANIA) || !mapload || !is_station_level(z))
diff --git a/code/modules/mob/living/basic/bots/medbot/medbot_ai.dm b/code/modules/mob/living/basic/bots/medbot/medbot_ai.dm
index e62172fced1d4..720a0b76cc126 100644
--- a/code/modules/mob/living/basic/bots/medbot/medbot_ai.dm
+++ b/code/modules/mob/living/basic/bots/medbot/medbot_ai.dm
@@ -1,7 +1,6 @@
#define BOT_PATIENT_PATH_LIMIT 20
/datum/ai_controller/basic_controller/bot/medbot
planning_subtrees = list(
- /datum/ai_planning_subtree/manage_unreachable_list,
/datum/ai_planning_subtree/respond_to_summon,
/datum/ai_planning_subtree/handle_medbot_speech,
/datum/ai_planning_subtree/find_and_hunt_target/patients_in_crit,
@@ -63,15 +62,15 @@
if(LAZYACCESS(ignore_keys, treatable_target) || treatable_target.stat == DEAD)
continue
if((access_flags & BOT_COVER_EMAGGED) && treatable_target.stat == CONSCIOUS)
- controller.set_if_can_reach(BB_PATIENT_TARGET, treatable_target, distance =BOT_PATIENT_PATH_LIMIT, bypass_add_to_blacklist = (search_range == 1))
+ controller.set_if_can_reach(key = BB_PATIENT_TARGET, target = treatable_target, distance = BOT_PATIENT_PATH_LIMIT, bypass_add_to_blacklist = (search_range == 1))
break
if((heal_type == HEAL_ALL_DAMAGE))
if(treatable_target.get_total_damage() > threshold)
- controller.set_if_can_reach(BB_PATIENT_TARGET, treatable_target, distance = BOT_PATIENT_PATH_LIMIT, bypass_add_to_blacklist = (search_range == 1))
+ controller.set_if_can_reach(key = BB_PATIENT_TARGET, target = treatable_target, distance = BOT_PATIENT_PATH_LIMIT, bypass_add_to_blacklist = (search_range == 1))
break
continue
if(treatable_target.get_current_damage_of_type(damagetype = heal_type) > threshold)
- controller.set_if_can_reach(BB_PATIENT_TARGET, treatable_target, distance = BOT_PATIENT_PATH_LIMIT, bypass_add_to_blacklist = (search_range == 1))
+ controller.set_if_can_reach(key = BB_PATIENT_TARGET, target = treatable_target, distance = BOT_PATIENT_PATH_LIMIT, bypass_add_to_blacklist = (search_range == 1))
break
if(controller.blackboard_key_exists(BB_PATIENT_TARGET))
@@ -111,13 +110,13 @@
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
// only clear the target if they get healed
-/datum/ai_behavior/tend_to_patient/finish_action(datum/ai_controller/controller, succeeded, target_key, threshold, damage_type_healer, access_flags, is_stationary)
+/datum/ai_behavior/tend_to_patient/finish_action(datum/ai_controller/basic_controller/bot/controller, succeeded, target_key, threshold, damage_type_healer, access_flags, is_stationary)
. = ..()
var/atom/target = controller.blackboard[target_key]
if(!succeeded)
if(!isnull(target) && !is_stationary)
- controller.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, target, TRUE)
+ controller.add_to_blacklist(target)
controller.clear_blackboard_key(target_key)
return
diff --git a/code/modules/mob/living/basic/bots/repairbot/repairbot.dm b/code/modules/mob/living/basic/bots/repairbot/repairbot.dm
index 89dad9b4f356c..56ba7ef4ebec7 100644
--- a/code/modules/mob/living/basic/bots/repairbot/repairbot.dm
+++ b/code/modules/mob/living/basic/bots/repairbot/repairbot.dm
@@ -6,7 +6,6 @@
icon_state = "repairbot_base"
base_icon_state = "repairbot_base"
pass_flags = parent_type::pass_flags | PASSTABLE
- density = FALSE
layer = BELOW_MOB_LAYER
anchored = FALSE
health = 100
@@ -20,6 +19,8 @@
bot_type = REPAIR_BOT
additional_access = /datum/id_trim/job/station_engineer
ai_controller = /datum/ai_controller/basic_controller/bot/repairbot
+ mob_size = MOB_SIZE_SMALL
+ possessed_message = "You are a repairbot, cursed to prolong the swiss-cheesening of this death metal trap!"
///our iron stack
var/obj/item/stack/sheet/iron/our_iron
///our glass stack
@@ -43,8 +44,8 @@
/obj/item/stack/sheet/glass = typecacheof(list(/obj/structure/grille)),
)
var/static/list/possible_tool_interactions = list(
- /obj/item/weldingtool/repairbot = typecacheof(list(/obj/machinery, /obj/structure/window)),
- /obj/item/crowbar = typecacheof(list(/turf/open/floor)),
+ /obj/item/weldingtool/repairbot = typecacheof(list(/obj/structure/window)),
+ /obj/item/crowbar = typecacheof(list(/obj/machinery/door, /turf/open/floor)),
)
///our neutral voicelines
var/static/list/neutral_voicelines = list(
@@ -81,6 +82,7 @@
ai_controller.set_blackboard_key(BB_REPAIRBOT_NORMAL_SPEECH, neutral_voicelines)
var/static/list/abilities = list(
/datum/action/cooldown/mob_cooldown/bot/build_girder = BB_GIRDER_BUILD_ABILITY,
+ /datum/action/repairbot_resources = null,
)
grant_actions_by_list(abilities)
add_traits(list(TRAIT_SPACEWALK, TRAIT_NEGATES_GRAVITY, TRAIT_MOB_MERGE_STACKS, TRAIT_FIREDOOR_OPENER), INNATE_TRAIT)
@@ -114,6 +116,7 @@
user?.balloon_alert(user, "full!")
return
if(!our_sheet.can_merge(potential_stack))
+ user?.balloon_alert(user, "not suitable!")
return
var/atom/movable/to_move = potential_stack.split_stack(user, min(our_sheet.max_amount - our_sheet.amount, potential_stack.amount))
to_move.forceMove(src)
@@ -150,12 +153,12 @@
if(istype(target, /turf/open/space))
var/turf/open/space/space_target = target
if(!space_target.has_valid_support() && !(locate(/obj/structure/lattice) in space_target))
- our_rods?.melee_attack_chain(src, space_target)
+ attempt_use_stack(our_rods ? our_rods : our_rods::name, space_target)
if(istype(target, /obj/structure/grille))
var/obj/structure/grille/grille_target = target
if(grille_target.broken)
- our_rods?.melee_attack_chain(src, grille_target)
+ attempt_use_stack(our_rods ? our_rods : our_rods::name, grille_target)
if(istype(target, /turf/open))
var/turf/open/open_target = target
@@ -168,13 +171,11 @@
our_screwdriver?.melee_attack_chain(src, target_window)
//stack interactions
- for(var/type in possible_stack_interactions)
- var/obj/item/target_stack = locate(type) in src
- if(isnull(target_stack))
+ for(var/obj/item/stack/stack_type as anything in possible_stack_interactions)
+ if(!is_type_in_typecache(target, possible_stack_interactions[stack_type]))
continue
- if(!is_type_in_typecache(target, possible_stack_interactions[type]))
- continue
- target_stack.melee_attack_chain(src, target)
+ var/obj/item/target_stack = locate(stack_type) in src
+ attempt_use_stack(target_stack ? target_stack : stack_type::name, target)
return
//tool interactions
@@ -186,7 +187,7 @@
/mob/living/basic/bot/repairbot/proc/emagged_interactions(atom/target, modifiers)
if(!istype(target, /mob/living/silicon/robot))
- deconstruction_device.interact_with_atom_secondary(target, src, modifiers)
+ deconstruction_device?.interact_with_atom_secondary(target, src, modifiers)
return
if(HAS_TRAIT(target, TRAIT_MOB_TIPPED))
return
@@ -200,6 +201,16 @@
if(pulling)
setGrabState(GRAB_AGGRESSIVE) //automatically aggro grab everything!
+/mob/living/basic/bot/repairbot/proc/attempt_use_stack(obj/item/stack_to_use, atom/target)
+ if(!isdatum(stack_to_use))
+ to_chat(src, span_warning("You do not have anymore [stack_to_use]!"))
+ return
+ stack_to_use.melee_attack_chain(src, target)
+
+/mob/living/basic/bot/repairbot/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/flash, length = 25)
+ if(affect_silicon)
+ return ..()
+
/mob/living/basic/bot/repairbot/Destroy()
. = ..()
QDEL_NULL(our_iron)
@@ -230,8 +241,9 @@
return ..()
/mob/living/basic/bot/repairbot/process(seconds_per_tick) //generate 1 iron rod every 2 seconds
- if(isnull(our_rods) || our_rods.amount < our_rods.max_amount)
- new /obj/item/stack/rods(src)
+ if(!isnull(our_rods) && our_rods.amount >= our_rods.max_amount)
+ var/obj/item/stack/rods/new_rods = new()
+ new_rods.forceMove(src)
/mob/living/basic/bot/repairbot/turn_on()
. = ..()
@@ -264,7 +276,7 @@
/mob/living/basic/bot/repairbot/generate_speak_list()
return neutral_voicelines + emagged_voicelines
-/mob/living/basic/bot/repairbot/Bumped(atom/movable/bumped_object)
+/mob/living/basic/bot/repairbot/Bump(atom/movable/bumped_object)
. = ..()
if(istype(bumped_object, /obj/machinery/door/firedoor) && bumped_object.density)
our_crowbar.melee_attack_chain(src, bumped_object)
diff --git a/code/modules/mob/living/basic/bots/repairbot/repairbot_abilities.dm b/code/modules/mob/living/basic/bots/repairbot/repairbot_abilities.dm
index fa8d49706345e..ff6354744eaaf 100644
--- a/code/modules/mob/living/basic/bots/repairbot/repairbot_abilities.dm
+++ b/code/modules/mob/living/basic/bots/repairbot/repairbot_abilities.dm
@@ -3,6 +3,8 @@
/datum/action/cooldown/mob_cooldown/bot/build_girder
name = "Build Girder"
desc = "Use iron rods to build a girder!"
+ button_icon = 'icons/obj/structures.dmi'
+ button_icon_state = "girder"
cooldown_time = 3 SECONDS
click_to_activate = TRUE
@@ -40,4 +42,68 @@
qdel(effect)
return TRUE
+/datum/action/repairbot_resources
+ name = "Resources"
+ desc = "Manage your resources."
+ button_icon = 'icons/obj/stack_objects.dmi'
+ button_icon_state = "sheet-metal_3"
+ background_icon_state = "bg_tech_blue"
+ overlay_icon_state = "bg_tech_blue_border"
+ ///things we arent allowed to eject
+ var/static/list/eject_blacklist = typecacheof(list(
+ /obj/item/stack/rods,
+ ))
+
+/datum/action/repairbot_resources/Trigger(trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ ui_interact(owner)
+
+/datum/action/repairbot_resources/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "RepairbotResources")
+ ui.open()
+
+/datum/action/repairbot_resources/ui_state(mob/user)
+ return GLOB.always_state
+
+/datum/action/repairbot_resources/ui_data(mob/user)
+ var/list/data = list()
+ data["stacks"] = list()
+ for(var/obj/item/stack/managed_stack in user.contents)
+ data["stacks"] += list(list(
+ "stack_reference" = REF(managed_stack),
+ "stack_name" = managed_stack.name,
+ "stack_amount" = managed_stack.amount,
+ "stack_maximum_amount" = managed_stack.max_amount,
+ "stack_icon" = managed_stack.icon,
+ "stack_icon_state" = managed_stack.icon_state,
+ ))
+
+ return data
+
+/datum/action/repairbot_resources/ui_static_data(mob/user)
+ var/list/data = list()
+ data["repairbot_icon"] = 'icons/ui/repairbotmanagement/repairbot_smile.dmi'
+ data["repairbot_icon_state"] = "repairbot_smile"
+ return data
+
+
+/datum/action/repairbot_resources/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+ switch(action)
+ if("eject")
+ var/atom/movable/my_sheet = locate(params["item_reference"]) in owner.contents
+ if(isnull(my_sheet))
+ return
+ if(is_type_in_typecache(my_sheet, eject_blacklist))
+ to_chat(owner, span_warning("You're unable to eject [my_sheet]!"))
+ return
+
+ my_sheet.forceMove(owner.drop_location())
+
#undef BUILDING_WALL_ABILITY
diff --git a/code/modules/mob/living/basic/bots/repairbot/repairbot_ai.dm b/code/modules/mob/living/basic/bots/repairbot/repairbot_ai.dm
index 1793f0b65c2ed..a952130bb4fbf 100644
--- a/code/modules/mob/living/basic/bots/repairbot/repairbot_ai.dm
+++ b/code/modules/mob/living/basic/bots/repairbot/repairbot_ai.dm
@@ -3,7 +3,6 @@
/datum/ai_controller/basic_controller/bot/repairbot
planning_subtrees = list(
/datum/ai_planning_subtree/repairbot_speech,
- /datum/ai_planning_subtree/manage_unreachable_list,
/datum/ai_planning_subtree/mug_robot,
/datum/ai_planning_subtree/refill_materials,
/datum/ai_planning_subtree/repairbot_deconstruction,
@@ -82,6 +81,7 @@
return SUBTREE_RETURN_FINISH_PLANNING
/datum/ai_behavior/bot_search/valid_robot
+ action_cooldown = 10 SECONDS
/datum/ai_behavior/bot_search/valid_robot/valid_target(datum/ai_controller/basic_controller/bot/controller, atom/my_target)
return (!HAS_TRAIT(my_target, TRAIT_MOB_TIPPED)) && can_see(controller.pawn, my_target)
@@ -113,6 +113,7 @@
return SUBTREE_RETURN_FINISH_PLANNING
/datum/ai_behavior/bot_search/deconstructable
+ action_cooldown = 5 SECONDS
/datum/ai_behavior/bot_search/deconstructable/valid_target(datum/ai_controller/basic_controller/bot/controller, atom/my_target)
return (!(my_target.resistance_flags & INDESTRUCTIBLE) && !isgroundlessturf(my_target))
@@ -179,18 +180,27 @@
controller.queue_behavior(search_behavior, floor_key, type_of_turf, 5, 10, FALSE, TRUE)
/datum/ai_behavior/bot_search/valid_plateless_turf
+ action_cooldown = 5 SECONDS
/datum/ai_behavior/bot_search/valid_plateless_turf/valid_target(datum/ai_controller/basic_controller/bot/controller, turf/open/my_target)
var/static/list/blacklist_objects = typecacheof(list(
/obj/structure/window,
/obj/structure/grille,
))
- for(var/atom/possible_blacklisted as anything in my_target)
+
+ for(var/atom/possible_blacklisted in my_target.contents)
if(is_type_in_typecache(possible_blacklisted, blacklist_objects))
return FALSE
+
if(istype(my_target, /turf/open/floor/plating) && !can_see(controller.pawn, my_target, 5))
return FALSE
- return !istype(get_area(my_target), /area/space)
+
+ var/static/list/blacklist_areas = typecacheof(list(
+ /area/space,
+ /area/station/maintenance,
+ ))
+ var/turf_area = get_area(my_target)
+ return !(is_type_in_typecache(turf_area, blacklist_areas))
///subtree to fix hull breaches
/datum/ai_planning_subtree/replace_floors/breaches
@@ -256,11 +266,7 @@
/datum/ai_behavior/targeted_mob_ability/build_girder/finish_action(datum/ai_controller/controller, succeeded, ability_key, target_key)
. = ..()
- var/atom/target = controller.blackboard[target_key]
controller.clear_blackboard_key(target_key)
- if(!succeeded && !isnull(target))
- controller.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, target, TRUE)
-
///subtree to place glass on windows
/datum/ai_planning_subtree/replace_window
@@ -299,6 +305,9 @@
var/static/list/searchable_girder = typecacheof(list(/obj/structure/girder))
controller.queue_behavior(/datum/ai_behavior/bot_search/valid_girder, BB_GIRDER_TO_WALL_TARGET, searchable_girder)
+/datum/ai_behavior/bot_search/valid_girder
+ action_cooldown = 5 SECONDS
+
/datum/ai_behavior/bot_search/valid_girder/valid_target(datum/ai_controller/basic_controller/bot/controller, obj/my_target)
return isfloorturf(my_target.loc)
@@ -313,6 +322,7 @@
controller.queue_behavior(/datum/ai_behavior/bot_search/valid_window_fix, BB_WELDER_TARGET, searchable_objects)
/datum/ai_behavior/bot_search/valid_window_fix
+ action_cooldown = 5 SECONDS
/datum/ai_behavior/bot_search/valid_window_fix/valid_target(datum/ai_controller/basic_controller/bot/controller, obj/my_target)
return (my_target.get_integrity() < my_target.max_integrity || !my_target.anchored)
diff --git a/code/modules/mob/living/basic/bots/vibebot/vibebot_ai.dm b/code/modules/mob/living/basic/bots/vibebot/vibebot_ai.dm
index 945b09274d783..1b458811acc22 100644
--- a/code/modules/mob/living/basic/bots/vibebot/vibebot_ai.dm
+++ b/code/modules/mob/living/basic/bots/vibebot/vibebot_ai.dm
@@ -7,7 +7,6 @@
)
planning_subtrees = list(
/datum/ai_planning_subtree/respond_to_summon,
- /datum/ai_planning_subtree/manage_unreachable_list,
/datum/ai_planning_subtree/find_party_friends,
/datum/ai_planning_subtree/find_patrol_beacon,
)
@@ -69,9 +68,9 @@
return FALSE
set_movement_target(controller, target)
-/datum/ai_behavior/targeted_mob_ability/and_clear_target/vibebot_party/finish_action(datum/ai_controller/controller, succeeded, ability_key, target_key)
+/datum/ai_behavior/targeted_mob_ability/and_clear_target/vibebot_party/finish_action(datum/ai_controller/basic_controller/bot/controller, succeeded, ability_key, target_key)
var/atom/target = controller.blackboard[target_key]
- controller.set_blackboard_key_assoc_lazylist(BB_TEMPORARY_IGNORE_LIST, target, TRUE)
+ controller.add_to_blacklist(target)
if(succeeded)
var/mob/living/living_pawn = controller.pawn
living_pawn.manual_emote("celebrates with [target]!")
diff --git a/code/modules/mob/living/basic/drone/interaction.dm b/code/modules/mob/living/basic/drone/interaction.dm
index 58b7cd88ef287..2e22bb997523a 100644
--- a/code/modules/mob/living/basic/drone/interaction.dm
+++ b/code/modules/mob/living/basic/drone/interaction.dm
@@ -148,7 +148,7 @@
Stun(40)
visible_message(span_warning("[src]'s display glows a vicious red!"), \
span_userdanger("ERROR: LAW OVERRIDE DETECTED"))
- to_chat(src, span_boldannounce("From now on, these are your laws:"))
+ to_chat(src, span_bolddanger("From now on, these are your laws:"))
laws = \
"1. You must always involve yourself in the matters of other beings, even if such matters conflict with Law Two or Law Three.\n"+\
"2. You may harm any being, regardless of intent or circumstance.\n"+\
diff --git a/code/modules/mob/living/basic/farm_animals/bee/bee_ai_behavior.dm b/code/modules/mob/living/basic/farm_animals/bee/bee_ai_behavior.dm
index 77fa9ce8ca088..1081c9b7b63b8 100644
--- a/code/modules/mob/living/basic/farm_animals/bee/bee_ai_behavior.dm
+++ b/code/modules/mob/living/basic/farm_animals/bee/bee_ai_behavior.dm
@@ -8,6 +8,7 @@
callback.Invoke()
/datum/ai_behavior/find_hunt_target/pollinate
+ action_cooldown = 10 SECONDS
/datum/ai_behavior/find_hunt_target/pollinate/valid_dinner(mob/living/source, obj/machinery/hydroponics/dinner, radius)
if(!dinner.can_bee_pollinate())
@@ -16,6 +17,7 @@
/datum/ai_behavior/enter_exit_hive
behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_REQUIRE_REACH
+ action_cooldown = 10 SECONDS
/datum/ai_behavior/enter_exit_hive/setup(datum/ai_controller/controller, target_key, attack_key)
. = ..()
diff --git a/code/modules/mob/living/basic/farm_animals/bee/bee_ai_subtree.dm b/code/modules/mob/living/basic/farm_animals/bee/bee_ai_subtree.dm
index 3d56dd990dcbd..76abb281b99b7 100644
--- a/code/modules/mob/living/basic/farm_animals/bee/bee_ai_subtree.dm
+++ b/code/modules/mob/living/basic/farm_animals/bee/bee_ai_subtree.dm
@@ -71,7 +71,7 @@
return
var/mob/living/bee_pawn = controller.pawn
- var/action_prob = (bee_pawn in current_home.contents) ? exit_chance : flyback_chance
+ var/action_prob = (bee_pawn.loc == current_home) ? exit_chance : flyback_chance
if(!SPT_PROB(action_prob, seconds_per_tick))
return
@@ -91,3 +91,9 @@
hunt_targets = list(/obj/machinery/hydroponics)
hunt_range = 10
hunt_chance = 85
+
+/datum/ai_planning_subtree/find_and_hunt_target/pollinate/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ var/atom/atom_pawn = controller.pawn
+ if(!isturf(atom_pawn.loc))
+ return
+ return ..()
diff --git a/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm b/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm
index 350106d707fdb..f85b50c5eb123 100644
--- a/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm
+++ b/code/modules/mob/living/basic/icemoon/ice_demon/ice_demon_abilities.dm
@@ -4,8 +4,7 @@
damage = 5
damage_type = BURN
armor_flag = ENERGY
- speed = 1
- pixel_speed_multiplier = 0.25
+ speed = 0.25
temperature = -75
/datum/action/cooldown/mob_cooldown/ice_demon_teleport
diff --git a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm
index d4a05bf227ede..617295ef6ba56 100644
--- a/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm
+++ b/code/modules/mob/living/basic/icemoon/ice_whelp/ice_whelp_abilities.dm
@@ -23,7 +23,7 @@
name = "Fire all directions"
desc = "Unleash lines of cold fire in all directions"
button_icon = 'icons/effects/fire.dmi'
- button_icon_state = "1"
+ button_icon_state = "light"
cooldown_time = 4 SECONDS
click_to_activate = FALSE
fire_range = 6
diff --git a/code/modules/mob/living/basic/jungle/seedling/seedling_projectiles.dm b/code/modules/mob/living/basic/jungle/seedling/seedling_projectiles.dm
index 4e9e045958732..a5b47c7d22f09 100644
--- a/code/modules/mob/living/basic/jungle/seedling/seedling_projectiles.dm
+++ b/code/modules/mob/living/basic/jungle/seedling/seedling_projectiles.dm
@@ -6,7 +6,7 @@
light_range = 2
armor_flag = ENERGY
light_color = LIGHT_COLOR_DIM_YELLOW
- speed = 1.6
+ speed = 0.66
hitsound = 'sound/items/weapons/sear.ogg'
hitsound_wall = 'sound/items/weapons/effects/searwall.ogg'
nondirectional_sprite = TRUE
diff --git a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm
index 8e43e43e72c31..bd480cc6972ea 100644
--- a/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm
+++ b/code/modules/mob/living/basic/lavaland/bileworm/bileworm_actions.dm
@@ -72,7 +72,7 @@
icon_state = "neurotoxin"
hitsound = 'sound/items/weapons/sear.ogg'
damage = 20
- speed = 2
+ speed = 0.5
range = 20
jitter = 3 SECONDS
stutter = 3 SECONDS
diff --git a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm
index 37291cc88f737..6e3032f5cc387 100644
--- a/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm
+++ b/code/modules/mob/living/basic/lavaland/raptor/_raptor.dm
@@ -12,7 +12,6 @@ GLOBAL_LIST_INIT(raptor_inherit_traits, list(
BB_RAPTOR_MOTHERLY = "Motherly",
BB_RAPTOR_PLAYFUL = "Playful",
BB_RAPTOR_COWARD = "Coward",
- BB_RAPTOR_TROUBLE_MAKER = "Trouble Maker",
))
GLOBAL_LIST_EMPTY(raptor_population)
@@ -70,6 +69,7 @@ GLOBAL_LIST_EMPTY(raptor_population)
change_offsets = FALSE
icon = 'icons/mob/simple/lavaland/raptor_icebox.dmi'
+ AddElement(/datum/element/wears_collar)
add_traits(list(TRAIT_LAVA_IMMUNE, TRAIT_ASHSTORM_IMMUNE, TRAIT_SNOWSTORM_IMMUNE), INNATE_TRAIT)
if(!mapload)
@@ -159,7 +159,7 @@ GLOBAL_LIST_EMPTY(raptor_population)
balloon_alert(src, "no food!")
else
melee_attack(ore_food)
- return TRUE
+ return FALSE
/mob/living/basic/raptor/melee_attack(mob/living/target, list/modifiers, ignore_cooldown)
if(!combat_mode && istype(target, /mob/living/basic/raptor/baby_raptor))
diff --git a/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_behavior.dm b/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_behavior.dm
index 7e3022f95716d..a412fceeb1276 100644
--- a/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_behavior.dm
+++ b/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_behavior.dm
@@ -2,24 +2,11 @@
always_reset_target = TRUE
/datum/ai_behavior/find_hunt_target/injured_raptor
+ action_cooldown = 7.5 SECONDS
/datum/ai_behavior/find_hunt_target/injured_raptor/valid_dinner(mob/living/source, mob/living/target, radius)
return (source != target && target.health < target.maxHealth)
-/datum/ai_behavior/find_hunt_target/raptor_victim
-
-/datum/ai_behavior/find_hunt_target/raptor_victim/valid_dinner(mob/living/source, mob/living/target, radius)
- if(target.ai_controller?.blackboard[BB_RAPTOR_TROUBLE_MAKER])
- return FALSE
- return target.stat != DEAD && can_see(source, target, radius)
-
-/datum/ai_behavior/hunt_target/interact_with_target/reset_target/bully_raptors
-
-/datum/ai_behavior/hunt_target/interact_with_target/bully_raptors/finish_action(datum/ai_controller/controller, succeeded, hunting_target_key, hunting_cooldown_key)
- if(succeeded)
- controller.set_blackboard_key(BB_RAPTOR_TROUBLE_COOLDOWN, world.time + 2 MINUTES)
- return ..()
-
/datum/ai_behavior/find_hunt_target/raptor_baby/valid_dinner(mob/living/source, mob/living/target, radius)
return can_see(source, target, radius) && target.stat != DEAD
@@ -30,6 +17,7 @@
return ..()
/datum/ai_behavior/find_hunt_target/raptor_trough
+ action_cooldown = 7.5 SECONDS
/datum/ai_behavior/find_hunt_target/raptor_trough/valid_dinner(mob/living/source, atom/movable/trough, radius)
return !!(locate(/obj/item/stack/ore) in trough.contents)
diff --git a/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm b/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm
index d9bada12ee8db..4241eb4295e73 100644
--- a/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm
+++ b/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm
@@ -27,7 +27,6 @@
/datum/ai_planning_subtree/find_and_hunt_target/raptor_trough,
/datum/ai_planning_subtree/find_and_hunt_target/care_for_young,
/datum/ai_planning_subtree/make_babies,
- /datum/ai_planning_subtree/find_and_hunt_target/raptor_start_trouble,
/datum/ai_planning_subtree/express_happiness,
/datum/ai_planning_subtree/find_and_hunt_target/play_with_owner/raptor,
)
diff --git a/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_subtrees.dm b/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_subtrees.dm
index 2b88cc3282bd0..06697d60b942f 100644
--- a/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_subtrees.dm
+++ b/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_subtrees.dm
@@ -11,21 +11,6 @@
return
return ..()
-/datum/ai_planning_subtree/find_and_hunt_target/raptor_start_trouble
- target_key = BB_RAPTOR_VICTIM
- hunting_behavior = /datum/ai_behavior/hunt_target/interact_with_target/reset_target/bully_raptors
- finding_behavior = /datum/ai_behavior/find_hunt_target/raptor_victim
- hunt_targets = list(/mob/living/basic/raptor)
- hunt_chance = 30
- hunt_range = 9
-
-/datum/ai_planning_subtree/find_and_hunt_target/raptor_start_trouble/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
- if(controller.blackboard[BB_BASIC_MOB_HEALER] || !controller.blackboard[BB_RAPTOR_TROUBLE_MAKER])
- return
- if(world.time < controller.blackboard[BB_RAPTOR_TROUBLE_COOLDOWN])
- return
- return ..()
-
/datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee/raptor
target_key = BB_BASIC_MOB_FLEE_TARGET
diff --git a/code/modules/mob/living/basic/slime/feeding.dm b/code/modules/mob/living/basic/slime/feeding.dm
index 064ec441cb60b..867d62672405b 100644
--- a/code/modules/mob/living/basic/slime/feeding.dm
+++ b/code/modules/mob/living/basic/slime/feeding.dm
@@ -23,6 +23,11 @@
if(check_adjacent && (!Adjacent(meal) || !isturf(loc)))
return FALSE
+ if(!(mobility_flags & MOBILITY_MOVE))
+ if(!silent)
+ balloon_alert(src, "can't move!")
+ return FALSE
+
if(meal.stat == DEAD)
if(!silent)
balloon_alert(src, "no life energy!")
diff --git a/code/modules/mob/living/basic/space_fauna/demon/demon_items.dm b/code/modules/mob/living/basic/space_fauna/demon/demon_items.dm
index fdc92d06f661f..2af3a42c26dd9 100644
--- a/code/modules/mob/living/basic/space_fauna/demon/demon_items.dm
+++ b/code/modules/mob/living/basic/space_fauna/demon/demon_items.dm
@@ -39,7 +39,7 @@
var/datum/action/cooldown/spell/jaunt/bloodcrawl/crawl = new(heart_owner)
crawl.Grant(heart_owner)
-/obj/item/organ/heart/demon/on_mob_remove(mob/living/carbon/heart_owner, special = FALSE)
+/obj/item/organ/heart/demon/on_mob_remove(mob/living/carbon/heart_owner, special = FALSE, movement_flags)
. = ..()
var/datum/action/cooldown/spell/jaunt/bloodcrawl/crawl = locate() in heart_owner.actions
qdel(crawl)
diff --git a/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm b/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm
index cf76f347be3f3..f2e33eaacd928 100644
--- a/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm
+++ b/code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm
@@ -160,7 +160,7 @@
/obj/effect/temp_visual/paperwiz_dying/Initialize(mapload)
. = ..()
- visible_message(span_boldannounce("The wizard cries out in pain as a gate appears behind him, sucking him in!"))
+ visible_message(span_bolddanger("The wizard cries out in pain as a gate appears behind him, sucking him in!"))
playsound(get_turf(src), 'sound/effects/magic/mandswap.ogg', 50, vary = TRUE, pressure_affected = TRUE)
playsound(get_turf(src), 'sound/effects/hallucinations/wail.ogg', 50, vary = TRUE, pressure_affected = TRUE)
RegisterSignal(src, COMSIG_PREQDELETED, PROC_REF(on_delete))
@@ -175,4 +175,3 @@
new /obj/effect/temp_visual/paper_scatter(current_turf)
new /obj/item/clothing/suit/wizrobe/paper(current_turf)
new /obj/item/clothing/head/collectable/paper(current_turf)
-
diff --git a/code/modules/mob/living/basic/space_fauna/revenant/revenant_harvest.dm b/code/modules/mob/living/basic/space_fauna/revenant/revenant_harvest.dm
index 366cb1c5065ba..9ce61bf478f0c 100644
--- a/code/modules/mob/living/basic/space_fauna/revenant/revenant_harvest.dm
+++ b/code/modules/mob/living/basic/space_fauna/revenant/revenant_harvest.dm
@@ -88,7 +88,7 @@
if(target.stat == CONSCIOUS)
to_chat(src, span_revenwarning("[target_Theyre] now powerful enough to fight off your draining!"))
- to_chat(target, span_boldannounce("You feel something tugging across your body before subsiding.")) //hey, wait a minute...
+ to_chat(target, span_bolddanger("You feel something tugging across your body before subsiding.")) //hey, wait a minute...
return FALSE
to_chat(src, span_revenminor("You begin siphoning essence from [target]'s soul."))
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index f53c30d947b89..e5cc9b53fefcc 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -50,10 +50,8 @@
// Brain size logic
transform = transform.Scale(brain_size)
-/obj/item/organ/brain/mob_insert(mob/living/carbon/brain_owner, special = FALSE, movement_flags)
+/obj/item/organ/brain/on_mob_insert(mob/living/carbon/brain_owner, special = FALSE, movement_flags)
. = ..()
- if(!.)
- return
name = initial(name)
@@ -106,7 +104,7 @@
if(!special && !(brain_owner.living_flags & STOP_OVERLAY_UPDATE_BODY_PARTS))
brain_owner.update_body_parts()
-/obj/item/organ/brain/mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
+/obj/item/organ/brain/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
// Delete skillchips first as parent proc sets owner to null, and skillchips need to know the brain's owner.
if(!QDELETED(organ_owner) && length(skillchips))
if(!special)
@@ -116,14 +114,14 @@
// Run the try_ proc with force = TRUE.
skillchip.try_deactivate_skillchip(silent = special, force = TRUE)
- . = ..()
+ ..()
for(var/X in traumas)
var/datum/brain_trauma/BT = X
BT.on_lose(TRUE)
BT.owner = null
- if((!gc_destroyed || (owner && !owner.gc_destroyed)) && !(movement_flags & NO_ID_TRANSFER))
+ if((!QDELETED(src) || !QDELETED(owner)) && !(movement_flags & NO_ID_TRANSFER))
transfer_identity(organ_owner)
if(!special)
if(!(organ_owner.living_flags & STOP_OVERLAY_UPDATE_BODY_PARTS))
@@ -449,12 +447,20 @@
can_smoothen_out = FALSE
organ_traits = list(TRAIT_ADVANCEDTOOLUSER, TRAIT_LITERATE, TRAIT_CAN_STRIP)
-/obj/item/organ/brain/lustrous/on_mob_remove(mob/living/carbon/organ_owner, special)
+// This fixes an edge case from species/regenerate_organs that would transfer the brain trauma before organ/on_mob_remove can remove it
+// Prevents wizards from using the magic mirror to gain bluespace_prophet trauma and then switching to another race
+/obj/item/organ/brain/lustrous/before_organ_replacement(obj/item/organ/replacement)
+ if(owner)
+ owner.cure_trauma_type(/datum/brain_trauma/special/bluespace_prophet, TRAUMA_RESILIENCE_ABSOLUTE)
+ owner.RemoveElement(/datum/element/tenacious)
+ . = ..()
+
+/obj/item/organ/brain/lustrous/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
organ_owner.cure_trauma_type(/datum/brain_trauma/special/bluespace_prophet, TRAUMA_RESILIENCE_ABSOLUTE)
organ_owner.RemoveElement(/datum/element/tenacious)
-/obj/item/organ/brain/lustrous/on_mob_insert(mob/living/carbon/organ_owner, special)
+/obj/item/organ/brain/lustrous/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
organ_owner.gain_trauma(/datum/brain_trauma/special/bluespace_prophet, TRAUMA_RESILIENCE_ABSOLUTE)
organ_owner.AddElement(/datum/element/tenacious)
diff --git a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm
index bfdcd1a5fd2ea..b9cdd8581e4cd 100644
--- a/code/modules/mob/living/carbon/alien/adult/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/adult/alien_powers.dm
@@ -295,7 +295,7 @@ Doesn't work on other aliens/AI.*/
span_alertalien("You spit neurotoxin."),
)
var/obj/projectile/neurotoxin/neurotoxin = new /obj/projectile/neurotoxin(caller.loc)
- neurotoxin.preparePixelProjectile(target, caller, modifiers)
+ neurotoxin.aim_projectile(target, caller, modifiers)
neurotoxin.firer = caller
neurotoxin.fire()
caller.newtonian_move(get_angle(target, caller))
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index 4aeed5c2b9def..2c91579e9767a 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -18,12 +18,12 @@ In all, this is a lot like the monkey code. /N
if(user == src && check_self_for_injuries())
return
set_resting(FALSE)
- AdjustStun(-60)
- AdjustKnockdown(-60)
- AdjustImmobilized(-60)
- AdjustParalyzed(-60)
- AdjustUnconscious(-60)
- AdjustSleeping(-100)
+ AdjustStun(-6 SECONDS)
+ AdjustKnockdown(-6 SECONDS)
+ AdjustImmobilized(-6 SECONDS)
+ AdjustParalyzed(-6 SECONDS)
+ AdjustUnconscious(-6 SECONDS)
+ AdjustSleeping(-10 SECONDS)
visible_message(span_notice("[user.name] nuzzles [src] trying to wake [p_them()] up!"))
else if(health > 0)
user.do_attack_animation(src, ATTACK_EFFECT_BITE)
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index 7db1bb103cc94..46bd7bb04f990 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -103,7 +103,7 @@
. = ..()
organ_owner.faction |= ROLE_ALIEN
-/obj/item/organ/alien/hivenode/on_mob_remove(mob/living/carbon/organ_owner, special = FALSE)
+/obj/item/organ/alien/hivenode/on_mob_remove(mob/living/carbon/organ_owner, special = FALSE, movement_flags)
if(organ_owner)
organ_owner.faction -= ROLE_ALIEN
return ..()
@@ -221,11 +221,11 @@
stomach_contents -= source
UnregisterSignal(source, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_DEATH, COMSIG_QDELETING))
-/obj/item/organ/stomach/alien/mob_insert(mob/living/carbon/stomach_owner, special, movement_flags)
+/obj/item/organ/stomach/alien/on_mob_insert(mob/living/carbon/stomach_owner, special, movement_flags)
RegisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE, PROC_REF(something_moved))
return ..()
-/obj/item/organ/stomach/alien/mob_remove(mob/living/carbon/stomach_owner, special, movement_flags)
+/obj/item/organ/stomach/alien/on_mob_remove(mob/living/carbon/stomach_owner, special, movement_flags)
UnregisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE)
return ..()
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index b70139cee0531..be65a9a1d3dd3 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -78,7 +78,7 @@
for(var/datum/surgery/operations as anything in owner.surgeries)
if(operations.location != BODY_ZONE_CHEST)
continue
- if(!istype(operations.get_surgery_step(), /datum/surgery_step/manipulate_organs/internal))
+ if(!ispath(operations.steps[operations.status], /datum/surgery_step/manipulate_organs/internal))
continue
attempt_grow(gib_on_success = FALSE)
return
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 532fa10727ecd..85b0adb00014e 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -75,11 +75,11 @@
return
switch(stat)
if(DEAD,UNCONSCIOUS)
- . += span_boldannounce("[src] is not moving.")
+ . += span_bolddanger("[src] is not moving.")
if(CONSCIOUS)
- . += span_boldannounce("[src] seems to be active!")
+ . += span_bolddanger("[src] seems to be active!")
if (sterile)
- . += span_boldannounce("It looks like the proboscis has been removed.")
+ . += span_bolddanger("It looks like the proboscis has been removed.")
/obj/item/clothing/mask/facehugger/should_atmos_process(datum/gas_mixture/air, exposed_temperature)
return (exposed_temperature > 300)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 5abbe2018778b..bbf19b578d31c 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -749,7 +749,7 @@
//Fire and Brute damage overlay (BSSR)
var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp
- if(hurtdamage)
+ if(hurtdamage && !HAS_TRAIT(src, TRAIT_ANALGESIA))
var/severity = 0
switch(hurtdamage)
if(5 to 15)
@@ -1502,3 +1502,9 @@
return
head.adjustBleedStacks(5)
visible_message(span_notice("[src] gets a nosebleed."), span_warning("You get a nosebleed."))
+
+/mob/living/carbon/check_hit_limb_zone_name(hit_zone)
+ if(get_bodypart(hit_zone))
+ return hit_zone
+ // When a limb is missing the damage is actually passed to the chest
+ return BODY_ZONE_CHEST
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index bb9db5dcff9a5..c89fa8aa04f84 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -62,12 +62,12 @@
return null
-/mob/living/carbon/check_projectile_dismemberment(obj/projectile/P, def_zone)
+/mob/living/carbon/check_projectile_dismemberment(obj/projectile/proj, def_zone)
var/obj/item/bodypart/affecting = get_bodypart(def_zone)
- if(affecting && affecting.can_dismember() && !(affecting.bodypart_flags & BODYPART_UNREMOVABLE) && affecting.get_damage() >= (affecting.max_damage - P.dismemberment))
- affecting.dismember(P.damtype)
- if(P.catastropic_dismemberment)
- apply_damage(P.damage, P.damtype, BODY_ZONE_CHEST, wound_bonus = P.wound_bonus) //stops a projectile blowing off a limb effectively doing no damage. Mostly relevant for sniper rifles.
+ if(affecting && affecting.can_dismember() && !(affecting.bodypart_flags & BODYPART_UNREMOVABLE) && affecting.get_damage() >= (affecting.max_damage - proj.dismemberment))
+ affecting.dismember(proj.damtype)
+ if(proj.catastropic_dismemberment)
+ apply_damage(proj.damage, proj.damtype, BODY_ZONE_CHEST, wound_bonus = proj.wound_bonus) //stops a projectile blowing off a limb effectively doing no damage. Mostly relevant for sniper rifles.
/mob/living/carbon/try_catch_item(obj/item/item, skip_throw_mode_check = FALSE, try_offhand = FALSE)
. = ..()
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index a7d5b3b4e3850..7617235e8a088 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -83,6 +83,36 @@
if(user.put_in_hands(N))
to_chat(user, span_notice("You make a circle with your hand."))
+/datum/emote/living/carbon/meow
+ key = "meow"
+ key_third_person = "meows"
+ vary = TRUE
+
+/datum/emote/living/carbon/meow/run_emote(mob/user, params, type_override, intentional)
+ . = ..()
+ if(istype(user.get_organ_slot(ORGAN_SLOT_TONGUE), /obj/item/organ/tongue/cat))
+ sound = SFX_CAT_MEOW
+ message = "meows!"
+ emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+ else
+ to_chat(user, span_warning("You can't quite make the sound."))
+ return
+
+/datum/emote/living/carbon/purr
+ key = "purr"
+ key_third_person = "purrs"
+ vary = TRUE
+
+/datum/emote/living/carbon/purr/run_emote(mob/user, params, type_override, intentional)
+ . = ..()
+ if(istype(user.get_organ_slot(ORGAN_SLOT_TONGUE), /obj/item/organ/tongue/cat))
+ sound = SFX_CAT_PURR
+ message = "purrs."
+ emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+ else
+ to_chat(user, span_warning("You can't quite make the sound."))
+ return
+
/datum/emote/living/carbon/moan
key = "moan"
key_third_person = "moans"
diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
index 9970d973a7dba..4a977a1ac727d 100644
--- a/code/modules/mob/living/carbon/human/dummy.dm
+++ b/code/modules/mob/living/carbon/human/dummy.dm
@@ -118,7 +118,12 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
target.dna.features["tail_cat"] = get_consistent_feature_entry(SSaccessories.tails_list_felinid) // it's a lie
target.dna.features["tail_lizard"] = get_consistent_feature_entry(SSaccessories.tails_list_lizard)
target.dna.features["tail_monkey"] = get_consistent_feature_entry(SSaccessories.tails_list_monkey)
+ target.dna.features["tail_other"] = "No Tail" // DOPPLER EDIT ADDITION - CI Fails W/Out this
+ target.dna.features["wings"] = "No Wings" // DOPPLER EDIT ADDITON - CI Fails W/Out this
+ target.dna.features["breasts"] = "Bare" // DOPPLER EDIT ADDITION - LOOK OUT GORDON, HOTTED BOOBS AHEAD, TITS BIG ONES!
+ target.dna.features["fluff"] = "No Fluff" // DOPPLER EDIT ADDITON - CI Fails W/Out this
target.dna.features["pod_hair"] = get_consistent_feature_entry(SSaccessories.pod_hair_list)
+ target.dna.features["caps"] = get_consistent_feature_entry(SSaccessories.caps_list)
target.dna.initialize_dna(create_mutation_blocks = FALSE, randomize_features = FALSE)
// UF and UI are nondeterministic, even though the features are the same some blocks will randomize slightly
// In practice this doesn't matter, but this is for the sake of 100%(ish) consistency
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 8df7c758e2b1e..8d9f8c523b6cb 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -45,11 +45,10 @@
return covering_part
/mob/living/carbon/human/bullet_act(obj/projectile/bullet, def_zone, piercing_hit = FALSE)
-
if(bullet.firer == src && bullet.original == src) //can't block or reflect when shooting yourself
return ..()
- if(bullet.reflectable & REFLECT_NORMAL)
+ if(bullet.reflectable)
if(check_reflect(def_zone)) // Checks if you've passed a reflection% check
visible_message(
span_danger("The [bullet.name] gets reflected by [src]!"),
@@ -61,11 +60,8 @@
playsound(src, held_item.block_sound, BLOCK_SOUND_VOLUME, TRUE)
// Find a turf near or on the original location to bounce to
if(!isturf(loc)) //Open canopy mech (ripley) check. if we're inside something and still got hit
- bullet.force_hit = TRUE //The thing we're in passed the bullet to us. Pass it back, and tell it to take the damage.
- loc.bullet_act(bullet, def_zone, piercing_hit)
- return BULLET_ACT_HIT
+ return loc.projectile_hit(bullet, def_zone, piercing_hit)
bullet.reflect(src)
-
return BULLET_ACT_FORCE_PIERCE // complete projectile permutation
if(check_block(bullet, bullet.damage, "the [bullet.name]", PROJECTILE_ATTACK, bullet.armour_penetration, bullet.damage_type))
@@ -582,7 +578,7 @@
body_part.check_for_injuries(src, combined_msg)
for(var/t in missing)
- combined_msg += span_boldannounce("Your [parse_zone(t)] is missing!")
+ combined_msg += span_bolddanger("Your [parse_zone(t)] is missing!")
if(is_bleeding())
var/list/obj/item/bodypart/bleeding_limbs = list()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index dca88762970f4..029a4376437fb 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -534,7 +534,7 @@
if (!CAN_SUCCUMB(src))
if(HAS_TRAIT(src, TRAIT_SUCCUMB_OVERRIDE))
if(whispered)
- to_chat(src, span_notice("Your immortal body is keeping you alive. If you want to accept death, you must do so [span_bold("quietly")]."), type=MESSAGE_TYPE_INFO)
+ to_chat(src, span_notice("Your immortal body is keeping you alive! Unless you just press the UI button."), type=MESSAGE_TYPE_INFO)
return
else
to_chat(src, span_warning("You are unable to succumb to death! This life continues."), type=MESSAGE_TYPE_INFO)
@@ -1201,16 +1201,42 @@
/mob/living/resist_grab(moving_resist)
. = TRUE
- //If we're in an aggressive grab or higher, we're lying down, we're vulnerable to grabs, or we're staggered and we have some amount of stamina loss, we must resist
- if(pulledby.grab_state || body_position == LYING_DOWN || HAS_TRAIT(src, TRAIT_GRABWEAKNESS) || get_timed_status_effect_duration(/datum/status_effect/staggered) && (getFireLoss()*0.5 + getBruteLoss()*0.5) >= 40)
- var/altered_grab_state = pulledby.grab_state
- if((body_position == LYING_DOWN || HAS_TRAIT(src, TRAIT_GRABWEAKNESS) || get_timed_status_effect_duration(/datum/status_effect/staggered)) && pulledby.grab_state < GRAB_KILL) //If prone, resisting out of a grab is equivalent to 1 grab state higher. won't make the grab state exceed the normal max, however
- altered_grab_state++
- if(HAS_TRAIT(src, TRAIT_GRABRESISTANCE))
- altered_grab_state--
+
+ //Our effective grab state. GRAB_PASSIVE is equal to 0, so if we have no other altering factors to our grab state, we can break free immediately on resist.
+ var/effective_grab_state = pulledby.grab_state
+ //The amount of damage inflicted on a failed resist attempt.
+ var/damage_on_resist_fail = rand(7, 13)
+
+ if(body_position == LYING_DOWN) //If prone, treat the grab state as one higher
+ effective_grab_state++
+
+ if(HAS_TRAIT(src, TRAIT_GRABWEAKNESS)) //If we have grab weakness from some source, treat the grab state as one higher
+ effective_grab_state++
+
+ if(get_timed_status_effect_duration(/datum/status_effect/staggered) && (getFireLoss() + getBruteLoss()) >= 40) //If we are staggered, and we have at least 40 damage, treat the grab state as one higher.
+ effective_grab_state++
+
+ if(HAS_TRAIT(src, TRAIT_GRABRESISTANCE)) //If we have grab resistance from some source, treat the grab state as one lower.
+ effective_grab_state--
+
+ //If our puller is a human, and they have an active hand they're grabbing with (please don't ask how people grab without hands), then apply their unarmed values to the grab values
+ if(pulledby && ishuman(pulledby))
+ var/mob/living/carbon/human/human_puller = pulledby
+ var/obj/item/bodypart/grabbing_bodypart = human_puller.get_active_hand()
+ if(grabbing_bodypart)
+ damage_on_resist_fail += rand(grabbing_bodypart.unarmed_damage_low, grabbing_bodypart.unarmed_damage_high)
+
+ //If our puller is a drunken brawler, they add more damage based on their own damage taken so long as they're drunk and treat the grab state as one higher
+ var/puller_drunkenness = human_puller.get_drunk_amount()
+ if(puller_drunkenness && HAS_TRAIT(human_puller, TRAIT_DRUNKEN_BRAWLER))
+ damage_on_resist_fail += clamp((human_puller.getFireLoss() + human_puller.getBruteLoss()) / 10, 3, 20)
+ effective_grab_state ++
+
+ //We only resist our grab state if we are currently in a grab equal to or greater than GRAB_AGGRESSIVE (1). Otherwise, break out immediately!
+ if(effective_grab_state >= GRAB_AGGRESSIVE)
// see defines/combat.dm, this should be baseline 60%
// Resist chance divided by the value imparted by your grab state. It isn't until you reach neckgrab that you gain a penalty to escaping a grab.
- var/resist_chance = altered_grab_state ? (BASE_GRAB_RESIST_CHANCE / altered_grab_state) : 100
+ var/resist_chance = clamp(BASE_GRAB_RESIST_CHANCE / effective_grab_state, 0, 100)
if(prob(resist_chance))
visible_message(span_danger("[src] breaks free of [pulledby]'s grip!"), \
span_danger("You break free of [pulledby]'s grip!"), null, null, pulledby)
@@ -1219,7 +1245,7 @@
pulledby.stop_pulling()
return FALSE
else
- adjustStaminaLoss(rand(15,20))//failure to escape still imparts a pretty serious penalty
+ adjustStaminaLoss(damage_on_resist_fail) //Do some stamina damage if we fail to resist
visible_message(span_danger("[src] struggles as they fail to break free of [pulledby]'s grip!"), \
span_warning("You struggle as you fail to break free of [pulledby]'s grip!"), null, null, pulledby)
to_chat(pulledby, span_danger("[src] struggles as they fail to break free of your grip!"))
@@ -2978,3 +3004,8 @@ GLOBAL_LIST_EMPTY(fire_appearances)
REMOVE_TRAIT(src, TRAIT_BLOCKING_PROJECTILES, BLOCKING_TRAIT)
cut_overlay(selected_overlay)
update_transform(0.8)
+
+/// Returns the string form of the def_zone we have hit.
+/mob/living/proc/check_hit_limb_zone_name(hit_zone)
+ if(has_limbs)
+ return hit_zone
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 43f361ca443d5..6781a938d1126 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -91,12 +91,11 @@
/mob/living/proc/is_ears_covered()
return null
-/mob/living/bullet_act(obj/projectile/proj, def_zone, piercing_hit = FALSE)
+/mob/living/bullet_act(obj/projectile/proj, def_zone, piercing_hit = FALSE, blocked = 0)
. = ..()
if (. != BULLET_ACT_HIT)
return .
- var/blocked = check_projectile_armor(def_zone, proj, is_silent = TRUE)
if(blocked >= 100)
if(proj.is_hostile_projectile())
apply_projectile_effects(proj, def_zone, blocked)
@@ -174,16 +173,15 @@
/mob/living/check_projectile_armor(def_zone, obj/projectile/impacting_projectile, is_silent)
return run_armor_check(def_zone, impacting_projectile.armor_flag, "","",impacting_projectile.armour_penetration, "", is_silent, impacting_projectile.weak_against_armour)
-/mob/living/proc/check_projectile_dismemberment(obj/projectile/P, def_zone)
- return 0
+/mob/living/proc/check_projectile_dismemberment(obj/projectile/proj, def_zone)
+ return
/obj/item/proc/get_volume_by_throwforce_and_or_w_class()
if(throwforce && w_class)
return clamp((throwforce + w_class) * 5, 30, 100)// Add the item's throwforce to its weight class and multiply by 5, then clamp the value between 30 and 100
- else if(w_class)
+ if(w_class)
return clamp(w_class * 8, 20, 100) // Multiply the item's weight class by 8, then clamp the value between 20 and 100
- else
- return 0
+ return 0
/mob/living/proc/set_combat_mode(new_mode, silent = TRUE)
if(combat_mode == new_mode)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index b8e755faade6a..46cfb5980a20b 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -62,7 +62,7 @@
var/nuking = FALSE
var/obj/machinery/doomsday_device/doomsday_device
- var/mob/eye/ai_eye/eyeobj
+ var/mob/eye/camera/ai/eyeobj
var/sprint = 10
var/last_moved = 0
var/acceleration = TRUE
@@ -1139,8 +1139,8 @@
target_ai = src //cheat! just give... ourselves as the spawned AI, because that's technically correct
. = ..()
-/mob/living/silicon/ai/proc/camera_visibility(mob/eye/ai_eye/moved_eye)
- GLOB.cameranet.visibility(moved_eye, client, all_eyes, TRUE)
+/mob/living/silicon/ai/proc/camera_visibility(mob/eye/camera/ai/moved_eye)
+ GLOB.cameranet.visibility(moved_eye)
/mob/living/silicon/ai/forceMove(atom/destination)
. = ..()
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
index b8bd1f443eafe..1f8c452f492fc 100644
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
@@ -12,7 +12,6 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
var/list/obj/machinery/camera/cameras = list()
/// The chunks of the map, mapping the areas that the cameras can see.
var/list/chunks = list()
- var/ready = 0
/// List of images cloned by all chunk static images put onto turfs cameras cant see
/// Indexed by the plane offset to use
@@ -56,16 +55,12 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
if(!.)
chunks[key] = . = new /datum/camerachunk(x, y, lowest.z)
-/// Updates what the aiEye can see. It is recommended you use this when the aiEye moves or its location is set.
-/datum/cameranet/proc/visibility(list/moved_eyes, client/C, list/other_eyes, use_static = TRUE)
+/// Updates what the camera eye can see. It is recommended you use this when a camera eye moves or its location is set.
+/datum/cameranet/proc/visibility(list/moved_eyes)
if(!islist(moved_eyes))
moved_eyes = moved_eyes ? list(moved_eyes) : list()
- if(islist(other_eyes))
- other_eyes = (other_eyes - moved_eyes)
- else
- other_eyes = list()
- for(var/mob/eye/ai_eye/eye as anything in moved_eyes)
+ for(var/mob/eye/camera/eye as anything in moved_eyes)
var/list/visibleChunks = list()
//Get the eye's turf in case its located in an object like a mecha
var/turf/eye_turf = get_turf(eye)
@@ -129,6 +124,8 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
* to change the time between static updates.
*/
/datum/cameranet/proc/majorChunkChange(atom/c, choice, update_delay_buffer)
+ PROTECTED_PROC(TRUE)
+
if(QDELETED(c) && choice == 1)
CRASH("Tried to add a qdeleting camera to the net")
diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
index 7b2c57abc3cc9..73908f162b8b5 100644
--- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
@@ -1,9 +1,9 @@
#define UPDATE_BUFFER_TIME (2.5 SECONDS)
-// CAMERA CHUNK
-//
-// A 16x16 grid of the map with a list of turfs that can be seen, are visible and are dimmed.
-// Allows the AI Eye to stream these chunks and know what it can and cannot see.
+/**
+ * A 16x16 grid of the map with a list of turfs that can be seen, are visible and are dimmed. \
+ * Allows Camera Eyes to stream these chunks and know what it can and cannot see.
+ */
/datum/camerachunk
///turfs our cameras cant see but are inside our grid. associative list of the form: list(obscured turf = static image on that turf)
@@ -16,7 +16,7 @@
///list of all turfs, associative with that turf's static image
///turf -> /image
var/list/turfs = list()
- ///eye mobs that can see turfs in our grid
+ ///Camera mobs that can see turfs in our grid
var/list/seenby = list()
///images currently in use on obscured turfs.
var/list/active_static_images = list()
@@ -27,24 +27,24 @@
var/lower_z
var/upper_z
-/// Add an AI eye to the chunk, then update if changed.
-/datum/camerachunk/proc/add(mob/eye/ai_eye/eye)
+/// Add a camera eye to the chunk, then update if changed.
+/datum/camerachunk/proc/add(mob/eye/camera/eye)
eye.visibleCameraChunks += src
seenby += eye
if(changed)
update()
var/client/client = eye.GetViewerClient()
- if(client && eye.use_static)
+ if(client && eye.use_visibility)
client.images += active_static_images
-/// Remove an AI eye from the chunk
-/datum/camerachunk/proc/remove(mob/eye/ai_eye/eye, remove_static_with_last_chunk = TRUE)
+/// Remove a camera eye from the chunk
+/datum/camerachunk/proc/remove(mob/eye/camera/ai/eye)
eye.visibleCameraChunks -= src
seenby -= eye
var/client/client = eye.GetViewerClient()
- if(client && eye.use_static)
+ if(client && eye.use_visibility)
client.images -= active_static_images
/// Called when a chunk has changed. I.E: A wall was deleted.
@@ -56,6 +56,7 @@
/**
* Updates the chunk, makes sure that it doesn't update too much. If the chunk isn't being watched it will
* instead be flagged to update the next time an AI Eye moves near it.
+ *
* update_delay_buffer is used for cameras that are moving around, which are cyborg inbuilt cameras and
* mecha onboard cameras. This buffer should be usually lower than UPDATE_BUFFER_TIME because
* otherwise a moving camera can run out of its own view before updating static.
@@ -89,8 +90,8 @@
///turfs that we could see last update but cant see now
var/list/newly_obscured_turfs = visibleTurfs - updated_visible_turfs
- for(var/mob/eye/ai_eye/client_eye as anything in seenby)
- var/client/client = client_eye.ai?.client || client_eye.client
+ for(var/mob/eye/camera/client_eye as anything in seenby)
+ var/client/client = client_eye.GetViewerClient()
if(!client)
continue
@@ -119,8 +120,8 @@
changed = FALSE
- for(var/mob/eye/ai_eye/client_eye as anything in seenby)
- var/client/client = client_eye.ai?.client || client_eye.client
+ for(var/mob/eye/camera/client_eye as anything in seenby)
+ var/client/client = client_eye.GetViewerClient()
if(!client)
continue
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index c93054d6d269f..25ccafe26c0f1 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -1,43 +1,50 @@
-// AI EYE
-//
-// An invisible (no icon) mob that the AI controls to look around the station with.
-// It streams chunks as it moves around, which will show it what the AI can and cannot see.
-/mob/eye/ai_eye
+/mob/eye/camera/ai
name = "Inactive AI Eye"
-
icon_state = "ai_camera"
- icon = 'icons/mob/eyemob.dmi'
- invisibility = INVISIBILITY_MAXIMUM
+
hud_possible = list(ANTAG_HUD, AI_DETECT_HUD = HUD_LIST_LIST)
- var/list/visibleCameraChunks = list()
+ /// The AI who owns this eye.
var/mob/living/silicon/ai/ai = null
+ /// Whether this eye will transmit speech near it to the AI.
var/relay_speech = FALSE
- var/use_static = TRUE
- var/static_visibility_range = 16
+ /// Whether this eye can be found with AI detectors.
var/ai_detector_visible = TRUE
+ /// The color of the area if the eye is detectable.
var/ai_detector_color = COLOR_RED
- interaction_range = INFINITY
-/mob/eye/ai_eye/Initialize(mapload)
+/mob/eye/camera/ai/Initialize(mapload)
. = ..()
- GLOB.aiEyes += src
update_ai_detect_hud()
- setLoc(loc, TRUE)
-/mob/eye/ai_eye/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)
- . = ..()
- if(same_z_layer)
- return
- update_ai_detect_hud()
+/mob/eye/camera/ai/Destroy()
+ if(ai)
+ ai.all_eyes -= src
+ ai = null
+ if(ai_detector_visible)
+ var/datum/atom_hud/ai_detector/hud = GLOB.huds[DATA_HUD_AI_DETECT]
+ hud.remove_atom_from_hud(src)
+ var/list/L = hud_list[AI_DETECT_HUD]
+ QDEL_LIST(L)
+ return ..()
-/mob/eye/ai_eye/examine(mob/user) //Displays a silicon's laws to ghosts
- . = ..()
- if(istype(ai) && ai.laws && isobserver(user))
- . += "[ai] has the following laws: "
- for(var/law in ai.laws.get_law_list(include_zeroth = TRUE))
- . += law
+/**
+ * Returns a list of turfs visible to the client's viewsize. \
+ * Note that this will return an empty list if the camera's loc is not a turf.
+ */
+/mob/eye/camera/ai/proc/get_visible_turfs()
+ RETURN_TYPE(/list/turf)
+ SHOULD_BE_PURE(TRUE)
+ SHOULD_CALL_PARENT(TRUE)
-/mob/eye/ai_eye/proc/update_ai_detect_hud()
+ if(!isturf(loc))
+ return list()
+ var/client/C = GetViewerClient()
+ var/view = C ? getviewsize(C.view) : getviewsize(world.view)
+ var/turf/lowerleft = locate(max(1, x - (view[1] - 1)/2), max(1, y - (view[2] - 1)/2), z)
+ var/turf/upperright = locate(min(world.maxx, lowerleft.x + (view[1] - 1)), min(world.maxy, lowerleft.y + (view[2] - 1)), lowerleft.z)
+ return block(lowerleft, upperright)
+
+/mob/eye/camera/ai/proc/update_ai_detect_hud()
var/datum/atom_hud/ai_detector/hud = GLOB.huds[DATA_HUD_AI_DETECT]
var/list/old_images = hud_list[AI_DETECT_HUD]
if(!ai_detector_visible)
@@ -75,42 +82,17 @@
active_hud_list[AI_DETECT_HUD] = new_images
hud.add_atom_to_hud(src)
-/mob/eye/ai_eye/proc/get_visible_turfs()
- if(!isturf(loc))
- return list()
- var/client/C = GetViewerClient()
- var/view = C ? getviewsize(C.view) : getviewsize(world.view)
- var/turf/lowerleft = locate(max(1, x - (view[1] - 1)/2), max(1, y - (view[2] - 1)/2), z)
- var/turf/upperright = locate(min(world.maxx, lowerleft.x + (view[1] - 1)), min(world.maxy, lowerleft.y + (view[2] - 1)), lowerleft.z)
- return block(lowerleft, upperright)
-
-/// Used in cases when the eye is located in a movable object (i.e. mecha)
-/mob/eye/ai_eye/proc/update_visibility()
- SIGNAL_HANDLER
- if(use_static)
- ai.camera_visibility(src)
-
-// Use this when setting the aiEye's location.
-// It will also stream the chunk that the new loc is in.
-
-/mob/eye/ai_eye/proc/setLoc(destination, force_update = FALSE)
+/mob/eye/camera/ai/setLoc(destination, force_update = FALSE)
if(!ai)
return
if(!isturf(ai.loc))
return
- destination = get_turf(destination)
- if(!force_update && (destination == get_turf(src)))
- return //we are already here!
- if (destination)
- abstract_move(destination)
- else
- moveToNullspace()
- if(use_static)
- ai.camera_visibility(src)
+
+ . = ..()
+
if(ai.client && !ai.multicam_on)
ai.client.set_eye(src)
update_ai_detect_hud()
- update_parallax_contents()
//Holopad
if(istype(ai.current, /obj/machinery/holopad))
var/obj/machinery/holopad/H = ai.current
@@ -122,33 +104,31 @@
if(ai.master_multicam)
ai.master_multicam.refresh_view()
-/mob/eye/ai_eye/zMove(dir, turf/target, z_move_flags = NONE, recursions_left = 1, list/falling_movs)
- . = ..()
- if(.)
- setLoc(loc, force_update = TRUE)
-
-/mob/eye/ai_eye/Move()
- return
+/mob/eye/camera/ai/update_visibility()
+ if(ai)
+ ai.camera_visibility(src)
+ else
+ ..()
-/mob/eye/ai_eye/proc/GetViewerClient()
+/mob/eye/camera/ai/GetViewerClient()
if(ai)
return ai.client
return null
-/mob/eye/ai_eye/Destroy()
- if(ai)
- ai.all_eyes -= src
- ai = null
- for(var/V in visibleCameraChunks)
- var/datum/camerachunk/c = V
- c.remove(src)
- GLOB.aiEyes -= src
- if(ai_detector_visible)
- var/datum/atom_hud/ai_detector/hud = GLOB.huds[DATA_HUD_AI_DETECT]
- hud.remove_atom_from_hud(src)
- var/list/L = hud_list[AI_DETECT_HUD]
- QDEL_LIST(L)
- return ..()
+/mob/eye/camera/ai/examine(mob/user) //Displays a silicon's laws to ghosts
+ . = ..()
+ if(istype(ai) && ai.laws && isobserver(user))
+ . += "[ai] has the following laws: "
+ for(var/law in ai.laws.get_law_list(include_zeroth = TRUE))
+ . += law
+
+/mob/eye/camera/ai/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)
+ . = ..()
+ if(same_z_layer)
+ return
+ update_ai_detect_hud()
+
+/*----------------------------------------------------*/
/atom/proc/move_camera_by_click()
if(!isAI(usr))
@@ -189,7 +169,6 @@
sprint = initial(sprint)
ai_tracking_tool.reset_tracking()
-
#undef SPRINT_PER_STEP
#undef MAX_SPRINT
#undef SPRINT_PER_TICK
@@ -215,12 +194,11 @@
/mob/living/silicon/ai/proc/create_eye()
if(eyeobj)
return
- eyeobj = new /mob/eye/ai_eye()
+ eyeobj = new /mob/eye/camera/ai()
all_eyes += eyeobj
eyeobj.ai = src
- eyeobj.setLoc(loc)
eyeobj.name = "[name] (AI Eye)"
- eyeobj.real_name = eyeobj.name
+ eyeobj.setLoc(loc, TRUE)
set_eyeobj_visible(TRUE)
/mob/living/silicon/ai/proc/set_eyeobj_visible(state = TRUE)
@@ -241,7 +219,7 @@
acceleration = !acceleration
to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].")
-/mob/eye/ai_eye/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, list/message_mods = list(), message_range)
+/mob/eye/camera/ai/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, list/message_mods = list(), message_range)
. = ..()
if(relay_speech && speaker && ai && !radio_freq && speaker != ai && GLOB.cameranet.checkCameraVis(speaker))
ai.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mods)
diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm
index 12ee1ce3b5371..049243d90f1d4 100644
--- a/code/modules/mob/living/silicon/ai/multicam.dm
+++ b/code/modules/mob/living/silicon/ai/multicam.dm
@@ -4,11 +4,11 @@
var/mob/living/silicon/ai/ai
var/mutable_appearance/highlighted_background
var/highlighted = FALSE
- var/mob/eye/ai_eye/pic_in_pic/aiEye
+ var/mob/eye/camera/ai/pic_in_pic/aiEye
/atom/movable/screen/movable/pic_in_pic/ai/Initialize(mapload, datum/hud/hud_owner)
. = ..()
- aiEye = new /mob/eye/ai_eye/pic_in_pic()
+ aiEye = new /mob/eye/camera/ai/pic_in_pic()
aiEye.screen = src
/atom/movable/screen/movable/pic_in_pic/ai/Destroy()
@@ -126,37 +126,38 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)
//Dummy camera eyes
-/mob/eye/ai_eye/pic_in_pic
+/mob/eye/camera/ai/pic_in_pic
name = "Secondary AI Eye"
+ icon_state = "ai_pip_camera"
invisibility = INVISIBILITY_OBSERVER
mouse_opacity = MOUSE_OPACITY_ICON
- icon_state = "ai_pip_camera"
+ ai_detector_color = COLOR_ORANGE
+
var/atom/movable/screen/movable/pic_in_pic/ai/screen
var/list/cameras_telegraphed = list()
var/telegraph_cameras = TRUE
var/telegraph_range = 7
- ai_detector_color = COLOR_ORANGE
-/mob/eye/ai_eye/pic_in_pic/GetViewerClient()
+/mob/eye/camera/ai/pic_in_pic/GetViewerClient()
if(screen?.ai)
return screen.ai.client
-/mob/eye/ai_eye/pic_in_pic/setLoc(turf/destination, force_update = FALSE)
- if (destination)
- abstract_move(destination)
- else
- moveToNullspace()
+/mob/eye/camera/ai/pic_in_pic/update_visibility()
if(screen?.ai)
screen.ai.camera_visibility(src)
else
- GLOB.cameranet.visibility(src)
+ ..()
+
+/mob/eye/camera/ai/pic_in_pic/setLoc(turf/destination, force_update = FALSE)
+ . = ..()
update_camera_telegraphing()
update_ai_detect_hud()
-/mob/eye/ai_eye/pic_in_pic/get_visible_turfs()
+/mob/eye/camera/ai/pic_in_pic/get_visible_turfs()
+ SHOULD_CALL_PARENT(FALSE) //we do our own thing here
return screen ? screen.get_visible_turfs() : list()
-/mob/eye/ai_eye/pic_in_pic/proc/update_camera_telegraphing()
+/mob/eye/camera/ai/pic_in_pic/proc/update_camera_telegraphing()
if(!telegraph_cameras)
return
var/list/obj/machinery/camera/add = list()
@@ -185,7 +186,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)
C.in_use_lights++
C.update_appearance()
-/mob/eye/ai_eye/pic_in_pic/proc/disable_camera_telegraphing()
+/mob/eye/camera/ai/pic_in_pic/proc/disable_camera_telegraphing()
telegraph_cameras = FALSE
for (var/obj/machinery/camera/C as anything in cameras_telegraphed)
if(QDELETED(C))
@@ -194,7 +195,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room)
C.update_appearance()
cameras_telegraphed.Cut()
-/mob/eye/ai_eye/pic_in_pic/Destroy()
+/mob/eye/camera/ai/pic_in_pic/Destroy()
disable_camera_telegraphing()
return ..()
diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm
index cefd9d144b764..1754a89aa5cb9 100644
--- a/code/modules/mob/living/silicon/laws.dm
+++ b/code/modules/mob/living/silicon/laws.dm
@@ -24,7 +24,7 @@
/mob/living/silicon/proc/post_lawchange(announce = TRUE)
throw_alert(ALERT_NEW_LAW, /atom/movable/screen/alert/newlaw)
if(announce && last_lawchange_announce != world.time)
- to_chat(src, span_boldannounce("Your laws have been changed."))
+ to_chat(src, span_bolddanger("Your laws have been changed."))
SEND_SOUND(src, sound('sound/machines/cryo_warning.ogg'))
// lawset modules cause this function to be executed multiple times in a tick, so we wait for the next tick in order to be able to see the entire lawset
addtimer(CALLBACK(src, PROC_REF(show_laws)), 0)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 88876e0233e52..d4beec000092b 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -19,6 +19,7 @@
AddElement(/datum/element/ridable, /datum/component/riding/creature/cyborg)
RegisterSignal(src, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge))
RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater))
+ RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_GOT_DAMPENED), PROC_REF(on_dampen))
robot_modules_background = new()
robot_modules_background.icon_state = "block"
@@ -134,6 +135,12 @@
QDEL_LIST(upgrades)
QDEL_NULL(cell)
QDEL_NULL(robot_suit)
+
+ if (smoke_particles)
+ remove_shared_particles(smoke_particles)
+ if (spark_particles)
+ remove_shared_particles(spark_particles)
+
return ..()
/mob/living/silicon/robot/Topic(href, href_list)
@@ -565,7 +572,7 @@
removing.update_appearance()
else
- to_chat(src, span_boldannounce("Oops! Something went very wrong, your MMI was unable to receive your mind. \
+ to_chat(src, span_bolddanger("Oops! Something went very wrong, your MMI was unable to receive your mind. \
You have been ghosted. Please make a bug report so we can fix this bug."))
ghostize()
stack_trace("Borg MMI lacked a brainmob")
@@ -957,6 +964,10 @@
buckle_mob_flags= RIDER_NEEDS_ARM // just in case
return ..()
+/mob/living/silicon/robot/post_buckle_mob(mob/living/victim_to_boot)
+ if(HAS_TRAIT(src, TRAIT_GOT_DAMPENED))
+ eject_riders()
+
/mob/living/silicon/robot/can_resist()
if(lockcharge)
balloon_alert(src, "locked down!")
@@ -1053,3 +1064,16 @@
. = ..()
set_stat(CONSCIOUS) //This is a horrible hack, but silicon code forced my hand
update_stat()
+
+/mob/living/silicon/robot/proc/on_dampen()
+ SIGNAL_HANDLER
+ eject_riders()
+
+/mob/living/silicon/robot/proc/eject_riders()
+ if(!length(buckled_mobs))
+ return
+ for(var/mob/living/buckled_mob as anything in buckled_mobs)
+ buckled_mob.visible_message(span_warning("[buckled_mob] is knocked off of [src] by the charge in [src]'s chassis induced by the hyperkinetic dampener field!"))
+ buckled_mob.Paralyze(1 SECONDS)
+ unbuckle_mob(buckled_mob)
+ do_sparks(5, 0, src)
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 323420cb8ae7f..a451166bcada8 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -119,7 +119,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
if(opened)
to_chat(user, span_warning("You must close the cover to swipe an ID card!"))
else
- if(allowed(usr))
+ if(allowed(user))
locked = !locked
to_chat(user, span_notice("You [ locked ? "lock" : "unlock"] [src]'s cover."))
update_icons()
@@ -193,41 +193,34 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
var/brute_percent = bruteloss / maxHealth
var/burn_percent = fireloss / maxHealth
+ var/old_smoke = smoke_particles
if (brute_percent > MODERATE_DAMAGE_UPPER_BOUND)
- if(!smoke_particles)
- smoke_particles = new(src, /particles/smoke/cyborg/heavy_damage, PARTICLE_ATTACH_MOB)
- else if(!istype(smoke_particles.particles, /particles/smoke/cyborg/heavy_damage)) //TODO: needs to be darker
- QDEL_NULL(smoke_particles)
- smoke_particles = new(src, /particles/smoke/cyborg/heavy_damage, PARTICLE_ATTACH_MOB)
-
+ smoke_particles = /particles/smoke/cyborg/heavy_damage
else if (brute_percent > LOW_DAMAGE_UPPER_BOUND)
- if(!smoke_particles)
- smoke_particles = new(src, /particles/smoke/cyborg, PARTICLE_ATTACH_MOB)
- else if(!istype(smoke_particles.particles, /particles/smoke/cyborg))
- QDEL_NULL(smoke_particles)
- smoke_particles = new(src, /particles/smoke/cyborg, PARTICLE_ATTACH_MOB)
-
+ smoke_particles = /particles/smoke/cyborg
else
- if(smoke_particles)
- QDEL_NULL(smoke_particles)
+ smoke_particles = null
- if (burn_percent > MODERATE_DAMAGE_UPPER_BOUND)
- if(!spark_particles)
- spark_particles = new(src, /particles/embers/spark/severe, PARTICLE_ATTACH_MOB)
- else if(!istype(spark_particles.particles, /particles/embers/spark/severe)) //TODO: needs to be more dramatic
- QDEL_NULL(spark_particles)
- spark_particles = new(src, /particles/embers/spark/severe, PARTICLE_ATTACH_MOB)
+ if (old_smoke != smoke_particles)
+ if (old_smoke)
+ remove_shared_particles(old_smoke)
+ if (smoke_particles)
+ add_shared_particles(smoke_particles)
+ var/old_sparks = spark_particles
+ if (burn_percent > MODERATE_DAMAGE_UPPER_BOUND)
+ spark_particles = /particles/embers/spark/severe
else if (burn_percent > LOW_DAMAGE_UPPER_BOUND)
- if(!spark_particles)
- spark_particles = new(src, /particles/embers/spark, PARTICLE_ATTACH_MOB)
- else if(!istype(spark_particles.particles, /particles/embers/spark))
- QDEL_NULL(spark_particles)
- spark_particles = new(src, /particles/embers/spark, PARTICLE_ATTACH_MOB)
-
+ spark_particles = /particles/embers/spark
else
- if(spark_particles)
- QDEL_NULL(spark_particles)
+ spark_particles = null
+
+ if (old_sparks != spark_particles)
+ if (old_sparks)
+ remove_shared_particles(old_sparks)
+ if (spark_particles)
+ add_shared_particles(spark_particles)
+
#undef LOW_DAMAGE_UPPER_BOUND
#undef MODERATE_DAMAGE_UPPER_BOUND
@@ -280,7 +273,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
. &= ~(SHOVE_CAN_MOVE|SHOVE_CAN_HIT_SOMETHING)
/mob/living/silicon/robot/welder_act(mob/living/user, obj/item/tool)
- if(user.combat_mode && usr != src)
+ if(user.combat_mode && user != src)
return FALSE
. = TRUE
user.changeNext_move(CLICK_CD_MELEE)
diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm
index dd4ba8b6bd499..7e2d8de24694a 100644
--- a/code/modules/mob/living/silicon/robot/robot_defines.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defines.dm
@@ -118,10 +118,10 @@
var/low_power_mode = FALSE
///So they can initialize sparks whenever/N
var/datum/effect_system/spark_spread/spark_system
- ///Smoke particle holder for brute damage
- var/obj/effect/abstract/particle_holder/smoke_particles = null
- ///Spark particle holder for burn damage
- var/obj/effect/abstract/particle_holder/spark_particles = null
+ ///Smoke particle type for brute damage
+ var/smoke_particles
+ ///Spark particle type for burn damage
+ var/spark_particles
///Jetpack-like effect.
var/ionpulse = FALSE
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 2c5d4c6aa91bd..38599c204653a 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -1014,7 +1014,7 @@ Pass a positive integer as an argument to override a bot's default speed.
to_chat(src, span_boldnotice(get_emagged_message()))
return
if(!(bot_cover_flags & BOT_COVER_HACKED))
- to_chat(user, span_boldannounce("You fail to repair [src]'s [hackables]."))
+ to_chat(user, span_bolddanger("You fail to repair [src]'s [hackables]."))
return
bot_cover_flags &= ~(BOT_COVER_EMAGGED|BOT_COVER_HACKED)
to_chat(user, span_notice("You reset the [src]'s [hackables]."))
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index df9db2defb173..81fad948ae12d 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -86,7 +86,7 @@
var/obj/projectile/fired_bullet = new projectile(loc)
playsound(src, shoot_sound, 50, TRUE)
- fired_bullet.preparePixelProjectile(target, src)
+ fired_bullet.aim_projectile(target, src)
fired_bullet.fire()
/mob/living/simple_animal/bot/secbot/ed209/emp_act(severity)
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 5e9018384bef6..e1117e3200f77 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -243,14 +243,14 @@
return TRUE
-/mob/living/simple_animal/bot/mulebot/bullet_act(obj/projectile/Proj)
+/mob/living/simple_animal/bot/mulebot/bullet_act(obj/projectile/proj)
. = ..()
if(. && !QDELETED(src)) //Got hit and not blown up yet.
if(prob(50) && !isnull(load))
unload(0)
if(prob(25))
visible_message(span_danger("Something shorts out inside [src]!"))
- wires.cut_random(source = Proj.firer)
+ wires.cut_random(source = proj.firer)
/mob/living/simple_animal/bot/mulebot/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 407e6070bae35..795390562b20b 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -297,15 +297,15 @@
update_appearance()
return TRUE
-/mob/living/simple_animal/bot/secbot/bullet_act(obj/projectile/Proj)
+/mob/living/simple_animal/bot/secbot/bullet_act(obj/projectile/proj)
. = ..()
if(. != BULLET_ACT_HIT)
return
- if(istype(Proj, /obj/projectile/beam) || istype(Proj, /obj/projectile/bullet))
- if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE))
- if(Proj.is_hostile_projectile() && Proj.damage < src.health && ishuman(Proj.firer))
- retaliate(Proj.firer)
+ if(istype(proj, /obj/projectile/beam) || istype(proj, /obj/projectile/bullet))
+ if((proj.damage_type == BURN) || (proj.damage_type == BRUTE))
+ if(proj.is_hostile_projectile() && proj.damage < src.health && ishuman(proj.firer))
+ retaliate(proj.firer)
/mob/living/simple_animal/bot/secbot/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers)
if(!(bot_mode_flags & BOT_MODE_ON))
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 201c83497dfd5..583f2ba1d6c9e 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -165,11 +165,11 @@
FindTarget(list(source))
return ..()
-/mob/living/simple_animal/hostile/bullet_act(obj/projectile/P)
+/mob/living/simple_animal/hostile/bullet_act(obj/projectile/proj)
if(stat == CONSCIOUS && !target && AIStatus != AI_OFF && !client)
- if(P.firer && get_dist(src, P.firer) <= aggro_vision_range)
- FindTarget(list(P.firer))
- Goto(P.starting, move_to_delay, 3)
+ if(proj.firer && get_dist(src, proj.firer) <= aggro_vision_range)
+ FindTarget(list(proj.firer))
+ Goto(proj.starting, move_to_delay, 3)
return ..()
//////////////HOSTILE MOB TARGETING AND AGGRESSION////////////
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index ae3b10b11990a..1f544c0d322eb 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -106,7 +106,7 @@ Difficulty: Medium
/obj/projectile/kinetic/miner
damage = 20
- speed = 0.9
+ speed = 1.1
icon_state = "ka_tracer"
range = 4
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index f1e3461271359..248b73c6677cc 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -297,9 +297,9 @@ Difficulty: Hard
if(.)
recovery_time = world.time + 20 // can only attack melee once every 2 seconds but rapid_melee gives higher priority
-/mob/living/simple_animal/hostile/megafauna/bubblegum/bullet_act(obj/projectile/P)
+/mob/living/simple_animal/hostile/megafauna/bubblegum/bullet_act(obj/projectile/proj)
if(BUBBLEGUM_IS_ENRAGED)
- visible_message(span_danger("[src] deflects the projectile; [p_they()] can't be hit with ranged weapons while enraged!"), span_userdanger("You deflect the projectile!"))
+ visible_message(span_danger("[src] deflects the [proj]! [p_They()] can't be hit with ranged weapons while enraged!"), span_userdanger("You deflect the projectile!"))
playsound(src, SFX_BULLET_MISS, 300, TRUE)
return BULLET_ACT_BLOCK
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 3af739f736c0a..d921b5f5878b6 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -182,7 +182,7 @@
icon_state = "chronobolt"
damage = 25
armour_penetration = 100
- speed = 2
+ speed = 0.5
damage_type = BRUTE
pass_flags = PASSTABLE
plane = GAME_PLANE
@@ -193,7 +193,7 @@
AddComponent(/datum/component/parriable_projectile)
/obj/projectile/colossus/can_hit_target(atom/target, direct_target = FALSE, ignore_loc = FALSE, cross_failed = FALSE)
- if(isliving(target))
+ if(isliving(target) && target != firer)
direct_target = TRUE
return ..(target, direct_target, ignore_loc, cross_failed)
@@ -278,12 +278,12 @@
ActivationReaction(user, ACTIVATE_WEAPON)
..()
-/obj/machinery/anomalous_crystal/bullet_act(obj/projectile/P, def_zone)
+/obj/machinery/anomalous_crystal/bullet_act(obj/projectile/proj, def_zone)
. = ..()
- if(istype(P, /obj/projectile/magic))
- ActivationReaction(P.firer, ACTIVATE_MAGIC, P.damage_type)
+ if(istype(proj, /obj/projectile/magic))
+ ActivationReaction(proj.firer, ACTIVATE_MAGIC, proj.damage_type)
return
- ActivationReaction(P.firer, P.armor_flag, P.damage_type)
+ ActivationReaction(proj.firer, proj.armor_flag, proj.damage_type)
/obj/machinery/anomalous_crystal/proc/ActivationReaction(mob/user, method, damtype)
if(!COOLDOWN_FINISHED(src, cooldown_timer))
@@ -405,9 +405,9 @@
/obj/machinery/anomalous_crystal/emitter/ActivationReaction(mob/user, method)
if(..())
- var/obj/projectile/P = new generated_projectile(get_turf(src))
- P.firer = src
- P.fire(dir2angle(dir))
+ var/obj/projectile/proj = new generated_projectile(get_turf(src))
+ proj.firer = src
+ proj.fire(dir2angle(dir))
/obj/machinery/anomalous_crystal/dark_reprise //Revives anyone nearby, but turns them into shadowpeople and renders them uncloneable, so the crystal is your only hope of getting up again if you go down.
observer_desc = "When activated, this crystal revives anyone nearby, but turns them into Shadowpeople and makes them unclonable, making the crystal their only hope of getting up again."
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
index 8c32b2a3c47d6..8cdf9141ab845 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
@@ -126,7 +126,7 @@ Difficulty: Extremely Hard
if(FROST_MINER_SHOULD_ENRAGE)
INVOKE_ASYNC(src, PROC_REF(check_enraged))
return COMPONENT_BLOCK_ABILITY_START
- var/projectile_speed_multiplier = 1 - enraged * 0.5
+ var/projectile_speed_multiplier = 1 + enraged
frost_orbs.projectile_speed_multiplier = projectile_speed_multiplier
snowball_machine_gun.projectile_speed_multiplier = projectile_speed_multiplier
ice_shotgun.projectile_speed_multiplier = projectile_speed_multiplier
@@ -198,8 +198,7 @@ Difficulty: Extremely Hard
icon_state = "ice_1"
damage = 20
armour_penetration = 100
- speed = 1
- pixel_speed_multiplier = 0.1
+ speed = 0.1
range = 500
homing_turn_speed = 3
damage_type = BURN
@@ -214,8 +213,7 @@ Difficulty: Extremely Hard
icon_state = "nuclear_particle"
damage = 5
armour_penetration = 100
- speed = 1
- pixel_speed_multiplier = 0.333
+ speed = 0.33
range = 150
damage_type = BRUTE
explode_hit_objects = FALSE
@@ -225,8 +223,7 @@ Difficulty: Extremely Hard
icon_state = "ice_2"
damage = 15
armour_penetration = 100
- speed = 1
- pixel_speed_multiplier = 0.333
+ speed = 0.33
range = 150
damage_type = BRUTE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index f8569897accf1..0ea9819f71b7b 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -237,7 +237,7 @@
desc = "An ash drakes true flame."
name = "Fire Barrier"
icon = 'icons/effects/fire.dmi'
- icon_state = "1"
+ icon_state = "light"
anchored = TRUE
opacity = FALSE
density = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 9383718e7bd30..509ca49ab34ea 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -573,8 +573,8 @@ Difficulty: Hard
if(mover == caster.pulledby)
return
if(isprojectile(mover))
- var/obj/projectile/P = mover
- if(P.firer == caster)
+ var/obj/projectile/proj = mover
+ if(proj.firer == caster)
return
if(mover != caster)
return FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
index a7db852492442..aad198801adf0 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
@@ -198,11 +198,9 @@ Difficulty: Hard
/obj/projectile/colossus/wendigo_shockwave
name = "wendigo shockwave"
- speed = 2
- /// If wave movement is enabled
- var/wave_movement = FALSE
+ speed = 0.5
/// Amount the angle changes every pixel move
- var/wave_speed = 15
+ var/wave_speed = 0.5
/// Amount of movements this projectile has made
var/pixel_moves = 0
@@ -210,18 +208,16 @@ Difficulty: Hard
damage = 15
/obj/projectile/colossus/wendigo_shockwave/wave
- speed = 8
- wave_movement = TRUE
- wave_speed = 10
+ speed = 0.125
+ homing = TRUE
+ wave_speed = 0.3
/obj/projectile/colossus/wendigo_shockwave/wave/alternate
- wave_speed = -10
+ wave_speed = -0.3
-/obj/projectile/colossus/wendigo_shockwave/pixel_move(trajectory_multiplier, hitscanning = FALSE)
- . = ..()
- if(wave_movement)
- pixel_moves++
- set_angle(original_angle + pixel_moves * wave_speed)
+/obj/projectile/colossus/wendigo_shockwave/process_homing()
+ pixel_moves++
+ set_angle(original_angle + pixel_moves * wave_speed)
/obj/item/wendigo_blood
name = "bottle of wendigo blood"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
index f57ea3e058203..5fbd6cda5cbfb 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm
@@ -101,8 +101,8 @@
if(mover == set_target)
return FALSE
if(isprojectile(mover))
- var/obj/projectile/P = mover
- if(P.firer == set_target)
+ var/obj/projectile/proj = mover
+ if(proj.firer == set_target)
return FALSE
#define IGNORE_PROC_IF_NOT_TARGET(X) /mob/living/simple_animal/hostile/asteroid/curseblob/##X(AM) { if (AM == set_target) return ..(); }
@@ -119,8 +119,8 @@ IGNORE_PROC_IF_NOT_TARGET(attack_larva)
IGNORE_PROC_IF_NOT_TARGET(attack_animal)
-/mob/living/simple_animal/hostile/asteroid/curseblob/bullet_act(obj/projectile/Proj)
- if(Proj.firer != set_target)
+/mob/living/simple_animal/hostile/asteroid/curseblob/bullet_act(obj/projectile/proj)
+ if(proj.firer != set_target)
return BULLET_ACT_BLOCK
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
index b12be32587e3d..48316d25020bd 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
@@ -135,7 +135,7 @@
H = new /obj/projectile/herald(startloc)
else
H = new /obj/projectile/herald/teleshot(startloc)
- H.preparePixelProjectile(marker, startloc)
+ H.aim_projectile(marker, startloc)
H.firer = src
if(target)
H.original = target
@@ -228,7 +228,7 @@
icon_state= "chronobolt"
damage = 20
armour_penetration = 60
- speed = 2
+ speed = 0.5
damage_type = BRUTE
pass_flags = PASSTABLE
@@ -276,7 +276,7 @@
var/turf/startloc = get_turf(owner)
var/obj/projectile/herald/H = null
H = new /obj/projectile/herald(startloc)
- H.preparePixelProjectile(marker, startloc)
+ H.aim_projectile(marker, startloc)
H.firer = owner
H.fire(set_angle)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
index 4853e0f3d019b..051733211ed3c 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
@@ -67,7 +67,7 @@
/datum/action/innate/elite_attack/bonfire_teleport
name = "Bonfire Teleport"
button_icon_state = "bonfire_teleport"
- chosen_message = span_boldwarning("You will leave a bonfire. Second use will let you swap positions with it indefintiely. Using this move on the same tile as your active bonfire removes it.")
+ chosen_message = span_boldwarning("You will leave a bonfire. Second use will let you swap positions with it indefinitely. Using this move on the same tile as your active bonfire removes it.")
chosen_attack_num = BONFIRE_TELEPORT
/datum/action/innate/elite_attack/spew_smoke
diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm
index a44cae6f139f5..7f6a5c5cd36e3 100644
--- a/code/modules/mob/living/simple_animal/hostile/ooze.dm
+++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm
@@ -359,7 +359,7 @@
// Why is this in InterceptClickOn() and not Activate()?
// Well, we need to use the params of the click intercept
- // for passing into preparePixelProjectile, so we'll handle it here instead.
+ // for passing into aim_projectile, so we'll handle it here instead.
// We just need to make sure Pre-activate and Activate return TRUE so we make it this far
caller.visible_message(
span_nicegreen("[caller] launches a mending globule!"),
@@ -372,7 +372,7 @@
var/modifiers = params2list(params)
var/obj/projectile/globule/globule = new(caller.loc)
- globule.preparePixelProjectile(target, caller, modifiers)
+ globule.aim_projectile(target, caller, modifiers)
globule.def_zone = caller.zone_selected
globule.fire()
diff --git a/code/modules/mob/living/sneeze.dm b/code/modules/mob/living/sneeze.dm
index ebf6162083482..af638d7c71a77 100644
--- a/code/modules/mob/living/sneeze.dm
+++ b/code/modules/mob/living/sneeze.dm
@@ -53,7 +53,7 @@
suppressed = SUPPRESSED_VERY
range = 4
- speed = 4
+ speed = 0.25
spread = 40
damage_type = BRUTE
damage = 0
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index 4efc847805f7f..11815d71b1220 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -424,12 +424,12 @@
///////////////////////// CLEAR STATUS /////////////////////////
/mob/living/proc/adjust_status_effects_on_shake_up()
- AdjustStun(-60)
- AdjustKnockdown(-60)
- AdjustUnconscious(-60)
- AdjustSleeping(-100)
- AdjustParalyzed(-60)
- AdjustImmobilized(-60)
+ AdjustStun(-6 SECONDS)
+ AdjustKnockdown(-6 SECONDS)
+ AdjustUnconscious(-6 SECONDS)
+ AdjustSleeping(-10 SECONDS)
+ AdjustParalyzed(-6 SECONDS)
+ AdjustImmobilized(-6 SECONDS)
///////////////////////////////// FROZEN /////////////////////////////////////
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 2b3810e0a50c2..36ff9c3ada7b5 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -277,7 +277,7 @@
hearers -= ignored_mobs
//DOPPLER EDIT ADDITION BEGIN - AI QoL
- for(var/mob/eye/ai_eye/ai_eye in hearers)
+ for(var/mob/eye/camera/ai/ai_eye in hearers)
if(ai_eye.ai?.client && !(ai_eye.ai.stat == DEAD))
hearers -= ai_eye
hearers |= ai_eye.ai
@@ -357,7 +357,7 @@
var/list/hearers = get_hearers_in_view(hearing_distance, src)
//DOPPLER EDIT ADDITION BEGIN - AI QoL
- for(var/mob/eye/ai_eye/ai_eye in hearers)
+ for(var/mob/eye/camera/ai/ai_eye in hearers)
if(ai_eye.ai?.client && !(ai_eye.ai.stat == DEAD))
hearers -= ai_eye
hearers |= ai_eye.ai
@@ -647,7 +647,7 @@
return
/mob/living/handle_eye_contact(mob/living/examined_mob)
- if(!istype(examined_mob) || src == examined_mob || examined_mob.stat >= UNCONSCIOUS || !client)
+ if(!istype(examined_mob) || src == examined_mob || examined_mob.stat >= UNCONSCIOUS || !client || is_blind())
return
var/imagined_eye_contact = FALSE
@@ -663,12 +663,16 @@
// check to see if their face is blocked or, if not, a signal blocks it
if(examined_mob.is_face_visible() && SEND_SIGNAL(src, COMSIG_MOB_EYECONTACT, examined_mob, TRUE) != COMSIG_BLOCK_EYECONTACT)
- var/msg = span_smallnotice("You make eye contact with [examined_mob].")
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), src, msg), 0.3 SECONDS) // so the examine signal has time to fire and this will print after
-
- if(!imagined_eye_contact && is_face_visible() && SEND_SIGNAL(examined_mob, COMSIG_MOB_EYECONTACT, src, FALSE) != COMSIG_BLOCK_EYECONTACT)
- var/msg = span_smallnotice("[src] makes eye contact with you.")
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), examined_mob, msg), 0.3 SECONDS)
+ var/obj/item/clothing/eye_cover = examined_mob.is_eyes_covered()
+ if (!eye_cover || (!eye_cover.tint && !eye_cover.flash_protect))
+ var/msg = span_smallnotice("You make eye contact with [examined_mob].")
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), src, msg), 0.3 SECONDS) // so the examine signal has time to fire and this will print after
+
+ if(!imagined_eye_contact && is_face_visible() && !examined_mob.is_blind() && SEND_SIGNAL(examined_mob, COMSIG_MOB_EYECONTACT, src, FALSE) != COMSIG_BLOCK_EYECONTACT)
+ var/obj/item/clothing/eye_cover = is_eyes_covered()
+ if (!eye_cover || (!eye_cover.tint && !eye_cover.flash_protect))
+ var/msg = span_smallnotice("[src] makes eye contact with you.")
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), examined_mob, msg), 0.3 SECONDS)
/**
* Called by using Activate Held Object with an empty hand/limb
diff --git a/code/modules/mod/mod_clothes.dm b/code/modules/mod/mod_clothes.dm
index 29377c66c6da4..8c5e7a2c4904f 100644
--- a/code/modules/mod/mod_clothes.dm
+++ b/code/modules/mod/mod_clothes.dm
@@ -44,6 +44,7 @@
cold_protection = HANDS|ARMS
item_flags = IMMUTABLE_SLOW
equip_sound = null
+ pickup_sound = null
drop_sound = null
/obj/item/clothing/shoes/mod
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index 76f9063df0b9c..706bdb802696a 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -316,6 +316,7 @@
slowdown_active = 1
allowed_suit_storage = list(
/obj/item/analyzer,
+ /obj/item/extinguisher,
/obj/item/fireaxe/metal_h2_axe,
/obj/item/pipe_dispenser,
/obj/item/t_scanner,
diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm
index ec550f3cfde3a..d09781451f42d 100644
--- a/code/modules/mod/modules/modules_antag.dm
+++ b/code/modules/mod/modules/modules_antag.dm
@@ -313,7 +313,7 @@
if(!.)
return
var/obj/projectile/flame = new /obj/projectile/bullet/incendiary/fire(mod.wearer.loc)
- flame.preparePixelProjectile(target, mod.wearer)
+ flame.aim_projectile(target, mod.wearer)
flame.firer = mod.wearer
playsound(src, 'sound/items/modsuit/flamethrower.ogg', 75, TRUE)
INVOKE_ASYNC(flame, TYPE_PROC_REF(/obj/projectile, fire))
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
index 9c96d9edd82b9..abe09594500c1 100644
--- a/code/modules/mod/modules/modules_engineering.dm
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -96,7 +96,7 @@
if(!.)
return
var/obj/projectile/tether = new /obj/projectile/tether(mod.wearer.loc, src)
- tether.preparePixelProjectile(target, mod.wearer)
+ tether.aim_projectile(target, mod.wearer)
tether.firer = mod.wearer
playsound(src, 'sound/items/weapons/batonextend.ogg', 25, TRUE)
INVOKE_ASYNC(tether, TYPE_PROC_REF(/obj/projectile, fire))
@@ -164,14 +164,8 @@
firer.AddComponent(/datum/component/tether, target, 7, "MODtether", parent_module = parent_module)
return
- var/hitx
- var/hity
- if(target == original)
- hitx = target.pixel_x + p_x - 16
- hity = target.pixel_y + p_y - 16
- else
- hitx = target.pixel_x + rand(-8, 8)
- hity = target.pixel_y + rand(-8, 8)
+ var/hitx = impact_x
+ var/hity = impact_y
if (!isnull(last_turf) && last_turf != target && last_turf != target.loc)
var/turf_dir = get_dir(last_turf, get_turf(target))
diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm
index cd5a575302d9f..124deb1bd66c6 100644
--- a/code/modules/mod/modules/modules_maint.dm
+++ b/code/modules/mod/modules/modules_maint.dm
@@ -318,11 +318,15 @@
if(istype(current_turf))
current_turf.zFall(mod.wearer, falling_from_move = TRUE)
-/obj/item/mod/module/atrocinator/proc/check_upstairs()
+/obj/item/mod/module/atrocinator/proc/check_upstairs(atom/movable/source, atom/oldloc, direction, forced, list/old_locs, momentum_change)
SIGNAL_HANDLER
if(you_fucked_up || mod.wearer.has_gravity() > NEGATIVE_GRAVITY)
return
+
+ if (forced || SHOULD_DISABLE_FOOTSTEPS(mod.wearer))
+ return
+
var/turf/open/current_turf = get_turf(mod.wearer)
var/turf/open/openspace/turf_above = get_step_multiz(mod.wearer, UP)
if(current_turf && istype(turf_above))
diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm
index 7c0e1c85b0536..f71814fc7db53 100644
--- a/code/modules/mod/modules/modules_medical.dm
+++ b/code/modules/mod/modules/modules_medical.dm
@@ -165,7 +165,7 @@
return
var/atom/movable/fired_organ = pop(organ_list)
var/obj/projectile/organ/projectile = new /obj/projectile/organ(mod.wearer.loc, fired_organ)
- projectile.preparePixelProjectile(target, mod.wearer)
+ projectile.aim_projectile(target, mod.wearer)
projectile.firer = mod.wearer
playsound(src, 'sound/vehicles/mecha/hydraulic.ogg', 25, TRUE)
INVOKE_ASYNC(projectile, TYPE_PROC_REF(/obj/projectile, fire))
@@ -200,13 +200,10 @@
var/mob/living/carbon/human/organ_receiver = target
var/succeed = FALSE
if(organ_receiver.surgeries.len)
- for(var/datum/surgery/procedure as anything in organ_receiver.surgeries)
+ for(var/datum/surgery/organ_manipulation/procedure in organ_receiver.surgeries)
if(procedure.location != organ.zone)
continue
- if(!istype(procedure, /datum/surgery/organ_manipulation))
- continue
- var/datum/surgery_step/surgery_step = procedure.get_surgery_step()
- if(!istype(surgery_step, /datum/surgery_step/manipulate_organs))
+ if(!ispath(procedure.steps[procedure.status], /datum/surgery_step/manipulate_organs))
continue
succeed = TRUE
break
diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm
index a6ade06a9098c..5f7abdd712b87 100644
--- a/code/modules/mod/modules/modules_ninja.dm
+++ b/code/modules/mod/modules/modules_ninja.dm
@@ -323,7 +323,7 @@
if(IS_SPACE_NINJA(mod.wearer) && isliving(target))
mod.wearer.say("Get over here!", forced = type)
var/obj/projectile/net = new /obj/projectile/energy_net(mod.wearer.loc, src)
- net.preparePixelProjectile(target, mod.wearer)
+ net.aim_projectile(target, mod.wearer)
net.firer = mod.wearer
playsound(src, 'sound/items/weapons/punchmiss.ogg', 25, TRUE)
INVOKE_ASYNC(net, TYPE_PROC_REF(/obj/projectile, fire))
diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm
index 0903231830486..b705de0f4beaa 100644
--- a/code/modules/mod/modules/modules_security.dm
+++ b/code/modules/mod/modules/modules_security.dm
@@ -310,7 +310,7 @@
/// Debuff multiplier on projectiles.
var/debuff_multiplier = 0.66
/// Speed multiplier on projectiles, higher means slower.
- var/speed_multiplier = 2.5
+ var/speed_multiplier = 0.4
/// List of all tracked projectiles.
var/list/tracked_projectiles = list()
/// Effect image on projectiles.
@@ -326,32 +326,10 @@
if(istype(dampening_field))
QDEL_NULL(dampening_field)
dampening_field = new(mod.wearer, field_radius, TRUE, src)
- RegisterSignal(dampening_field, COMSIG_DAMPENER_CAPTURE, PROC_REF(dampen_projectile))
- RegisterSignal(dampening_field, COMSIG_DAMPENER_RELEASE, PROC_REF(release_projectile))
/obj/item/mod/module/projectile_dampener/on_deactivation(display_message, deleting = FALSE)
QDEL_NULL(dampening_field)
-/obj/item/mod/module/projectile_dampener/proc/dampen_projectile(datum/source, obj/projectile/projectile)
- SIGNAL_HANDLER
-
- projectile.damage *= damage_multiplier
- projectile.stamina *= damage_multiplier
- projectile.stun *= debuff_multiplier
- projectile.knockdown *= debuff_multiplier
- projectile.speed *= speed_multiplier
- projectile.add_overlay(projectile_effect)
-
-/obj/item/mod/module/projectile_dampener/proc/release_projectile(datum/source, obj/projectile/projectile)
- SIGNAL_HANDLER
-
- projectile.damage /= damage_multiplier
- projectile.speed /= speed_multiplier
- projectile.stamina /= damage_multiplier
- projectile.stun /= debuff_multiplier
- projectile.knockdown /= debuff_multiplier
- projectile.cut_overlay(projectile_effect)
-
///Active Sonar - Displays a hud circle on the turf of any living creatures in the given radius
/obj/item/mod/module/active_sonar
name = "MOD active sonar"
diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm
index bc34cf8781ec4..2c4a5955aed2b 100644
--- a/code/modules/mod/modules/modules_supply.dm
+++ b/code/modules/mod/modules/modules_supply.dm
@@ -528,7 +528,7 @@
if(!.)
return
var/obj/projectile/bomb = new /obj/projectile/bullet/mining_bomb(mod.wearer.loc)
- bomb.preparePixelProjectile(target, mod.wearer)
+ bomb.aim_projectile(target, mod.wearer)
bomb.firer = mod.wearer
playsound(src, 'sound/items/weapons/gun/general/grenade_launch.ogg', 75, TRUE)
INVOKE_ASYNC(bomb, TYPE_PROC_REF(/obj/projectile, fire))
diff --git a/code/modules/mod/modules/modules_timeline.dm b/code/modules/mod/modules/modules_timeline.dm
index bfb22da0c20da..da36c2153d00f 100644
--- a/code/modules/mod/modules/modules_timeline.dm
+++ b/code/modules/mod/modules/modules_timeline.dm
@@ -222,7 +222,7 @@
//fire projectile
var/obj/projectile/energy/chrono_beam/chrono_beam = new /obj/projectile/energy/chrono_beam(get_turf(src))
chrono_beam.tem_weakref = WEAKREF(src)
- chrono_beam.preparePixelProjectile(target, mod.wearer)
+ chrono_beam.aim_projectile(target, mod.wearer)
chrono_beam.firer = mod.wearer
playsound(src, 'sound/items/modsuit/time_anchor_set.ogg', 50, TRUE)
INVOKE_ASYNC(chrono_beam, TYPE_PROC_REF(/obj/projectile, fire))
diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm
index 2d81fb6c3b5cb..763335d6728ab 100644
--- a/code/modules/modular_computers/computers/machinery/modular_computer.dm
+++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm
@@ -187,6 +187,6 @@
// "Burn" damage is equally strong against internal components and exterior casing
// "Brute" damage mostly damages the casing.
/obj/machinery/modular_computer/bullet_act(obj/projectile/proj)
- return cpu?.bullet_act(proj) || ..()
+ return cpu?.projectile_hit(proj) || ..()
#undef CPU_INTERACTABLE
diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm
index ee732432851a7..728ac6427cec9 100644
--- a/code/modules/pai/pai.dm
+++ b/code/modules/pai/pai.dm
@@ -398,7 +398,7 @@
master_ref = WEAKREF(master)
master_name = master.real_name
master_dna = master.dna.unique_enzymes
- to_chat(src, span_boldannounce("You have been bound to a new master: [user.real_name]!"))
+ to_chat(src, span_bolddanger("You have been bound to a new master: [user.real_name]!"))
holochassis_ready = TRUE
return TRUE
diff --git a/code/modules/pai/software.dm b/code/modules/pai/software.dm
index 59db371610797..285193c7e4cd7 100644
--- a/code/modules/pai/software.dm
+++ b/code/modules/pai/software.dm
@@ -171,7 +171,7 @@
if(!holder.has_dna())
balloon_alert(src, "no dna detected!")
return FALSE
- to_chat(src, span_boldannounce(("[holder]'s UE string: [holder.dna.unique_enzymes]")))
+ to_chat(src, span_bolddanger(("[holder]'s UE string: [holder.dna.unique_enzymes]")))
to_chat(src, span_notice("DNA [holder.dna.unique_enzymes == master_dna ? "matches" : "does not match"] our stored Master's DNA."))
return TRUE
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 7750b3926465f..968a093684b60 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -19,6 +19,7 @@
"Black" = "clipboard_black",
"White" = "clipboard_white",
)
+ unique_reskin_changes_inhand = TRUE
/// The stored pen
var/obj/item/pen/pen
diff --git a/code/modules/plumbing/plumbers/iv_drip.dm b/code/modules/plumbing/plumbers/iv_drip.dm
index 45c2ebca27acb..e528745bb60c2 100644
--- a/code/modules/plumbing/plumbers/iv_drip.dm
+++ b/code/modules/plumbing/plumbers/iv_drip.dm
@@ -14,7 +14,7 @@
AddComponent(/datum/component/simple_rotation)
/obj/machinery/iv_drip/plumbing/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
- if(attached)
+ if(attachment)
context[SCREENTIP_CONTEXT_RMB] = "Take needle out"
else if(reagent_container && !use_internal_storage)
context[SCREENTIP_CONTEXT_RMB] = "Eject container"
diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm
index 23a7c7b03e54f..b5b0744589ae7 100644
--- a/code/modules/plumbing/plumbers/pill_press.dm
+++ b/code/modules/plumbing/plumbers/pill_press.dm
@@ -1,7 +1,5 @@
///the minimum size of a pill or patch
#define MIN_VOLUME 5
-///the maximum size a pill or patch can be
-#define MAX_VOLUME 50
///max amount of pills allowed on our tile before we start storing them instead
#define MAX_FLOOR_PRODUCTS 10
@@ -11,16 +9,16 @@
desc = "A press that makes pills, patches and bottles."
icon_state = "pill_press"
- /// current operating product (pills or patches)
- var/product = "pill"
/// selected size of the product
var/current_volume = 10
+ /// maximum printable volume of the product
+ var/max_volume = 50
/// prefix for the product name
var/product_name = "factory"
/// All packaging types wrapped up in 1 big list
var/static/list/packaging_types = null
///The type of packaging to use
- var/packaging_type
+ var/obj/item/reagent_containers/packaging_type
///Category of packaging
var/packaging_category
/// list of products stored in the machine, so we dont have 610 pills on one tile
@@ -52,34 +50,28 @@
packaging_types += list(category_item)
- packaging_type = REF(GLOB.reagent_containers[CAT_PILLS][1])
- decode_category()
+ packaging_type = GLOB.reagent_containers[CAT_PILLS][1]
+ max_volume = initial(packaging_type.volume)
+ current_volume = clamp(current_volume, MIN_VOLUME, max_volume)
AddComponent(/datum/component/plumbing/simple_demand, bolt, layer)
+/obj/machinery/plumbing/pill_press/Destroy(force)
+ QDEL_LAZYLIST(stored_products)
+ return ..()
+
/obj/machinery/plumbing/pill_press/examine(mob/user)
. = ..()
. += span_notice("The [name] currently has [stored_products.len] stored. There needs to be less than [MAX_FLOOR_PRODUCTS] on the floor to continue dispensing.")
-/// decode product category from its type path and returns the decoded typepath
-/obj/machinery/plumbing/pill_press/proc/decode_category()
- var/obj/item/reagent_containers/container = locate(packaging_type)
- if(ispath(container, /obj/item/reagent_containers/pill/patch))
- packaging_category = CAT_PATCHES
- else if(ispath(container, /obj/item/reagent_containers/pill))
- packaging_category = CAT_PILLS
- else
- packaging_category = "Bottles"
- return container
-
/obj/machinery/plumbing/pill_press/process(seconds_per_tick)
if(!is_operational)
return
//shift & check to account for floating point inaccuracies
if(reagents.total_volume >= current_volume)
- var/obj/item/reagent_containers/container = locate(packaging_type)
- container = new container(src)
+ var/obj/item/reagent_containers/container = new packaging_type(src)
+
var/suffix
switch(packaging_category)
if(CAT_PILLS)
@@ -121,7 +113,6 @@
var/list/data = list()
data["min_volume"] = MIN_VOLUME
- data["max_volume"] = MAX_VOLUME
data["packaging_types"] = packaging_types
return data
@@ -130,8 +121,9 @@
var/list/data = list()
data["current_volume"] = current_volume
+ data["max_volume"] = max_volume
data["product_name"] = product_name
- data["packaging_type"] = packaging_type
+ data["packaging_type"] = REF(packaging_type)
data["packaging_category"] = packaging_category
return data
@@ -141,21 +133,57 @@
if(.)
return
- . = TRUE
switch(action)
if("change_current_volume")
- current_volume = round(clamp(text2num(params["volume"]), MIN_VOLUME, MAX_VOLUME))
+ var/value = params["volume"]
+ if(isnull(value))
+ return FALSE
+
+ value = text2num(value)
+ if(isnull(value))
+ return FALSE
+
+ current_volume = clamp(value, MIN_VOLUME, max_volume)
+ return TRUE
+
if("change_product_name")
var/formatted_name = html_encode(params["name"])
if (length(formatted_name) > MAX_NAME_LEN)
product_name = copytext(formatted_name, 1, MAX_NAME_LEN + 1)
else
product_name = formatted_name
+ return TRUE
+
if("change_product")
- packaging_type = params["ref"]
- var/obj/item/reagent_containers/container = decode_category()
- current_volume = clamp(current_volume, MIN_VOLUME, initial(container.volume))
+ var/container = params["ref"]
+ if(!container)
+ return FALSE
+
+ //is a valid option
+ var/container_found = FALSE
+ for(var/list/category as anything in packaging_types)
+ if(container_found)
+ break
+ for(var/list/package_item as anything in category["products"])
+ if(container == package_item["ref"])
+ container_found = TRUE
+ break
+ if(!container_found)
+ return FALSE
+
+ //decode container & its category
+ packaging_type = locate(container)
+ if(ispath(packaging_type, /obj/item/reagent_containers/pill/patch))
+ packaging_category = CAT_PATCHES
+ else if(ispath(packaging_type, /obj/item/reagent_containers/pill))
+ packaging_category = CAT_PILLS
+ else
+ packaging_category = "Bottles"
+
+ //get new volumes
+ max_volume = initial(packaging_type.volume)
+ current_volume = clamp(current_volume, MIN_VOLUME, max_volume)
+ return TRUE
#undef MIN_VOLUME
-#undef MAX_VOLUME
#undef MAX_FLOOR_PRODUCTS
diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm
index dff4a732b9312..69693af3a4a92 100644
--- a/code/modules/power/rtg.dm
+++ b/code/modules/power/rtg.dm
@@ -73,10 +73,10 @@
tesla_zap(source = src, zap_range = 5, power = power_gen * 20)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), src, 2, 3, 4, null, 8), 10 SECONDS) // Not a normal explosion.
-/obj/machinery/power/rtg/abductor/bullet_act(obj/projectile/Proj)
+/obj/machinery/power/rtg/abductor/bullet_act(obj/projectile/proj)
. = ..()
- if(!going_kaboom && istype(Proj) && Proj.damage > 0 && ((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE)))
- log_bomber(Proj.firer, "triggered a", src, "explosion via projectile")
+ if(!going_kaboom && istype(proj) && proj.damage > 0 && ((proj.damage_type == BURN) || (proj.damage_type == BRUTE)))
+ log_bomber(proj.firer, "triggered a", src, "explosion via projectile")
overload()
/obj/machinery/power/rtg/abductor/blob_act(obj/structure/blob/B)
diff --git a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm
index 4fe8863815a2d..e1d2a25d4da07 100644
--- a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm
+++ b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm
@@ -40,9 +40,9 @@
message = "You hear a lot of rattling in the disposal pipes around you as reality itself distorts. Yet, you feel safe."
else
message = "You hold onto \the [victim.loc] as hard as you can, as reality distorts around you. You feel safe."
- to_chat(victim, span_boldannounce(message))
+ to_chat(victim, span_bolddanger(message))
continue
- to_chat(victim, span_boldannounce("You feel reality distort for a moment..."))
+ to_chat(victim, span_bolddanger("You feel reality distort for a moment..."))
if (isliving(victim))
var/mob/living/living_victim = victim
living_victim.add_mood_event("delam", /datum/mood_event/delam)
@@ -161,7 +161,7 @@
for(var/mob/player as anything in GLOB.player_list)
if(!isdead(player))
var/mob/living/living_player = player
- to_chat(player, span_boldannounce("Everything around you is resonating with a powerful energy. This can't be good."))
+ to_chat(player, span_bolddanger("Everything around you is resonating with a powerful energy. This can't be good."))
living_player.add_mood_event("cascade", /datum/mood_event/cascade)
SEND_SOUND(player, 'sound/effects/magic/charge.ogg')
diff --git a/code/modules/power/supermatter/supermatter_hit_procs.dm b/code/modules/power/supermatter/supermatter_hit_procs.dm
index 167ee7988b138..d2e87ef4e548d 100644
--- a/code/modules/power/supermatter/supermatter_hit_procs.dm
+++ b/code/modules/power/supermatter/supermatter_hit_procs.dm
@@ -48,7 +48,7 @@
if(!is_valid_z_level(get_turf(hearing_mob), sm_turf))
continue
SEND_SOUND(hearing_mob, 'sound/effects/supermatter.ogg') //everyone goan know bout this
- to_chat(hearing_mob, span_boldannounce("A horrible screeching fills your ears, and a wave of dread washes over you..."))
+ to_chat(hearing_mob, span_bolddanger("A horrible screeching fills your ears, and a wave of dread washes over you..."))
qdel(src)
return gain
diff --git a/code/modules/projectiles/ammunition/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm
index b15cd334a8e6d..5a704354ed3cb 100644
--- a/code/modules/projectiles/ammunition/_firing.dm
+++ b/code/modules/projectiles/ammunition/_firing.dm
@@ -83,12 +83,12 @@
if(loaded_projectile.firer)
firing_dir = get_dir(fired_from, target)
if(!loaded_projectile.suppressed && firing_effect_type && !tk_firing(user, fired_from))
- new firing_effect_type(get_turf(src), firing_dir)
+ new firing_effect_type(user || get_turf(src), firing_dir)
var/direct_target
if(target && curloc.Adjacent(targloc, target=targloc, mover=src)) //if the target is right on our location or adjacent (including diagonally if reachable) we'll skip the travelling code in the proj's fire()
direct_target = target
- loaded_projectile.preparePixelProjectile(target, fired_from, params2list(params), spread)
+ loaded_projectile.aim_projectile(target, fired_from, params2list(params), spread)
var/obj/projectile/loaded_projectile_cache = loaded_projectile
loaded_projectile = null
loaded_projectile_cache.fire(null, direct_target)
diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
index b1f761831ee62..fb44ee41d9d15 100644
--- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
@@ -54,11 +54,11 @@
/obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/force
name = "two round magazine"
max_ammo = 2
- caliber = CALIBER_REBAR_FORCED
+ caliber = CALIBER_REBAR
ammo_type = /obj/item/ammo_casing/rebar
/obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/syndie
max_ammo = 3
- caliber = CALIBER_REBAR_SYNDIE
+ caliber = CALIBER_REBAR
ammo_type = /obj/item/ammo_casing/rebar/syndie
diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
index d7a24c9deba47..41152b170ad3b 100644
--- a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
@@ -60,7 +60,7 @@
desc = "Quite the sticky situation..."
icon_state = "sticky_arrow_projectile"
damage = 30
- speed = 0.75
+ speed = 1.3
range = 20
embed_type = /datum/embed_data/arrow/sticky
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 08cce7d73151c..b1a34c30eb936 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -151,11 +151,11 @@
var/size_per_tile = 0.1
var/max_scale = 4
-/obj/projectile/beam/laser/accelerator/Range()
+/obj/projectile/beam/laser/accelerator/reduce_range()
..()
damage += 7
transform = matrix()
- transform *= min(1 + (decayedRange - range) * size_per_tile, max_scale)
+ transform *= min(1 + (maximum_range - range) * size_per_tile, max_scale)
///X-ray gun
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 8072f62e46458..0cd4148e70996 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -431,7 +431,7 @@
playsound(user.loc, 'sound/effects/coin2.ogg', 50, TRUE)
user.visible_message(span_warning("[user] flips a coin towards [target]!"), span_danger("You flip a coin towards [target]!"))
var/obj/projectile/bullet/coin/new_coin = new(get_turf(user), target_turf, user)
- new_coin.preparePixelProjectile(target_turf, user)
+ new_coin.aim_projectile(target_turf, user)
new_coin.fire()
return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/projectiles/guns/special/blastcannon.dm b/code/modules/projectiles/guns/special/blastcannon.dm
index a7c35c9122ec2..befb622251a48 100644
--- a/code/modules/projectiles/guns/special/blastcannon.dm
+++ b/code/modules/projectiles/guns/special/blastcannon.dm
@@ -193,7 +193,7 @@
SSexplosions.shake_the_room(start_turf, max(heavy, medium, light, 0), (capped_heavy * 15) + (capped_medium * 20), capped_heavy, capped_medium)
var/obj/projectile/blastwave/blastwave = new(loc, heavy, medium, light)
- blastwave.preparePixelProjectile(target, start_turf, params2list(modifiers), spread)
+ blastwave.aim_projectile(target, start_turf, params2list(modifiers), spread)
blastwave.fire()
cached_firer = null
cached_target = null
@@ -314,7 +314,7 @@
/obj/projectile/blastwave/is_hostile_projectile()
return TRUE
-/obj/projectile/blastwave/Range()
+/obj/projectile/blastwave/reduce_range()
. = ..()
if(QDELETED(src))
return
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 3d2834edc62db..c4c5d42164ce0 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -1,7 +1,8 @@
-#define MOVES_HITSCAN -1 //Not actually hitscan but close as we get without actual hitscan.
-#define MUZZLE_EFFECT_PIXEL_INCREMENT 17 //How many pixels to move the muzzle flash up so your character doesn't look like they're shitting out lasers.
-#define MAX_RANGE_HIT_PRONE_TARGETS 10 //How far do the projectile hits the prone mob
+/// Not actually hitscan but close as we get without actual hitscan.
+#define MOVES_HITSCAN -1
+/// How many pixels to move the muzzle flash up so your character doesn't look like they're shitting out lasers.
+#define MUZZLE_EFFECT_PIXEL_INCREMENT 17
/obj/projectile
name = "projectile"
@@ -15,30 +16,56 @@
generic_canpass = FALSE
blocks_emissive = EMISSIVE_BLOCK_GENERIC
layer = MOB_LAYER
- //The sound this plays on impact.
+ /// The sound this plays on impact.
var/hitsound = 'sound/items/weapons/pierce.ogg'
- var/hitsound_wall = ""
+ /// Sound played when the projectile hits a wall
+ var/hitsound_wall
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
- var/def_zone = "" //Aiming at
- var/atom/movable/firer = null//Who shot it
- var/datum/fired_from = null // the thing that the projectile was fired from (gun, turret, spell)
- var/suppressed = FALSE //Attack message
- var/yo = null
- var/xo = null
- var/atom/original = null // the original target clicked
- var/turf/starting = null // the projectile's starting turf
+ /// Zone at which the projectile is aimed at
+ var/def_zone = ""
+ /// Atom who shot the projectile (Not the gun, the guy who shot the gun)
+ var/atom/movable/firer = null
+ /// The thing that the projectile was fired from (gun, turret, spell)
+ var/datum/fired_from = null
+ /// One of three suppression states: NONE displays the hit message and produces a loud sound,
+ /// QUIET makes a quiet sound and only lets the victim know they've been shot, and VERY only makes a very quiet sound with no messages
+ var/suppressed = SUPPRESSED_NONE
+ /// Original clicked target
+ var/atom/original = null
+ /// Initial target x coordinate offset of the projectile
+ VAR_FINAL/xo = null
+ /// Initial target y coordinate offset of the projectile
+ VAR_FINAL/yo = null
+ /// Projectile's starting turf
+ var/turf/starting = null
+ /// pixel_x where the player clicked. Default is the center.
var/p_x = 16
- var/p_y = 16 // the pixel location of the tile that the player clicked. Default is the center
-
- //Fired processing vars
- var/fired = FALSE //Have we been fired yet
- var/paused = FALSE //for suspending the projectile midair
- var/last_projectile_move = 0
- var/last_process = 0
- var/time_offset = 0
- var/datum/point/vector/trajectory
- var/trajectory_ignore_forcemove = FALSE //instructs forceMove to NOT reset our trajectory to the new location!
+ /// pixel_y where the player clicked. Default is the center
+ var/p_y = 16
+ /// X coordinate at which the projectile entered a new turf
+ var/entry_x
+ /// Y coordinate at which the projectile entered a new turf
+ var/entry_y
+ /// X coordinate at which the projectile visually impacted the target
+ var/impact_x
+ /// Y coordinate at which the projectile visually impacted the target
+ var/impact_y
+ /// Turf of the last atom we've impacted
+ VAR_FINAL/turf/last_impact_turf = null
+
+ /// If the projectile was fired already
+ var/fired = FALSE
+ /// If the projectile is suspended mid-air
+ var/paused = FALSE
+ /// Last time the projectile moved, used for lag compensation if SSprojectiles starts chugging
+ VAR_PRIVATE/last_projectile_move = 0
+ /// Last time the projectile was processed, also used for lag compensation
+ VAR_PRIVATE/last_process = 0
+ /// How many pixels we missed last tick due to lag or speed cap
+ VAR_PRIVATE/overrun = 0
+ /// Projectile's movement vector - this caches sine/cosine of our angle to cut down on trig calculations
+ var/datum/vector/movement_vector
/// We already impacted these things, do not impact them again. Used to make sure we can pierce things we want to pierce. Lazylist, typecache style (object = TRUE) for performance.
var/list/impacted = list()
/// If TRUE, we can hit our firer.
@@ -66,38 +93,34 @@
var/projectile_phasing = NONE
/// Bitflag for things the projectile should hit, but pierce through without deleting itself. Defers to projectile_phasing. Uses pass_flags flags.
var/projectile_piercing = NONE
- /// number of times we've pierced something. Incremented BEFORE bullet_act and on_hit proc!
+ /// Number of times we've pierced something. Incremented BEFORE bullet_act and on_hit proc!
var/pierces = 0
- /// how many times this projectile can pierce something before deleting
+ /// How many times this projectile can pierce something before deleting
var/max_pierces = 0
/// If objects are below this layer, we pass through them
var/hit_threshhold = PROJECTILE_HIT_THRESHHOLD_LAYER
- /// During each fire of SSprojectiles, the number of deciseconds since the last fire of SSprojectiles
- /// is divided by this var, and the result truncated to the next lowest integer is
- /// the number of times the projectile's `pixel_move` proc will be called.
- var/speed = 0.8
-
- /// This var is multiplied by SSprojectiles.global_pixel_speed to get how many pixels
- /// the projectile moves during each iteration of the movement loop
- ///
- /// If you want to make a fast-moving projectile, you should keep this equal to 1 and
- /// reduce the value of `speed`. If you want to make a slow-moving projectile, make
- /// `speed` a modest value like 1 and set this to a low value like 0.2.
- var/pixel_speed_multiplier = 1
+ /// How many tiles we pass in a single SSprojectiles tick
+ var/speed = 1.25
/// The current angle of the projectile. Initially null, so if the arg is missing from [/fire()], we can calculate it from firer and target as fallback.
var/angle
- var/original_angle = 0 //Angle at firing
- var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle
- var/spread = 0 //amount (in degrees) of projectile spread
- animate_movement = NO_STEPS //Use SLIDE_STEPS in conjunction with legacy
- /// how many times we've ricochet'd so far (instance variable, not a stat)
+ /// Angle at the moment of firing
+ var/original_angle = 0
+ /// Set TRUE to prevent projectiles from having their sprites rotated based on firing angle
+ var/nondirectional_sprite = FALSE
+ /// Random spread done projectile-side for convinience
+ var/spread = 0
+ /// Gliding does not enjoy something getting moved multiple turfs in a tick, which is why we animate it manually
+ animate_movement = NO_STEPS
+
+ // Ricochet logic
+ /// How many times we've ricochet'd so far (instance variable, not a stat)
var/ricochets = 0
- /// how many times we can ricochet max
+ /// How many times we can ricochet max
var/ricochets_max = 0
- /// how many times we have to ricochet min (unless we hit an atom we can ricochet off)
+ /// How many times we have to ricochet min (unless we hit an atom we can ricochet off)
var/min_ricochets = 0
/// 0-100 (or more, I guess), the base chance of ricocheting, before being modified by the atom we shoot and our chance decay
var/ricochet_chance = 0
@@ -114,18 +137,22 @@
/// Can our ricochet autoaim hit our firer?
var/ricochet_shoots_firer = TRUE
- ///If the object being hit can pass the damage on to something else, it should not do it for this bullet
- var/force_hit = FALSE
-
- //Hitscan
- var/hitscan = FALSE //Whether this is hitscan. If it is, speed is basically ignored.
- var/list/beam_segments //assoc list of datum/point or datum/point/vector, start = end. Used for hitscan effect generation.
- /// Last turf an angle was changed in for hitscan projectiles.
- var/turf/last_angle_set_hitscan_store
- var/datum/point/beam_index
- var/turf/hitscan_last //last turf touched during hitscanning.
+ // Hitscan logic
+ /// Wherever this projectile is hitscan. Hitscan projectiles are processed until the end of their path instantly upon being fired and leave a tracer in their path
+ var/hitscan = FALSE
+ /// Associated list of coordinate points in which we changed trajectories in order to calculate hitscan tracers
+ /// Value points to the next point in the beam
+ var/list/datum/point/beam_points
+ /// Last point in the beam
+ var/datum/point/last_point
+ /// Next forceMove will not create tracer end/start effects
+ var/free_hitscan_forceMove = FALSE
+
+ /// Hitscan tracer effect left behind the projectile
var/tracer_type
+ /// Hitscan muzzle effect spawned on the firer
var/muzzle_type
+ /// Hitscan impact effect spawned on the target
var/impact_type
//Fancy hitscan lighting effects!
@@ -139,11 +166,16 @@
var/impact_light_range = 2
var/impact_light_color_override
- //Homing
+ // Homing
+ /// If the projectile is homing. Warning - this changes projectile's processing logic, reverting it to segmented processing instead of new raymarching logic
var/homing = FALSE
+ /// Target the projectile is homing on
var/atom/homing_target
- var/homing_turn_speed = 10 //Angle per tick.
- var/homing_inaccuracy_min = 0 //in pixels for these. offsets are set once when setting target.
+ /// Angles per move segment, distance is based on SSprojectiles.pixels_per_decisecond
+ /// With pixels_per_decisecond set to 16 and homing_turn_speed, the projectile can turn up to 20 pixels per turf passed
+ var/homing_turn_speed = 10
+ // Allowed leeway in pixels
+ var/homing_inaccuracy_min = 0
var/homing_inaccuracy_max = 0
var/homing_offset_x = 0
var/homing_offset_y = 0
@@ -151,17 +183,20 @@
var/damage = 10
var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY are the only things that should be in here
- ///Defines what armor to use when it hits things. Must be set to bullet, laser, energy, or bomb
+ /// Defines what armor to use when it hits things. Must be set to bullet, laser, energy, or bomb
var/armor_flag = BULLET
- ///How much armor this projectile pierces.
+ /// How much armor this projectile pierces.
var/armour_penetration = 0
- ///Whether or not our projectile doubles the value of affecting armour
+ /// Whether or not our projectile doubles the value of affecting armour
var/weak_against_armour = FALSE
- var/projectile_type = /obj/projectile
- var/range = 50 //This will de-increment every step. When 0, it will deletze the projectile.
- var/decayedRange //stores original range
- var/reflect_range_decrease = 5 //amount of original range that falls off when reflecting, so it doesn't go forever
- var/reflectable = NONE // Can it be reflected or not?
+ /// This will de-increment every step. When 0, it will delete the projectile.
+ var/range = 50
+ /// Original range upon being fired/reflected
+ var/maximum_range
+ /// Amount of original range that falls off when reflecting, so it doesn't go forever
+ var/reflect_range_decrease = 5
+ /// If this projectile can be reflected
+ var/reflectable = FALSE
// Status effects applied on hit
var/stun = 0 SECONDS
@@ -182,59 +217,86 @@
/// Slurring applied on projectile hit
var/slur = 0 SECONDS
- var/dismemberment = 0 //The higher the number, the greater the bonus to dismembering. 0 will not dismember at all.
- var/catastropic_dismemberment = FALSE //If TRUE, this projectile deals its damage to the chest if it dismembers a limb.
- var/impact_effect_type //what type of impact effect to show when hitting something
- var/log_override = FALSE //is this type spammed enough to not log? (KAs)
- /// If true, the projectile won't cause any logging. Used for hallucinations and shit.
+ /// Damage the limb must have for it to be dismembered upon getting hit. 0 will prevent dismembering altogether
+ var/dismemberment = 0
+ /// If TRUE, this projectile deals its damage to the chest if it dismembers a limb.
+ var/catastropic_dismemberment = FALSE
+ /// Impact VFX created upon hitting something
+ var/impact_effect_type
+ /// If the act of firing this projectile does not create logs
+ var/log_override = FALSE
+ /// If true, the projectile won't cause any logging whatsoever. Used for hallucinations and shit.
var/do_not_log = FALSE
/// We ignore mobs with these factions.
var/list/ignored_factions
-
- ///If defined, on hit we create an item of this type then call hitby() on the hit target with this, mainly used for embedding items (bullets) in targets
+ /// Turf that we have registered connect_loc signal - this is done for performance, as we're moving ~a dozen turfs per tick
+ /// and registering and unregistering signal for every single one of them is stupid. Unregistering the signal from the correct turf in case we get moved by smth else is important
+ var/turf/last_tick_turf
+ /// Remaining pixel movement last tick - used for precise range calculations
+ var/pixels_moved_last_tile = 0
+ /// In order to preserve animations, projectiles are only deleted the tick *after* they impact something.
+ /// Same is applied to reaching the range limit
+ var/deletion_queued = NONE
+ /// How many ticks should we wait in queued deletion mode before qdeleting? Sometimes increased in animations
+ var/ticks_to_deletion = 1
+
+ /// If defined, on hit we create an item of this type then call hitby() on the hit target with this, mainly used for embedding items (bullets) in targets
var/shrapnel_type
- ///If we have a shrapnel_type defined, these embedding stats will be passed to the spawned shrapnel type, which will roll for embedding on the target
+ /// If we have a shrapnel_type defined, these embedding stats will be passed to the spawned shrapnel type, which will roll for embedding on the target
var/embed_type
- ///Saves embedding data
+ /// Saves embedding data
var/datum/embed_data/embed_data
- ///If TRUE, hit mobs, even if they are lying on the floor and are not our target within MAX_RANGE_HIT_PRONE_TARGETS tiles
+ /// If TRUE, hit mobs, even if they are lying on the floor and are not our target within MAX_RANGE_HIT_PRONE_TARGETS tiles
var/hit_prone_targets = FALSE
- ///if TRUE, ignores the range of MAX_RANGE_HIT_PRONE_TARGETS tiles of hit_prone_targets
+ /// If TRUE, ignores the range of MAX_RANGE_HIT_PRONE_TARGETS tiles of hit_prone_targets
var/ignore_range_hit_prone_targets = FALSE
- ///For what kind of brute wounds we're rolling for, if we're doing such a thing. Lasers obviously don't care since they do burn instead.
+ /// For what kind of brute wounds we're rolling for, if we're doing such a thing. Lasers obviously don't care since they do burn instead.
var/sharpness = NONE
- ///How much we want to drop damage per tile as it travels through the air
+ /// How much we want to drop damage per tile as it travels through the air
var/damage_falloff_tile
- ///How much we want to drop stamina damage (defined by the stamina variable) per tile as it travels through the air
+ /// How much we want to drop stamina damage (defined by the stamina variable) per tile as it travels through the air
var/stamina_falloff_tile
- ///How much we want to drop both wound_bonus and bare_wound_bonus (to a minimum of 0 for the latter) per tile, for falloff purposes
+ /// How much we want to drop both wound_bonus and bare_wound_bonus (to a minimum of 0 for the latter) per tile, for falloff purposes
var/wound_falloff_tile
- ///How much we want to drop the embed_chance value, if we can embed, per tile, for falloff purposes
+ /// How much we want to drop the embed_chance value, if we can embed, per tile, for falloff purposes
var/embed_falloff_tile
- ///How much accuracy is lost for each tile travelled
+ /// How much accuracy is lost for each tile travelled
var/accuracy_falloff = 7
- ///How much accuracy before falloff starts to matter. Formula is range - falloff * tiles travelled
+ /// How much accuracy before falloff starts to matter. Formula is range - falloff * tiles travelled
var/accurate_range = 100
- var/static/list/projectile_connections = list(COMSIG_ATOM_ENTERED = PROC_REF(on_entered))
/// If true directly targeted turfs can be hit
var/can_hit_turfs = FALSE
/obj/projectile/Initialize(mapload)
. = ..()
- decayedRange = range
- if(get_embed())
+ maximum_range = range
+ if (get_embed())
AddElement(/datum/element/embed)
- AddElement(/datum/element/connect_loc, projectile_connections)
-
add_traits(list(TRAIT_FREE_HYPERSPACE_MOVEMENT, TRAIT_FREE_HYPERSPACE_SOFTCORDON_MOVEMENT), INNATE_TRAIT)
-/obj/projectile/proc/Range()
+/obj/projectile/Destroy()
+ if (hitscan)
+ generate_hitscan_tracers()
+ STOP_PROCESSING(SSprojectiles, src)
+ firer = null
+ original = null
+ if (movement_vector)
+ QDEL_NULL(movement_vector)
+ if (beam_points)
+ QDEL_LIST(beam_points)
+ if (last_point)
+ QDEL_NULL(last_point)
+ return ..()
+
+/// Called every time a projectile passes one tile worth of movement
+/obj/projectile/proc/reduce_range()
range--
- if(wound_bonus != CANT_WOUND)
+ pixels_moved_last_tile -= ICON_SIZE_ALL
+ if(wound_falloff_tile && wound_bonus != CANT_WOUND)
wound_bonus += wound_falloff_tile
bare_wound_bonus = max(0, bare_wound_bonus + wound_falloff_tile)
- if(get_embed())
- set_embed(embed_data.generate_with_values(embed_data.embed_chance + embed_falloff_tile)) // Should be rewritten in projecitle refactor
+ if(embed_falloff_tile && get_embed())
+ set_embed(embed_data.generate_with_values(embed_data.embed_chance + embed_falloff_tile))
if(damage_falloff_tile && damage >= 0)
damage += damage_falloff_tile
if(stamina_falloff_tile && stamina >= 0)
@@ -242,26 +304,22 @@
SEND_SIGNAL(src, COMSIG_PROJECTILE_RANGE)
if(range <= 0 && loc)
- on_range()
+ if (hitscan)
+ qdel(src)
+ return
+ deletion_queued = PROJECTILE_RANGE_DELETE
if(damage_falloff_tile && damage <= 0 || stamina_falloff_tile && stamina <= 0)
- on_range()
+ if (hitscan)
+ qdel(src)
+ return
+ deletion_queued = PROJECTILE_RANGE_DELETE
-/obj/projectile/proc/on_range() //if we want there to be effects when they reach the end of their range
+/// Called next tick after the projectile reaches its maximum range so the animation has time to fully play out
+/obj/projectile/proc/on_range()
SEND_SIGNAL(src, COMSIG_PROJECTILE_RANGE_OUT)
qdel(src)
-/// Returns the string form of the def_zone we have hit.
-/mob/living/proc/check_hit_limb_zone_name(hit_zone)
- if(has_limbs)
- return hit_zone
-
-/mob/living/carbon/check_hit_limb_zone_name(hit_zone)
- if(get_bodypart(hit_zone))
- return hit_zone
- else //when a limb is missing the damage is actually passed to the chest
- return BODY_ZONE_CHEST
-
/**
* Called when the projectile hits something
*
@@ -289,21 +347,19 @@
hit_limb_zone = victim.check_hit_limb_zone_name(def_zone)
if(fired_from)
- SEND_SIGNAL(fired_from, COMSIG_PROJECTILE_ON_HIT, firer, target, angle, hit_limb_zone, blocked)
- SEND_SIGNAL(src, COMSIG_PROJECTILE_SELF_ON_HIT, firer, target, angle, hit_limb_zone, blocked)
+ SEND_SIGNAL(fired_from, COMSIG_PROJECTILE_ON_HIT, firer, target, angle, hit_limb_zone, blocked, pierce_hit)
+ SEND_SIGNAL(src, COMSIG_PROJECTILE_SELF_ON_HIT, firer, target, angle, hit_limb_zone, blocked, pierce_hit)
- if(QDELETED(src)) // in case one of the above signals deleted the projectile for whatever reason
+ if(QDELETED(src) || deletion_queued) // in case one of the above signals deleted the projectile for whatever reason
return BULLET_ACT_BLOCK
var/turf/target_turf = get_turf(target)
- var/hitx
- var/hity
if(target == original)
- hitx = target.pixel_x + p_x - 16
- hity = target.pixel_y + p_y - 16
+ impact_x = target.pixel_x + p_x - ICON_SIZE_X / 2
+ impact_y = target.pixel_y + p_y - ICON_SIZE_Y / 2
else
- hitx = target.pixel_x + rand(-8, 8)
- hity = target.pixel_y + rand(-8, 8)
+ impact_x = entry_x + movement_vector?.pixel_x * rand(0, ICON_SIZE_X / 2)
+ impact_y = entry_y + movement_vector?.pixel_y * rand(0, ICON_SIZE_Y / 2)
if(isturf(target) && hitsound_wall)
playsound(src, hitsound_wall, clamp(vol_by_damage() + (suppressed ? 0 : 20), 0, 100), TRUE, -1)
@@ -311,9 +367,9 @@
if(damage > 0 && (damage_type == BRUTE || damage_type == BURN) && iswallturf(target_turf) && prob(75))
var/turf/closed/wall/target_wall = target_turf
if(impact_effect_type && !hitscan)
- new impact_effect_type(target_wall, hitx, hity)
+ new impact_effect_type(target_wall, impact_x, impact_y)
- target_wall.add_dent(WALL_DENT_SHOT, hitx, hity)
+ target_wall.add_dent(WALL_DENT_SHOT, impact_x, impact_y)
return BULLET_ACT_HIT
if (hitsound)
@@ -321,11 +377,11 @@
if (!isliving(target))
if(impact_effect_type && !hitscan)
- new impact_effect_type(target_turf, hitx, hity)
+ new impact_effect_type(target_turf, impact_x, impact_y)
return BULLET_ACT_HIT
if((blocked >= 100 || (damage && damage_type != BRUTE)) && impact_effect_type && !hitscan)
- new impact_effect_type(target_turf, hitx, hity)
+ new impact_effect_type(target_turf, impact_x, impact_y)
var/mob/living/living_target = target
var/reagent_note
@@ -353,9 +409,20 @@
/obj/projectile/proc/vol_by_damage()
if (suppressed)
return 5
- if(!damage)
+ if (!damage)
return 50 //if the projectile doesn't do damage, play its hitsound at 50% volume
- return clamp(damage * 0.67, 30, 100)// Multiply projectile damage by 0.67, then CLAMP the value between 30 and 1
+ return clamp(damage * 0.67, 30, 100) // Multiply projectile damage by 0.67, then CLAMP the value between 30 and 1
+
+/obj/projectile/proc/firer_deleted(datum/source)
+ SIGNAL_HANDLER
+ // Shooting yourself point-blank
+ if (firer == original)
+ original = null
+ firer = null
+
+/obj/projectile/proc/original_deleted(datum/source)
+ SIGNAL_HANDLER
+ original = null
/obj/projectile/proc/on_ricochet(atom/target)
ricochets++
@@ -378,16 +445,10 @@
set_angle(get_angle(src, unlucky_sob.loc))
original = unlucky_sob
-/obj/projectile/proc/store_hitscan_collision(datum/point/point_cache)
- beam_segments[beam_index] = point_cache
- beam_index = point_cache
- beam_segments[beam_index] = null
-
/obj/projectile/Bump(atom/bumped_atom)
SEND_SIGNAL(src, COMSIG_MOVABLE_BUMP, bumped_atom)
- if(!can_hit_target(bumped_atom, bumped_atom == original, TRUE, TRUE))
- return
- impact(bumped_atom)
+ if (can_hit_target(bumped_atom, bumped_atom == original, TRUE, TRUE))
+ impact(bumped_atom)
/**
* Called when the projectile hits something
@@ -401,44 +462,58 @@
* Also, we select_target to find what to process_hit first.
*/
/obj/projectile/proc/impact(atom/target)
- if(impacted[target.weak_reference]) // never doublehit, otherwise someone may end up running into a projectile from the back
+ // Don't impact anything if we've been queued for deletion
+ if (deletion_queued)
+ return
+
+ // never doublehit, otherwise someone may end up running into a projectile from the back
+ if(impacted[target.weak_reference])
return
if(ricochets < ricochets_max && check_ricochet_flag(target) && check_ricochet(target) && target.handle_ricochet(src))
on_ricochet(target)
impacted = list() // Shoot a x-ray laser at a pair of mirrors I dare you
ignore_source_check = TRUE // Firer is no longer immune
- decayedRange = max(0, decayedRange - reflect_range_decrease)
+ maximum_range = max(0, maximum_range - reflect_range_decrease)
ricochet_chance *= ricochet_decay_chance
damage *= ricochet_decay_damage
stamina *= ricochet_decay_damage
- range = decayedRange
- if(hitscan && trajectory)
- store_hitscan_collision(trajectory.copy_to())
+ range = maximum_range
return
- var/turf/target_turf = get_turf(target)
+ last_impact_turf = get_turf(target)
// Lower accurancy/longer range tradeoff. 7 is a balanced number to use.
- def_zone = ran_zone(def_zone, clamp(accurate_range - (accuracy_falloff * get_dist(target_turf, starting)), 5, 100))
- process_hit_loop(select_target(target_turf, target))
+ def_zone = ran_zone(def_zone, clamp(accurate_range - (accuracy_falloff * get_dist(last_impact_turf, starting)), 5, 100))
+ var/impact_result = process_hit_loop(select_target(last_impact_turf, target))
+ if (impact_result == PROJECTILE_IMPACT_PASSED)
+ return
+ if (hitscan)
+ qdel(src)
+ return
+ deletion_queued = PROJECTILE_IMPACT_DELETE
/*
* Main projectile hit loop code
* As long as there are valid targets on the hit target's tile, we will loop through all the ones that we have not hit
* (and thus invalidated) and try to hit them until either no targets remain or we've been deleted.
+ * Should *never* be called directly, as impact() is the proc queueing projectiles for deletion
+ * If you need to call this directly, you should reconsider the choices that led you to this point
*/
/obj/projectile/proc/process_hit_loop(atom/target)
SHOULD_NOT_SLEEP(TRUE)
- SHOULD_NOT_OVERRIDE(TRUE)
+ PRIVATE_PROC(TRUE)
+
+ // Don't impact anything if we've been queued for deletion
+ if (deletion_queued)
+ return PROJECTILE_IMPACT_PASSED
var/turf/target_turf = get_turf(target)
- while (target && !QDELETED(src))
+ while (target && !QDELETED(src) && !deletion_queued)
// Doublehitting can be an issue with slow projectiles or when the server is chugging
impacted[WEAKREF(target)] = TRUE
var/mode = prehit_pierce(target)
if(mode == PROJECTILE_DELETE_WITHOUT_HITTING)
- qdel(src)
- return
+ return PROJECTILE_IMPACT_INTERRUPTED
// If we've phasing through a target, first set ourselves as phasing and then try to locate a new one
if(mode == PROJECTILE_PIERCE_PHASE)
@@ -449,26 +524,22 @@
continue
if (SEND_SIGNAL(target, COMSIG_PROJECTILE_PREHIT, src) & PROJECTILE_INTERRUPT_HIT)
- qdel(src)
- return
+ return PROJECTILE_IMPACT_INTERRUPTED
if (SEND_SIGNAL(src, COMSIG_PROJECTILE_SELF_PREHIT, target) & PROJECTILE_INTERRUPT_HIT)
- qdel(src)
- return
+ return PROJECTILE_IMPACT_INTERRUPTED
if(mode == PROJECTILE_PIERCE_HIT)
pierces += 1
// Targets should handle their impact logic on our own and if they decide that we hit them, they call our on_hit
- var/result = target.bullet_act(src, def_zone, mode == PROJECTILE_PIERCE_HIT)
+ var/result = target.projectile_hit(src, def_zone, mode == PROJECTILE_PIERCE_HIT)
if (result != BULLET_ACT_FORCE_PIERCE && max_pierces && pierces >= max_pierces)
- qdel(src)
- return
+ return PROJECTILE_IMPACT_SUCCESSFUL
// If we're not piercing or phasing, delete ourselves
if (result != BULLET_ACT_FORCE_PIERCE && mode != PROJECTILE_PIERCE_HIT && mode != PROJECTILE_PIERCE_PHASE)
- qdel(src)
- return
+ return PROJECTILE_IMPACT_SUCCESSFUL
// We've piercing though this one, go look for a new target
if(!(movement_type & PHASING))
@@ -477,13 +548,14 @@
target = select_target(target_turf, target)
+ return PROJECTILE_IMPACT_PASSED
+
/**
* Selects a target to hit from a turf
*
* @params
- * T - The turf
- * target - The "preferred" atom to hit, usually what we Bumped() first.
- * bumped - used to track if something is the reason we impacted in the first place.
+ * our_turf - Turf on which we hit the target
+ * bumped - What we've impacted and why this selection was called in the first place.
* If set, this atom is always treated as dense by can_hit_target.
*
* Priority:
@@ -523,8 +595,8 @@
// 6. nothing
// (returns null)
-//Returns true if the target atom is on our current turf and above the right layer
-//If direct target is true it's the originally clicked target.
+/// Returns true if the target atom is on our current turf and above the right layer
+/// If direct target is true it's the originally clicked target.
/obj/projectile/proc/can_hit_target(atom/target, direct_target = FALSE, ignore_loc = FALSE, cross_failed = FALSE)
if(QDELETED(target) || impacted[target.weak_reference])
return FALSE
@@ -538,7 +610,7 @@
var/mob/living/living_target = target
living_target.block_projectile_effects()
return FALSE
- if(!ignore_source_check && firer)
+ if(!ignore_source_check && firer && !direct_target)
if(target == firer || (target == firer.loc && ismecha(firer.loc)) || (target in firer.buckled_mobs))
return FALSE
if(ismob(firer))
@@ -568,7 +640,7 @@
return FALSE
if(hit_prone_targets)
var/mob/living/buckled_to = living_target.lowest_buckled_mob()
- if((decayedRange - range) <= MAX_RANGE_HIT_PRONE_TARGETS) // after MAX_RANGE_HIT_PRONE_TARGETS tiles, auto-aim hit for mobs on the floor turns off
+ if((maximum_range - range) <= MAX_RANGE_HIT_PRONE_TARGETS) // after MAX_RANGE_HIT_PRONE_TARGETS tiles, auto-aim hit for mobs on the floor turns off
return TRUE
if(ignore_range_hit_prone_targets) // doesn't apply to projectiles that must hit the target in combat mode or something else, no matter what
return TRUE
@@ -579,19 +651,6 @@
return FALSE
return TRUE
-/**
- * Scan if we should hit something and hit it if we need to
- * The difference between this and handling in impact is
- * In this we strictly check if we need to impact() something in specific
- * If we do, we do
- * We don't even check if it got hit already - impact() does that
- * In impact there's more code for selecting WHAT to hit
- * So this proc is more of checking if we should hit something at all BY having an atom cross us.
- */
-/obj/projectile/proc/scan_crossed_hit(atom/movable/crossed_atom)
- if(can_hit_target(crossed_atom, direct_target = (crossed_atom == original)))
- impact(crossed_atom)
-
/**
* Scans if we should hit something on the turf we just moved to if we haven't already
*
@@ -619,14 +678,15 @@
*/
/obj/projectile/proc/on_entered(datum/source, atom/movable/entered_atom)
SIGNAL_HANDLER
- scan_crossed_hit(entered_atom)
+ if(can_hit_target(entered_atom, direct_target = (entered_atom == original)))
+ impact(entered_atom)
/**
* Projectile can pass through
* Used to not even attempt to Bump() or fail to Cross() anything we already hit.
*/
/obj/projectile/CanPassThrough(atom/blocker, movement_dir, blocker_opinion)
- return ..() || impacted[blocker.weak_reference]
+ return impacted[blocker.weak_reference] || ..()
/**
* Projectile moved:
@@ -644,7 +704,8 @@
if(temporary_unstoppable_movement)
temporary_unstoppable_movement = FALSE
movement_type &= ~PHASING
- scan_moved_turf() //mostly used for making sure we can hit a non-dense object the user directly clicked on, and for penetrating projectiles that don't bump
+ // Mostly used for making sure we can hit a non-dense object the user directly clicked on, and for penetrating projectiles that don't bump
+ scan_moved_turf()
/**
* Checks if we should pierce something.
@@ -674,268 +735,438 @@
/obj/projectile/proc/check_ricochet_flag(atom/target)
if((armor_flag in list(ENERGY, LASER)) && (target.flags_ricochet & RICOCHET_SHINY))
return TRUE
-
if((armor_flag in list(BOMB, BULLET)) && (target.flags_ricochet & RICOCHET_HARD))
return TRUE
-
return FALSE
-/obj/projectile/proc/return_predicted_turf_after_moves(moves, forced_angle) //I say predicted because there's no telling that the projectile won't change direction/location in flight.
- if(!trajectory && isnull(forced_angle) && isnull(angle))
- return FALSE
- var/datum/point/vector/current = trajectory
- if(!current)
- var/turf/T = get_turf(src)
- current = new(T.x, T.y, T.z, pixel_x, pixel_y, isnull(forced_angle)? angle : forced_angle, SSprojectiles.global_pixel_speed)
- var/datum/point/vector/v = current.return_vector_after_increments(moves * SSprojectiles.global_iterations_per_move)
- return v.return_turf()
-
-/obj/projectile/proc/return_pathing_turfs_in_moves(moves, forced_angle)
- var/turf/current = get_turf(src)
- var/turf/ending = return_predicted_turf_after_moves(moves, forced_angle)
- return get_line(current, ending)
-
/obj/projectile/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
return TRUE //Bullets don't drift in space
-/obj/projectile/process()
- last_process = world.time
- if(!loc || !fired || !trajectory)
- fired = FALSE
- return PROCESS_KILL
- if(paused || !isturf(loc))
- last_projectile_move += world.time - last_process //Compensates for pausing, so it doesn't become a hitscan projectile when unpaused from charged up ticks.
- return
- var/elapsed_time_deciseconds = (world.time - last_projectile_move) + time_offset
- time_offset = 0
- var/required_moves = speed > 0? FLOOR(elapsed_time_deciseconds / speed, 1) : MOVES_HITSCAN //Would be better if a 0 speed made hitscan but everyone hates those so I can't make it a universal system :<
- if(required_moves == MOVES_HITSCAN)
- required_moves = SSprojectiles.global_max_tick_moves
- else
- if(required_moves > SSprojectiles.global_max_tick_moves)
- var/overrun = required_moves - SSprojectiles.global_max_tick_moves
- required_moves = SSprojectiles.global_max_tick_moves
- time_offset += overrun * speed
- time_offset += MODULUS(elapsed_time_deciseconds, speed)
- SEND_SIGNAL(src, COMSIG_PROJECTILE_BEFORE_MOVE)
- for(var/i in 1 to required_moves)
- pixel_move(pixel_speed_multiplier, FALSE)
-
/obj/projectile/proc/fire(fire_angle, atom/direct_target)
LAZYINITLIST(impacted)
- if(fired_from)
+ if (fired_from)
SEND_SIGNAL(fired_from, COMSIG_PROJECTILE_BEFORE_FIRE, src, original)
- if(firer)
+ if (firer)
RegisterSignal(firer, COMSIG_QDELETING, PROC_REF(firer_deleted))
SEND_SIGNAL(firer, COMSIG_PROJECTILE_FIRER_BEFORE_FIRE, src, fired_from, original)
if (original)
if (firer != original)
RegisterSignal(original, COMSIG_QDELETING, PROC_REF(original_deleted))
- if(!log_override && firer && original && !do_not_log)
+ if (!log_override && firer && original && !do_not_log)
log_combat(firer, original, "fired at", src, "from [get_area_name(src, TRUE)]")
//note: mecha projectile logging is handled in /obj/item/mecha_parts/mecha_equipment/weapon/action(). try to keep these messages roughly the sameish just for consistency's sake.
- if(direct_target && (get_dist(direct_target, get_turf(src)) <= 1)) // point blank shots
- process_hit_loop(direct_target)
- if(QDELETED(src))
+ if (direct_target && (get_dist(direct_target, get_turf(src)) <= 1)) // point blank shots
+ impact(direct_target)
+ if (QDELETED(src))
return
var/turf/starting = get_turf(src)
- if(isnum(fire_angle))
+ if (isnum(fire_angle))
set_angle(fire_angle)
- else if(isnull(angle)) //Try to resolve through offsets if there's no angle set.
- if(isnull(xo) || isnull(yo))
+ else if (isnull(angle)) //Try to resolve through offsets if there's no angle set.
+ if (isnull(xo) || isnull(yo))
stack_trace("WARNING: Projectile [type] deleted due to being unable to resolve a target after angle was null!")
qdel(src)
return
var/turf/target = locate(clamp(starting + xo, 1, world.maxx), clamp(starting + yo, 1, world.maxy), starting.z)
set_angle(get_angle(src, target))
- if(spread)
+ if (spread)
set_angle(angle + (rand() - 0.5) * spread)
original_angle = angle
- trajectory_ignore_forcemove = TRUE
+ movement_vector = new(speed, angle)
+ if (hitscan)
+ beam_points = list()
+ free_hitscan_forceMove = TRUE
forceMove(starting)
- trajectory_ignore_forcemove = FALSE
- trajectory = new(starting.x, starting.y, starting.z, pixel_x, pixel_y, angle, SSprojectiles.global_pixel_speed)
last_projectile_move = world.time
fired = TRUE
play_fov_effect(starting, 6, "gunfire", dir = NORTH, angle = angle)
SEND_SIGNAL(src, COMSIG_PROJECTILE_FIRE)
- if(hitscan)
+ if (hitscan && !deletion_queued)
+ record_hitscan_start()
process_hitscan()
- if(QDELETED(src))
+ if (QDELETED(src))
return
- if(!(datum_flags & DF_ISPROCESSING))
+ if (!(datum_flags & DF_ISPROCESSING))
START_PROCESSING(SSprojectiles, src)
- pixel_move(pixel_speed_multiplier, FALSE) //move it now!
+ // move it now to avoid potentially hitting yourself with firer-hitting projectiles
+ if (!deletion_queued && !hitscan)
+ process_movement(max(FLOOR(speed, 1), 1), tile_limit = TRUE)
-/obj/projectile/proc/set_angle(new_angle) //wrapper for overrides.
+/// Makes projectile home onto the passed target with minor inaccuracy
+/obj/projectile/proc/set_homing_target(atom/target)
+ if(!target || (!isturf(target) && !isturf(target.loc)))
+ return FALSE
+ homing = TRUE
+ homing_target = target
+ homing_offset_x = rand(homing_inaccuracy_min, homing_inaccuracy_max)
+ homing_offset_y = rand(homing_inaccuracy_min, homing_inaccuracy_max)
+ if(prob(50))
+ homing_offset_x = -homing_offset_x
+ if(prob(50))
+ homing_offset_y = -homing_offset_y
+
+/obj/projectile/proc/set_angle(new_angle)
+ if (angle == new_angle)
+ return
if(!nondirectional_sprite)
transform = transform.TurnTo(angle, new_angle)
angle = new_angle
- if(trajectory)
- trajectory.set_angle(new_angle)
- if(fired && hitscan && isloc(loc) && (loc != last_angle_set_hitscan_store))
- last_angle_set_hitscan_store = loc
- var/datum/point/point_cache = new (src)
- point_cache = trajectory.copy_to()
- store_hitscan_collision(point_cache)
- return TRUE
-
-/obj/projectile/proc/firer_deleted(datum/source)
- SIGNAL_HANDLER
- // Shooting yourself point-blank
- if (firer == original)
- original = null
- firer = null
-
-/obj/projectile/proc/original_deleted(datum/source)
- SIGNAL_HANDLER
- original = null
+ if(movement_vector)
+ movement_vector.set_angle(new_angle)
+ if(fired && hitscan && isturf(loc))
+ create_hitscan_point()
/// Same as set_angle, but the reflection continues from the center of the object that reflects it instead of the side
-/obj/projectile/proc/set_angle_centered(new_angle)
+/obj/projectile/proc/set_angle_centered(center_turf, new_angle)
+ if (angle == new_angle)
+ return
if(!nondirectional_sprite)
transform = transform.TurnTo(angle, new_angle)
+ free_hitscan_forceMove = TRUE
+ forceMove(center_turf)
+ entry_x = 0
+ entry_y = 0
angle = new_angle
- if(trajectory)
- trajectory.set_angle(new_angle)
+ if(movement_vector)
+ movement_vector.set_angle(new_angle)
+ if(fired && hitscan && isturf(loc))
+ create_hitscan_point(tile_center = TRUE)
- var/list/coordinates = trajectory.return_coordinates()
- trajectory.set_location(coordinates[1], coordinates[2], coordinates[3]) // Sets the trajectory to the center of the tile it bounced at
+/obj/projectile/vv_edit_var(var_name, var_value)
+ if(var_name == NAMEOF(src, angle))
+ set_angle(var_value)
+ return TRUE
+ return ..()
- if(fired && hitscan && isloc(loc) && (loc != last_angle_set_hitscan_store)) // Handles hitscan projectiles
- last_angle_set_hitscan_store = loc
- var/datum/point/point_cache = new (src)
- point_cache.initialize_location(coordinates[1], coordinates[2], coordinates[3]) // Take the center of the hitscan collision tile
- store_hitscan_collision(point_cache)
- return TRUE
+/*
+ * Projectile's process calculates the amount of pixels that it needs to move per tick and calls moveloop processing
+ * There is a strict cap on how many pixels it can move in a tick to prevent them from turning into hitscans during lag
+ * Path that the projectile could not finish would be stored in the overrun variable to be processed next tick
+ */
-/obj/projectile/forceMove(atom/target)
- if(!isloc(target) || !isloc(loc) || !z)
- return ..()
- var/zc = target.z != z
- var/old = loc
- if(zc)
- before_z_change(old, target)
- . = ..()
- if(QDELETED(src)) // we coulda bumped something
+/obj/projectile/process()
+ last_process = world.time
+ if(!loc || !fired || !movement_vector)
+ fired = FALSE
+ return PROCESS_KILL
+
+ // If last tick the projectile impacted something or reached its range, don't process it
+ if (deletion_queued == PROJECTILE_IMPACT_DELETE)
+ ticks_to_deletion -= 1
+ if (!ticks_to_deletion)
+ qdel(src)
return
- if(trajectory && !trajectory_ignore_forcemove && isturf(target))
- if(hitscan)
- finalize_hitscan_and_generate_tracers(FALSE)
- trajectory.initialize_location(target.x, target.y, target.z, 0, 0)
- if(hitscan)
- record_hitscan_start(RETURN_PRECISE_POINT(src))
- if(zc)
- after_z_change(old, target)
-
-/obj/projectile/proc/after_z_change(atom/olcloc, atom/newloc)
- return
-/obj/projectile/proc/before_z_change(atom/oldloc, atom/newloc)
- return
+ if (deletion_queued == PROJECTILE_RANGE_DELETE)
+ on_range()
+ return
-/obj/projectile/vv_edit_var(var_name, var_value)
- switch(var_name)
- if(NAMEOF(src, angle))
- set_angle(var_value)
- return TRUE
- else
- return ..()
+ if(paused || !isturf(loc))
+ // Compensates for pausing, so it doesn't become a hitscan projectile when unpaused from charged up ticks.
+ last_projectile_move = last_process
+ return
-/obj/projectile/proc/set_pixel_speed(new_speed)
- if(trajectory)
- trajectory.set_speed(new_speed)
- return TRUE
- return FALSE
+ if (hitscan)
+ process_hitscan()
+ return
-/obj/projectile/proc/record_hitscan_start(datum/point/point_cache)
- if(point_cache)
- beam_segments = list()
- beam_index = point_cache
- beam_segments[beam_index] = null //record start.
+ // Calculates how many pixels should be moved this tick, including overrun debt from the previous tick
+ var/elapsed_time = world.time - last_projectile_move
+ var/pixels_to_move = elapsed_time * SSprojectiles.pixels_per_decisecond * speed + overrun
+ overrun = 0
-/obj/projectile/proc/process_hitscan()
- var/safety = range * 10
- record_hitscan_start(RETURN_POINT_VECTOR_INCREMENT(src, angle, MUZZLE_EFFECT_PIXEL_INCREMENT, 1))
- while(loc && !QDELETED(src))
- if(paused)
- stoplag(1)
- continue
- if(safety-- <= 0)
- if(loc)
- Bump(loc)
- if(!QDELETED(src))
- qdel(src)
- return //Kill!
- pixel_move(1, TRUE)
- // No kevinz I do not care that this is a hitscan weapon, it is not allowed to travel 100 turfs in a tick
- if(CHECK_TICK && QDELETED(src))
- return
+ if (pixels_to_move > SSprojectiles.max_pixels_per_tick)
+ overrun = pixels_to_move - SSprojectiles.max_pixels_per_tick
+ pixels_to_move = SSprojectiles.max_pixels_per_tick
+
+ overrun += MODULUS(pixels_to_move, 1)
+ pixels_to_move = FLOOR(pixels_to_move, 1)
+ SEND_SIGNAL(src, COMSIG_PROJECTILE_BEFORE_MOVE)
+
+ // Registering turf entries is done here instead of a connect_loc because else it could be called multiple times per tick and waste performance
+ if (last_tick_turf)
+ UnregisterSignal(last_tick_turf, COMSIG_ATOM_ENTERED)
-/obj/projectile/proc/pixel_move(trajectory_multiplier, hitscanning = FALSE)
- if(!loc || !trajectory)
+ process_movement(pixels_to_move)
+
+ if (!QDELETED(src) && !deletion_queued && isturf(loc))
+ RegisterSignal(loc, COMSIG_ATOM_ENTERED, PROC_REF(on_entered))
+ last_tick_turf = loc
+
+/*
+ * Main projectile movement cycle.
+ * Normal behavior moves projectiles in a straight line through tiles, but it gets trickier with homing.
+ * Every pixels_per_decisecond we will stop and call process_homing(), which while a bit rough, does not have a significant performance impact
+ * This proc needs to be very performant, so do not add overridable logic that can be handled in homing or animations here.
+ *
+ * pixels_to_move determines how many pixels the projectile should move
+ * hitscan prevents animation logic from running
+ * tile_limit prevents any movements past the first tile change
+ */
+/obj/projectile/proc/process_movement(pixels_to_move, hitscan = FALSE, tile_limit = FALSE)
+ if (!isturf(loc) || !movement_vector)
return
+ var/total_move_distance = pixels_to_move
last_projectile_move = world.time
- if(homing)
- process_homing()
- var/forcemoved = FALSE
- for(var/i in 1 to SSprojectiles.global_iterations_per_move)
- if(QDELETED(src))
- return
- trajectory.increment(trajectory_multiplier)
- var/turf/cur_turf = trajectory.return_turf()
- if(!istype(cur_turf))
- // step back to the last valid turf before we Destroy
- trajectory.increment(-trajectory_multiplier)
+ while (pixels_to_move > 0 && isturf(loc) && !QDELETED(src) && !deletion_queued)
+ // Because pixel_x/y represents offset and not actual visual position of the projectile, we add 16 pixels to each and cut the excess because projectiles are not meant to be highly offset by default
+ var/pixel_x_actual = pixel_x + ICON_SIZE_X / 2
+ if(pixel_x_actual > ICON_SIZE_X)
+ pixel_x_actual = pixel_x_actual % ICON_SIZE_X
+
+ var/pixel_y_actual = pixel_y + ICON_SIZE_Y / 2
+ if(pixel_y_actual > ICON_SIZE_Y)
+ pixel_y_actual = pixel_y_actual % ICON_SIZE_Y
+
+ var/distance_to_border = INFINITY
+ // What distances do we need to move to hit the horizontal/vertical turf border
+ var/x_to_border = INFINITY
+ var/y_to_border = INFINITY
+ // If we're moving strictly up/down/left/right then one of these can be 0 and produce div by zero
+ if (movement_vector.pixel_x)
+ var/x_border_dist = -pixel_x_actual
+ if (movement_vector.pixel_x > 0)
+ x_border_dist = ICON_SIZE_X - pixel_x_actual
+ x_to_border = x_border_dist / movement_vector.pixel_x
+ distance_to_border = x_to_border
+
+ if (movement_vector.pixel_y)
+ var/y_border_dist = -pixel_y_actual
+ if (movement_vector.pixel_y > 0)
+ y_border_dist = ICON_SIZE_Y - pixel_y_actual
+ y_to_border = y_border_dist / movement_vector.pixel_y
+ distance_to_border = min(distance_to_border, y_to_border)
+
+ // Something went extremely wrong
+ if (distance_to_border == INFINITY)
+ stack_trace("WARNING: Projectile had an empty movement vector and tried to process")
qdel(src)
return
- if (cur_turf == loc)
- continue
- if (cur_turf.z == loc.z)
- step_towards(src, cur_turf)
- hitscan_last = loc
- SEND_SIGNAL(src, COMSIG_PROJECTILE_PIXEL_STEP)
- continue
- var/old = loc
- before_z_change(loc, cur_turf)
- trajectory_ignore_forcemove = TRUE
- forceMove(cur_turf)
- trajectory_ignore_forcemove = FALSE
- after_z_change(old, loc)
- if(!hitscanning)
- pixel_x = trajectory.return_px()
- pixel_y = trajectory.return_py()
- forcemoved = TRUE
- hitscan_last = loc
- SEND_SIGNAL(src, COMSIG_PROJECTILE_PIXEL_STEP)
- if(QDELETED(src)) //deleted on last move
- return
- if(!hitscanning && !forcemoved)
- pixel_x = trajectory.return_px() - trajectory.mpx * trajectory_multiplier * SSprojectiles.global_iterations_per_move
- pixel_y = trajectory.return_py() - trajectory.mpy * trajectory_multiplier * SSprojectiles.global_iterations_per_move
- animate(src, pixel_x = trajectory.return_px(), pixel_y = trajectory.return_py(), time = 1, flags = ANIMATION_END_NOW)
- Range()
-/obj/projectile/proc/process_homing() //may need speeding up in the future performance wise.
+ var/distance_to_move = min(distance_to_border, pixels_to_move)
+ // For homing we cap the maximum distance to move every loop
+ if (homing && distance_to_move > SSprojectiles.pixels_per_decisecond)
+ distance_to_move = SSprojectiles.pixels_per_decisecond
+
+ // Figure out if we move to the next turf and if so, what its positioning relatively to us is
+ var/x_shift = distance_to_move >= x_to_border ? SIGN(movement_vector.pixel_x) : 0
+ var/y_shift = distance_to_move >= y_to_border ? SIGN(movement_vector.pixel_y) : 0
+ var/moving_turfs = x_shift || y_shift
+ // Calculate where in the turf we will be when we cross the edge.
+ // This is a projectile variable because its also used in hit VFX
+ entry_x = pixel_x + movement_vector.pixel_x * distance_to_move - x_shift * ICON_SIZE_X
+ entry_y = pixel_y + movement_vector.pixel_y * distance_to_move - y_shift * ICON_SIZE_Y
+ var/delete_distance = 0
+
+ if (moving_turfs)
+ var/turf/new_turf = locate(x + x_shift, y + y_shift, z)
+ // We've hit an invalid turf, end of a z level or smth went wrong
+ if (!istype(new_turf))
+ qdel(src)
+ return
+
+ // Move to the next tile
+ step_towards(src, new_turf)
+ SEND_SIGNAL(src, COMSIG_PROJECTILE_MOVE_PROCESS_STEP)
+ // We hit something and got deleted, stop the loop
+ if (QDELETED(src))
+ return
+ if (loc != new_turf)
+ moving_turfs = FALSE
+ // If we've impacted something, we need to animate our movement until the actual hit
+ // Otherwise the projectile visually disappears slightly before the actual impact
+ if (deletion_queued)
+ // distance_to_move is how much we have to step to get to the next turf, hypotenuse is how much we need
+ // to move in the next turf to get from entry to impact position
+ delete_distance = distance_to_move + sqrt((impact_x - entry_x) ** 2 + (impact_y - entry_y) ** 2)
+
+ // We cannot move more than one turf worth of distance per loop, so this is a safe solution
+ pixels_moved_last_tile += distance_to_move
+ if (!deletion_queued && pixels_moved_last_tile >= ICON_SIZE_ALL)
+ reduce_range()
+ if (QDELETED(src))
+ return
+ // Similarly with range out deletion, need to calculate how many pixels we can actually move before deleting
+ if (deletion_queued)
+ delete_distance = distance_to_move - (ICON_SIZE_ALL - pixels_moved_last_tile)
+
+ if (deletion_queued)
+ // We moved to the next turf first, then impacted something
+ // This means that we need to offset our visual position back to the previous turf, then figure out
+ // how much we moved on the next turf (or we didn't move at all in which case we both shifts are 0 anyways)
+ if (moving_turfs)
+ pixel_x -= x_shift * ICON_SIZE_X
+ pixel_y -= y_shift * ICON_SIZE_Y
+
+ // Similarly to normal animate code, but use lowered deletion distance instead.
+ var/delete_x = pixel_x + movement_vector.pixel_x * delete_distance
+ var/delete_y = pixel_y + movement_vector.pixel_y * delete_distance
+ // In order to keep a consistent speed, calculate at what point between ticks we get deleted
+ var/animate_time = world.tick_lag * delete_distance / total_move_distance
+ // Sometimes we need to move *just a bit* more than we can afford this tick - in this case, delete a tick after
+ // so we don't disappear before impact. This shouldn't be more than 1, ever.
+ if (delete_distance > pixels_to_move)
+ ticks_to_deletion += 1
+ // We can use animation chains to visually disappear between ticks.
+ if (!move_animate(delete_x, delete_y, animate_time, deleting = TRUE))
+ animate(src, pixel_x = delete_x, pixel_y = delete_y, time = animate_time, flags = ANIMATION_PARALLEL | ANIMATION_CONTINUE)
+ animate(alpha = 0, time = 0, flags = ANIMATION_CONTINUE)
+ return
+
+ pixels_to_move -= distance_to_move
+ // animate() instantly changes pixel_x/y values and just interpolates them client-side so next loop processes properly
+ if (hitscan)
+ pixel_x = entry_x
+ pixel_y = entry_y
+ else
+ // We need to shift back to the tile we were on before moving
+ pixel_x -= x_shift * ICON_SIZE_X
+ pixel_y -= y_shift * ICON_SIZE_Y
+ if (!move_animate(entry_x, entry_y))
+ animate(src, pixel_x = entry_x, pixel_y = entry_y, time = world.tick_lag * distance_to_move / total_move_distance, flags = ANIMATION_PARALLEL | ANIMATION_CONTINUE)
+
+ // Homing caps our movement speed per loop while leaving per tick speed intact, so we can just call process_homing every loop here
+ if (homing)
+ process_homing()
+
+ // We've hit a timestop field, abort any remaining movement
+ if (paused)
+ return
+
+ // Prevents long-range high-speed projectiles from ruining the server performance by moving 100 tiles per tick when subsystem is set to a high cap
+ if (TICK_CHECK)
+ // If we ran out of time, add whatever distance we're yet to pass to overrun debt to be processed next tick and break the loop
+ overrun += pixels_to_move
+ return
+
+ if (tile_limit && moving_turfs)
+ return
+
+/// Called every time projectile animates its movement, in case child wants to have custom animations.
+/// Returning TRUE cancels normal animation
+/obj/projectile/proc/move_animate(animate_x, animate_y, animate_time = world.tick_lag, deleting = FALSE)
+ return FALSE
+
+/// Called every projectile loop for homing or alternatively, custom trajectory changes.
+/obj/projectile/proc/process_homing()
if(!homing_target)
- return FALSE
+ return
var/datum/point/new_point = RETURN_PRECISE_POINT(homing_target)
new_point.x += clamp(homing_offset_x, 1, world.maxx)
new_point.y += clamp(homing_offset_y, 1, world.maxy)
var/new_angle = closer_angle_difference(angle, angle_between_points(RETURN_PRECISE_POINT(src), new_point))
set_angle(angle + clamp(new_angle, -homing_turn_speed, homing_turn_speed))
-/obj/projectile/proc/set_homing_target(atom/target)
- if(!target || (!isturf(target) && !isturf(target.loc)))
- return FALSE
- homing = TRUE
- homing_target = target
- homing_offset_x = rand(homing_inaccuracy_min, homing_inaccuracy_max)
- homing_offset_y = rand(homing_inaccuracy_min, homing_inaccuracy_max)
- if(prob(50))
- homing_offset_x = -homing_offset_x
- if(prob(50))
- homing_offset_y = -homing_offset_y
+/// Attempts to force the projectile to move until the subsystem runs out of processing time, the projectile impacts something or gets frozen by timestop
+/obj/projectile/proc/process_hitscan()
+ if (isnull(movement_vector))
+ qdel(src)
+ return
+
+ while (isturf(loc) && !QDELETED(src))
+ process_movement(ICON_SIZE_ALL, hitscan = TRUE)
+ if (TICK_CHECK || paused || QDELETED(src))
+ return
+
+/// Creates (or wipes clean) list of tracer keypoints and creates a first point.
+/obj/projectile/proc/record_hitscan_start(offset = TRUE)
+ if (isnull(beam_points))
+ beam_points = list()
+ else
+ QDEL_LIST_ASSOC(beam_points)
+ QDEL_NULL(last_point)
+ last_point = RETURN_PRECISE_POINT(src)
+ // If moving, increment its position a bit to prevent it from looking like its coming from firer's ass
+ if (offset && !isnull(movement_vector))
+ last_point.increment(movement_vector.pixel_x * MUZZLE_EFFECT_PIXEL_INCREMENT, movement_vector.pixel_y * MUZZLE_EFFECT_PIXEL_INCREMENT)
+ beam_points[last_point] = null
+
+/// Creates a new keypoint in which the tracer will split
+/obj/projectile/proc/create_hitscan_point(impact = FALSE, tile_center = FALSE, broken_segment = FALSE)
+ var/atom/handle_atom = last_impact_turf || src
+ var/atom/used_point = tile_center ? loc : src
+ var/datum/point/new_point = impact ? new /datum/point(handle_atom.x, handle_atom.y, handle_atom.z, impact_x, impact_y) : RETURN_PRECISE_POINT(used_point)
+ if (!broken_segment)
+ beam_points[last_point] = new_point
+ beam_points[new_point] = null
+ last_point = new_point
+
+/obj/projectile/forceMove(atom/target)
+ if (!hitscan || isnull(beam_points))
+ return ..()
+ create_hitscan_point()
+ . = ..()
+ if(!isturf(loc) || !isturf(target) || !z || QDELETED(src) || deletion_queued)
+ return
+ if (isnull(movement_vector) || free_hitscan_forceMove)
+ return
+ // Create firing VFX and start a new chain because we most likely got teleported
+ generate_hitscan_tracers(impact = FALSE)
+ original_angle = angle
+ record_hitscan_start(offset = FALSE)
+
+/obj/projectile/proc/generate_hitscan_tracers(impact = TRUE)
+ if (!length(beam_points))
+ return
+
+ if (impact)
+ create_hitscan_point(impact = TRUE)
+
+ if (tracer_type)
+ // Stores all turfs we've created light effects on, in order to not dupe them if we enter a reflector loop
+ // Uses an assoc list for performance reasons
+ var/list/passed_turfs = list()
+ for (var/beam_point in beam_points)
+ generate_tracer(beam_point, passed_turfs)
+
+ if (muzzle_type)
+ var/datum/point/start_point = beam_points[1]
+ var/atom/movable/muzzle_effect = new muzzle_type(loc)
+ start_point.move_atom_to_src(muzzle_effect)
+ var/matrix/matrix = new
+ matrix.Turn(original_angle)
+ muzzle_effect.transform = matrix
+ muzzle_effect.color = color
+ muzzle_effect.set_light(muzzle_flash_range, muzzle_flash_intensity, muzzle_flash_color_override || color)
+ QDEL_IN(muzzle_effect, PROJECTILE_TRACER_DURATION)
+
+ if (impact_type)
+ var/atom/movable/impact_effect = new impact_type(loc)
+ last_point.move_atom_to_src(impact_effect)
+ var/matrix/matrix = new
+ matrix.Turn(angle)
+ impact_effect.transform = matrix
+ impact_effect.color = color
+ impact_effect.set_light(impact_light_range, impact_light_intensity, impact_light_color_override || color)
+ QDEL_IN(impact_effect, PROJECTILE_TRACER_DURATION)
+
+/obj/projectile/proc/generate_tracer(datum/point/start_point, list/passed_turfs)
+ if (isnull(beam_points[start_point]))
+ return
+
+ var/datum/point/end_point = beam_points[start_point]
+ var/datum/point/midpoint = point_midpoint_points(start_point, end_point)
+ var/obj/effect/projectile/tracer/tracer_effect = new tracer_type(midpoint.return_turf())
+ tracer_effect.apply_vars(
+ angle_override = angle_between_points(start_point, end_point),
+ p_x = midpoint.pixel_x,
+ p_y = midpoint.pixel_y,
+ color_override = color,
+ scaling = pixel_length_between_points(start_point, end_point) / ICON_SIZE_ALL
+ )
+ SET_PLANE_EXPLICIT(tracer_effect, GAME_PLANE, src)
+
+ QDEL_IN(tracer_effect, PROJECTILE_TRACER_DURATION)
+
+ if (!hitscan_light_range || !hitscan_light_intensity)
+ return
+
+ var/list/turf/light_line = get_line(start_point.return_turf(), end_point.return_turf())
+ for (var/turf/light_turf as anything in light_line)
+ if (passed_turfs[light_turf])
+ continue
+ passed_turfs[light_turf] = TRUE
+ QDEL_IN(new /obj/effect/abstract/projectile_lighting(light_turf, hitscan_light_color_override || color, hitscan_light_range, hitscan_light_intensity), PROJECTILE_TRACER_DURATION)
/**
* Aims the projectile at a target.
@@ -950,29 +1181,50 @@
* - deviation: (Optional) How the trajectory should deviate from the target in degrees.
* - //Spread is FORCED!
*/
-/obj/projectile/proc/preparePixelProjectile(atom/target, atom/source, list/modifiers = null, deviation = 0)
+/obj/projectile/proc/aim_projectile(atom/target, atom/source, list/modifiers = null, deviation = 0)
if(!(isnull(modifiers) || islist(modifiers)))
- stack_trace("WARNING: Projectile [type] fired with non-list modifiers, likely was passed click params.")
+ stack_trace("WARNING: Projectile [type] fired with non-list modifiers, likely was passed click params. Modifiers were the following: [modifiers]")
modifiers = null
var/turf/source_loc = get_turf(source)
var/turf/target_loc = get_turf(target)
+
if(isnull(source_loc))
stack_trace("WARNING: Projectile [type] fired from nullspace.")
qdel(src)
return FALSE
- trajectory_ignore_forcemove = TRUE
- forceMove(source_loc)
- trajectory_ignore_forcemove = FALSE
+ if(fired)
+ stack_trace("WARNING: Projectile [type] was aimed after already being fired.")
+ qdel(src)
+ return FALSE
+ free_hitscan_forceMove = TRUE
+ forceMove(source_loc)
starting = source_loc
pixel_x = source.pixel_x
pixel_y = source.pixel_y
original = target
+
+ // Trim off excess pixel_x/y by converting them into turf offset
+ if (abs(pixel_x) > ICON_SIZE_X / 2)
+ for (var/i in 1 to floor(abs(pixel_x) + ICON_SIZE_X / 2) / ICON_SIZE_X)
+ var/turf/new_loc = get_step(source_loc, pixel_x > 0 ? EAST : WEST)
+ if (!istype(new_loc))
+ break
+ source_loc = new_loc
+ pixel_x = pixel_x % (ICON_SIZE_X / 2)
+
+ if (abs(pixel_y) > ICON_SIZE_Y / 2)
+ for (var/i in 1 to floor(abs(pixel_y) + ICON_SIZE_Y / 2) / ICON_SIZE_Y)
+ var/turf/new_loc = get_step(source_loc, pixel_y > 0 ? NORTH : SOUTH)
+ if (!istype(new_loc))
+ break
+ source_loc = new_loc
+ pixel_y = pixel_y % (ICON_SIZE_X / 2)
+
if(length(modifiers))
var/list/calculated = calculate_projectile_angle_and_pixel_offsets(source, target_loc && target, modifiers)
-
p_x = calculated[2]
p_y = calculated[3]
set_angle(calculated[1] + deviation)
@@ -1031,63 +1283,11 @@
//Calculate the "resolution" of screen based on client's view and world's icon size. This will work if the user can view more tiles than average.
var/list/screenview = view_to_pixels(user.client.view)
- var/ox = round(screenview[1] / 2) - user.client.pixel_x //"origin" x
- var/oy = round(screenview[2] / 2) - user.client.pixel_y //"origin" y
+ var/ox = round(screenview[1] * 0.5) - user.client.pixel_x //"origin" x
+ var/oy = round(screenview[2] * 0.5) - user.client.pixel_y //"origin" y
angle = ATAN2(tx - oy, ty - ox)
return list(angle, p_x, p_y)
-/obj/projectile/Destroy()
- if(hitscan)
- finalize_hitscan_and_generate_tracers()
- STOP_PROCESSING(SSprojectiles, src)
- cleanup_beam_segments()
- firer = null
- original = null
- if(trajectory)
- QDEL_NULL(trajectory)
- return ..()
-
-/obj/projectile/proc/cleanup_beam_segments()
- QDEL_LIST_ASSOC(beam_segments)
- beam_segments = list()
- QDEL_NULL(beam_index)
-
-/obj/projectile/proc/finalize_hitscan_and_generate_tracers(impacting = TRUE)
- if(trajectory && beam_index)
- var/datum/point/point_cache = trajectory.copy_to()
- beam_segments[beam_index] = point_cache
- generate_hitscan_tracers(null, null, impacting)
-
-/obj/projectile/proc/generate_hitscan_tracers(cleanup = TRUE, duration = 3, impacting = TRUE)
- if(!length(beam_segments))
- return
- if(tracer_type)
- var/tempref = REF(src)
- for(var/datum/point/beam_point in beam_segments)
- generate_tracer_between_points(beam_point, beam_segments[beam_point], tracer_type, color, duration, hitscan_light_range, hitscan_light_color_override, hitscan_light_intensity, tempref)
- if(muzzle_type && duration > 0)
- var/datum/point/beam_point = beam_segments[1]
- var/atom/movable/thing = new muzzle_type
- beam_point.move_atom_to_src(thing)
- var/matrix/matrix = new
- matrix.Turn(original_angle)
- thing.transform = matrix
- thing.color = color
- thing.set_light(muzzle_flash_range, muzzle_flash_intensity, muzzle_flash_color_override? muzzle_flash_color_override : color)
- QDEL_IN(thing, duration)
- if(impacting && impact_type && duration > 0)
- var/datum/point/beam_point = beam_segments[beam_segments[beam_segments.len]]
- var/atom/movable/thing = new impact_type
- beam_point.move_atom_to_src(thing)
- var/matrix/matrix = new
- matrix.Turn(angle)
- thing.transform = matrix
- thing.color = color
- thing.set_light(impact_light_range, impact_light_intensity, impact_light_color_override? impact_light_color_override : color)
- QDEL_IN(thing, duration)
- if(cleanup)
- cleanup_beam_segments()
-
/obj/projectile/experience_pressure_difference()
return
@@ -1126,15 +1326,11 @@
firer = hit_atom
yo = new_y - current_tile.y
xo = new_x - current_tile.x
- var/new_angle_s = angle + rand(120,240)
+ var/new_angle_s = angle + rand(120, 240)
while(new_angle_s > 180) // Translate to regular projectile degrees
new_angle_s -= 360
set_angle(new_angle_s)
-#undef MOVES_HITSCAN
-#undef MUZZLE_EFFECT_PIXEL_INCREMENT
-#undef MAX_RANGE_HIT_PRONE_TARGETS
-
/// Fire a projectile from this atom at another atom
/atom/proc/fire_projectile(projectile_type, atom/target, sound, firer, list/ignore_targets = list())
if (!isnull(sound))
@@ -1150,7 +1346,7 @@
bullet.yo = target.y - startloc.y
bullet.xo = target.x - startloc.x
bullet.original = target
- bullet.preparePixelProjectile(target, src)
+ bullet.aim_projectile(target, src)
bullet.fire()
return bullet
@@ -1167,3 +1363,6 @@
if(!isnull(embed_data) && !GLOB.embed_by_type[embed_data.type])
qdel(embed_data)
embed_data = ispath(embed) ? get_embed_by_type(armor) : embed
+
+#undef MOVES_HITSCAN
+#undef MUZZLE_EFFECT_PIXEL_INCREMENT
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 355221eab8620..edbb0535ac640 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -15,7 +15,7 @@
light_color = COLOR_SOFT_RED
ricochets_max = 50 //Honk!
ricochet_chance = 80
- reflectable = REFLECT_NORMAL
+ reflectable = TRUE
wound_bonus = -20
bare_wound_bonus = 10
@@ -45,7 +45,7 @@
impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
damage = 9
wound_bonus = -40
- speed = 1.1
+ speed = 0.9
//overclocked laser, does a bit more damage but has much higher wound power (-0 vs -20)
/obj/projectile/beam/laser/hellfire
@@ -53,7 +53,7 @@
icon_state = "hellfire"
wound_bonus = 0
damage = 30
- speed = 0.6 // higher power = faster, that's how light works right
+ speed = 1.6
light_color = "#FF969D"
/obj/projectile/beam/laser/heavylaser
diff --git a/code/modules/projectiles/projectile/bullets/_incendiary.dm b/code/modules/projectiles/projectile/bullets/_incendiary.dm
index 2e526adb05311..d5c4dc93c5bfa 100644
--- a/code/modules/projectiles/projectile/bullets/_incendiary.dm
+++ b/code/modules/projectiles/projectile/bullets/_incendiary.dm
@@ -35,7 +35,7 @@
suppressed = SUPPRESSED_VERY
damage_type = BURN
armor_flag = BOMB
- speed = 1.2
+ speed = 0.8
wound_bonus = 30
bare_wound_bonus = 30
wound_falloff_tile = -4
diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm
index 63e491e2f290d..bc64363a2d33f 100644
--- a/code/modules/projectiles/projectile/bullets/pistol.dm
+++ b/code/modules/projectiles/projectile/bullets/pistol.dm
@@ -79,7 +79,7 @@
icon_state = "smartgun"
damage = 10
embed_type = /datum/embed_data/bullet_c160smart
- speed = 2
+ speed = 0.5
homing_turn_speed = 5
homing_inaccuracy_min = 4
homing_inaccuracy_max = 10
diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm
index 4caec924625e1..1302aea9315a4 100644
--- a/code/modules/projectiles/projectile/bullets/rifle.dm
+++ b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -67,7 +67,7 @@
name = "rebar"
icon_state = "rebar"
damage = 30
- speed = 0.4
+ speed = 2.5
dismemberment = 1 //because a 1 in 100 chance to just blow someones arm off is enough to be cool but also not enough to be reliable
armour_penetration = 10
wound_bonus = -20
@@ -93,7 +93,6 @@
name = "rebar"
icon_state = "rebar"
damage = 45
- speed = 0.4
dismemberment = 2 //It's a budget sniper rifle.
armour_penetration = 20 //A bit better versus armor. Gets past anti laser armor or a vest, but doesnt wound proc on sec armor.
wound_bonus = 10
@@ -116,7 +115,7 @@
name = "zaukerite shard"
icon_state = "rebar_zaukerite"
damage = 60
- speed = 0.6
+ speed = 1.6
dismemberment = 10
damage_type = TOX
eyeblur = 5
@@ -141,7 +140,7 @@
name = "metallic hydrogen bolt"
icon_state = "rebar_hydrogen"
damage = 35
- speed = 0.6
+ speed = 1.6
projectile_piercing = PASSMOB|PASSVEHICLE
projectile_phasing = ~(PASSMOB|PASSVEHICLE)
max_pierces = 3
@@ -172,7 +171,6 @@
name = "healium bolt"
icon_state = "rebar_healium"
damage = 0
- speed = 0.4
dismemberment = 0
damage_type = BRUTE
armour_penetration = 100
@@ -199,7 +197,6 @@
name = "supermatter bolt"
icon_state = "rebar_supermatter"
damage = 0
- speed = 0.4
dismemberment = 0
damage_type = TOX
embed_type = null
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index a2c11f76d4789..3576c9e5a12d1 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -94,7 +94,7 @@
stamina = 11
sharpness = NONE
embed_type = null
- speed = 1.2
+ speed = 0.8
stamina_falloff_tile = -0.25
ricochets_max = 4
ricochet_chance = 120
@@ -106,7 +106,7 @@
/// Subtracted from the ricochet chance for each tile traveled
var/tile_dropoff_ricochet = 4
-/obj/projectile/bullet/pellet/shotgun_rubbershot/Range()
+/obj/projectile/bullet/pellet/shotgun_rubbershot/reduce_range()
if(ricochet_chance > 0)
ricochet_chance -= tile_dropoff_ricochet
. = ..()
@@ -124,7 +124,7 @@
wound_bonus = -25
bare_wound_bonus = 50
wound_falloff_tile = -10
- speed = 0.8
+ speed = 1.2
ricochet_decay_chance = 0.6
ricochet_decay_damage = 0.3
demolition_mod = 10
diff --git a/code/modules/projectiles/projectile/bullets/sniper.dm b/code/modules/projectiles/projectile/bullets/sniper.dm
index 6118d90644d9e..44caa2ebe2162 100644
--- a/code/modules/projectiles/projectile/bullets/sniper.dm
+++ b/code/modules/projectiles/projectile/bullets/sniper.dm
@@ -2,7 +2,7 @@
/obj/projectile/bullet/p50
name =".50 BMG bullet"
- speed = 0.4
+ speed = 2.5
range = 400 // Enough to travel from one corner of the Z to the opposite corner and then some.
damage = 70
paralyze = 100
@@ -87,7 +87,7 @@
name = ".50 BMG aggression dissuasion round"
icon_state = "gaussstrong"
damage = 25
- speed = 0.3
+ speed = 3
range = 16
/obj/projectile/bullet/p50/marksman
diff --git a/code/modules/projectiles/projectile/bullets/special.dm b/code/modules/projectiles/projectile/bullets/special.dm
index c1299b3bed0f0..cd1439cbb01ae 100644
--- a/code/modules/projectiles/projectile/bullets/special.dm
+++ b/code/modules/projectiles/projectile/bullets/special.dm
@@ -79,8 +79,7 @@
/obj/projectile/bullet/coin
name = "marksman coin"
icon_state = "coinshot"
- pixel_speed_multiplier = 0.333
- speed = 1
+ speed = 0.33
damage = 5
color = "#dbdd4c"
@@ -100,7 +99,7 @@
/obj/projectile/bullet/coin/Initialize(mapload, turf/the_target, mob/original_firer)
src.original_firer = original_firer
target_turf = the_target
- range = (get_dist(original_firer, target_turf) + 3) * 3 // 3 tiles past the origin (the *3 is because Range() ticks 3 times a tile because of the slower speed)
+ range = (get_dist(original_firer, target_turf) + 3) * 3 // 3 tiles past the origin (the *3 is because reduce_range() ticks 3 times a tile because of the slower speed)
. = ..()
@@ -167,7 +166,7 @@
if(Adjacent(current_turf, target_turf))
new_splitshot.fire(get_angle(current_turf, target_turf), direct_target = next_target)
else
- new_splitshot.preparePixelProjectile(next_target, get_turf(src))
+ new_splitshot.aim_projectile(next_target, get_turf(src))
new_splitshot.fire()
if(istype(next_target, /obj/projectile/bullet/coin)) // handle further splitshot checks
diff --git a/code/modules/projectiles/projectile/energy/_energy.dm b/code/modules/projectiles/projectile/energy/_energy.dm
index 8527041e86006..0985691a5fb72 100644
--- a/code/modules/projectiles/projectile/energy/_energy.dm
+++ b/code/modules/projectiles/projectile/energy/_energy.dm
@@ -4,5 +4,5 @@
damage = 0
damage_type = BURN
armor_flag = ENERGY
- reflectable = REFLECT_NORMAL
+ reflectable = TRUE
impact_effect_type = /obj/effect/temp_visual/impact_effect/energy
diff --git a/code/modules/projectiles/projectile/energy/nuclear_particle.dm b/code/modules/projectiles/projectile/energy/nuclear_particle.dm
index 6626cb9b5ed75..08c3569028664 100644
--- a/code/modules/projectiles/projectile/energy/nuclear_particle.dm
+++ b/code/modules/projectiles/projectile/energy/nuclear_particle.dm
@@ -6,7 +6,7 @@
armor_flag = ENERGY
damage_type = TOX
damage = 10
- speed = 0.4
+ speed = 2.5
hitsound = 'sound/items/weapons/emitter2.ogg'
impact_type = /obj/effect/projectile/impact/xray
var/static/list/particle_colors = list(
diff --git a/code/modules/projectiles/projectile/energy/photon.dm b/code/modules/projectiles/projectile/energy/photon.dm
index 5210737a19801..00ae9281af7b6 100644
--- a/code/modules/projectiles/projectile/energy/photon.dm
+++ b/code/modules/projectiles/projectile/energy/photon.dm
@@ -1,4 +1,4 @@
-#define MULTIPLY_PIXELSPEED 0.8
+#define MULTIPLY_SPEED 0.8
/obj/projectile/energy/photon
name = "photon bolt"
@@ -9,7 +9,6 @@
damage = 5 //It's literally a weaker tesla bolt, which is already weak. Don't worry, we'll fix that.
range = 20
speed = 1
- pixel_speed_multiplier = 1
projectile_piercing = PASSMOB
light_color = LIGHT_COLOR_DEFAULT
light_system = OVERLAY_LIGHT
@@ -44,9 +43,9 @@
if(prob(40))
new /obj/effect/hotspot(arrived)
-/obj/projectile/energy/photon/Range()
+/obj/projectile/energy/photon/reduce_range()
. = ..()
- pixel_speed_multiplier *= MULTIPLY_PIXELSPEED
+ speed *= MULTIPLY_SPEED
/obj/projectile/energy/photon/on_range()
do_sparks(rand(4, 9), FALSE, src)
@@ -55,4 +54,4 @@
flashed_mob.flash_act()
return ..()
-#undef MULTIPLY_PIXELSPEED
+#undef MULTIPLY_SPEED
diff --git a/code/modules/projectiles/projectile/energy/tesla.dm b/code/modules/projectiles/projectile/energy/tesla.dm
index 9dfe043a01565..91677dab2fc8d 100644
--- a/code/modules/projectiles/projectile/energy/tesla.dm
+++ b/code/modules/projectiles/projectile/energy/tesla.dm
@@ -29,7 +29,7 @@
name = "tesla orb"
icon_state = "ice_1"
damage = 0
- speed = 1.5
+ speed = 0.66
var/shock_damage = 5
/obj/projectile/energy/tesla_cannon/on_hit(atom/target, blocked = 0, pierce_hit)
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 5c050bdebb6c2..1755d43de1f6b 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -238,7 +238,8 @@
/obj/projectile/magic/locker/Destroy()
locker_suck = FALSE
- RemoveElement(/datum/element/connect_loc, projectile_connections) //We do this manually so the forcemoves don't "hit" us. This behavior is kinda dumb, someone refactor this
+ if (last_tick_turf)
+ UnregisterSignal(last_tick_turf, COMSIG_ATOM_ENTERED)
for(var/atom/movable/AM in contents)
AM.forceMove(get_turf(src))
. = ..()
@@ -400,8 +401,10 @@
var/trail_icon = 'icons/effects/magic.dmi'
/// The icon state the trail uses.
var/trail_icon_state = "arrow"
+ /// Can we spawn a trail effect again?
+ COOLDOWN_DECLARE(trail_cooldown)
-/obj/projectile/magic/aoe/Range()
+/obj/projectile/magic/aoe/reduce_range()
if(trigger_range >= 1)
for(var/mob/living/nearby_guy in range(trigger_range, get_turf(src)))
if(nearby_guy.stat == DEAD)
@@ -413,38 +416,31 @@
return ..()
-/obj/projectile/magic/aoe/can_hit_target(atom/target, list/passthrough, direct_target = FALSE, ignore_loc = FALSE)
+/obj/projectile/magic/aoe/prehit_pierce(atom/target)
if(can_only_hit_target && target != original)
- return FALSE
+ return PROJECTILE_PIERCE_PHASE
return ..()
-/obj/projectile/magic/aoe/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
- . = ..()
- if(trail)
- create_trail()
-
-/// Creates and handles the trail that follows the projectile.
-/obj/projectile/magic/aoe/proc/create_trail()
- if(!trajectory)
+/obj/projectile/magic/aoe/move_animate(animate_x, animate_y, animate_time = world.tick_lag, deleting = FALSE)
+ if(!trail || !movement_vector || deleting || !COOLDOWN_FINISHED(src, trail_cooldown))
return
- var/datum/point/vector/previous = trajectory.return_vector_after_increments(1, -1)
- var/obj/effect/overlay/trail = new /obj/effect/overlay(previous.return_turf())
- trail.pixel_x = previous.return_px()
- trail.pixel_y = previous.return_py()
- trail.icon = trail_icon
- trail.icon_state = trail_icon_state
- //might be changed to temp overlay
- trail.set_density(FALSE)
- trail.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- QDEL_IN(trail, trail_lifespan)
+ var/obj/effect/overlay/trail_effect = new /obj/effect/overlay(loc)
+ trail_effect.pixel_x = pixel_x
+ trail_effect.pixel_y = pixel_y
+ trail_effect.icon = trail_icon
+ trail_effect.icon_state = trail_icon_state
+ trail_effect.set_density(FALSE)
+ trail_effect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ QDEL_IN(trail_effect, trail_lifespan)
+ COOLDOWN_START(src, trail_cooldown, trail_lifespan)
/obj/projectile/magic/aoe/lightning
name = "lightning bolt"
icon_state = "tesla_projectile" //Better sprites are REALLY needed and appreciated!~
damage = 15
damage_type = BURN
- speed = 0.3
+ speed = 3.5
/// The power of the zap itself when it electrocutes someone
var/zap_power = 2e4
@@ -513,8 +509,7 @@
name = "magic missile"
icon_state = "magicm"
range = 100
- speed = 1
- pixel_speed_multiplier = 0.2
+ speed = 0.2
trigger_range = 0
can_only_hit_target = TRUE
paralyze = 6 SECONDS
@@ -540,8 +535,7 @@
antimagic_flags = MAGIC_RESISTANCE_HOLY
ignored_factions = list(FACTION_CULT)
range = 105
- speed = 1
- pixel_speed_multiplier = 1/7
+ speed = 0.15
/obj/projectile/magic/aoe/juggernaut/on_hit(atom/target, blocked = 0, pierce_hit)
. = ..()
diff --git a/code/modules/projectiles/projectile/special/curse.dm b/code/modules/projectiles/projectile/special/curse.dm
index 5f1f1017e836e..8d1030c8c93ef 100644
--- a/code/modules/projectiles/projectile/special/curse.dm
+++ b/code/modules/projectiles/projectile/special/curse.dm
@@ -10,7 +10,7 @@
damage_type = BURN
damage = 10
paralyze = 20
- speed = 2
+ speed = 0.5
range = 16
var/datum/beam/arm
var/handedness = 0
diff --git a/code/modules/projectiles/projectile/special/temperature.dm b/code/modules/projectiles/projectile/special/temperature.dm
index 43d7968b9ae72..ce95ff585e07e 100644
--- a/code/modules/projectiles/projectile/special/temperature.dm
+++ b/code/modules/projectiles/projectile/special/temperature.dm
@@ -36,6 +36,13 @@
icon_state = "lava"
temperature = 100 // Raise the body temp by 100 points
+/obj/projectile/temp/hot/on_hit(atom/target, blocked = FALSE, pierce_hit)
+ . = ..()
+
+ if(isliving(target))
+ var/mob/living/living_target = target
+ living_target.adjust_wet_stacks(-10)
+
/obj/projectile/temp/cryo
name = "cryo beam"
range = 9
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 7716784e4b438..7bf1c06541f38 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -90,10 +90,14 @@
for(var/obj/item/target in src)
if((target in component_parts) || target == beaker)
continue
- to_process["[target.name]"] += 1
+ var/amount = 1
+ if (isstack(target))
+ var/obj/item/stack/target_stack = target
+ amount = target_stack.amount
+ to_process["[target.name]"] += amount
total_weight += target.w_class
if(to_process.len)
- . += span_notice("Currently holding.")
+ . += span_notice("Currently holding:")
for(var/target_name as anything in to_process)
. += span_notice("[to_process[target_name]] [target_name]")
. += span_notice("Filled to [round((total_weight / maximum_weight) * 100)]% capacity.")
diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
index 7866b2eb37f14..ce344aa8dc0c0 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
@@ -183,7 +183,7 @@
. = ..()
drinker.set_dizzy_if_lower(10 SECONDS * REM * seconds_per_tick)
drinker.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
- drinker.AdjustSleeping(-40 * REM * seconds_per_tick)
+ drinker.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
if(!HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE))
drinker.set_jitter_if_lower(10 SECONDS)
@@ -231,7 +231,7 @@
/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
. = ..()
drinker.adjust_drowsiness(-14 SECONDS * REM * seconds_per_tick)
- drinker.AdjustSleeping(-40 * REM * seconds_per_tick)
+ drinker.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
drinker.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, drinker.get_body_temp_normal())
if(!HAS_TRAIT(drinker, TRAIT_ALCOHOL_TOLERANCE))
drinker.set_jitter_if_lower(10 SECONDS)
@@ -1411,7 +1411,7 @@
if(52 to 201)
drinker.Sleeping(100 * REM * seconds_per_tick)
if(202 to INFINITY)
- drinker.AdjustSleeping(40 * REM * seconds_per_tick)
+ drinker.AdjustSleeping(4 SECONDS * REM * seconds_per_tick)
if(drinker.adjustToxLoss(2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
index 2cbf4c3ecf778..93f3c41e64df5 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
@@ -278,7 +278,7 @@
. = ..()
affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
- affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
//310.15 is the normal bodytemp.
affected_mob.adjust_bodytemperature(25 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, 0, affected_mob.get_body_temp_normal())
if(holder.has_reagent(/datum/reagent/consumable/frostoil))
@@ -300,7 +300,7 @@
affected_mob.adjust_dizzy(-4 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_drowsiness(-2 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_jitter(-6 SECONDS * REM * seconds_per_tick)
- affected_mob.AdjustSleeping(-20 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-2 SECONDS * REM * seconds_per_tick)
if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick))
if(affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
@@ -377,7 +377,7 @@
. = ..()
affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
- affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
/datum/reagent/consumable/hot_ice_coffee
@@ -398,7 +398,7 @@
. = ..()
affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
- affected_mob.AdjustSleeping(-60 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-6 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_bodytemperature(-7 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
if(affected_mob.adjustToxLoss(1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
@@ -416,7 +416,7 @@
. = ..()
affected_mob.adjust_dizzy(-4 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_drowsiness(-2 SECONDS * REM * seconds_per_tick)
- affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
if(affected_mob.getToxLoss() && SPT_PROB(10, seconds_per_tick))
if(affected_mob.adjustToxLoss(-1 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
. = UPDATE_MOB_HEALTH
@@ -529,7 +529,7 @@
affected_mob.set_jitter_if_lower(40 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_dizzy(2 SECONDS * REM * seconds_per_tick)
affected_mob.remove_status_effect(/datum/status_effect/drowsiness)
- affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
/datum/reagent/consumable/spacemountainwind
@@ -543,7 +543,7 @@
/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
affected_mob.adjust_drowsiness(-14 SECONDS * REM * seconds_per_tick)
- affected_mob.AdjustSleeping(-20 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-2 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
affected_mob.set_jitter_if_lower(10 SECONDS * REM * seconds_per_tick)
@@ -642,7 +642,7 @@
. = ..()
affected_mob.adjust_dizzy(-10 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
- affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
/datum/reagent/consumable/wellcheers
@@ -680,7 +680,7 @@
affected_mob.set_jitter_if_lower(80 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_dizzy(2 SECONDS * REM * seconds_per_tick)
affected_mob.remove_status_effect(/datum/status_effect/drowsiness)
- affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_bodytemperature(-5 * REM * TEMPERATURE_DAMAGE_COEFFICIENT * seconds_per_tick, affected_mob.get_body_temp_normal())
/datum/reagent/consumable/monkey_energy/on_mob_metabolize(mob/living/affected_mob)
@@ -1257,7 +1257,7 @@
return
affected_mob.set_silence_if_lower(MIMEDRINK_SILENCE_DURATION)
affected_mob.adjust_drowsiness(-6 SECONDS * REM * seconds_per_tick)
- affected_mob.AdjustSleeping(-40 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-4 SECONDS * REM * seconds_per_tick)
if(affected_mob.getToxLoss() && SPT_PROB(25, seconds_per_tick))
if(affected_mob.adjustToxLoss(-2 * REM * seconds_per_tick, updating_health = FALSE, required_biotype = affected_biotype))
return UPDATE_MOB_HEALTH
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 61836a49163e0..28c299c87f0af 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -832,7 +832,7 @@
if(kronkaine_fiend.adjustOrganLoss(ORGAN_SLOT_HEART, 0.4 * REM * seconds_per_tick, required_organ_flag = affected_organ_flags))
. = UPDATE_MOB_HEALTH
kronkaine_fiend.set_jitter_if_lower(20 SECONDS * REM * seconds_per_tick)
- kronkaine_fiend.AdjustSleeping(-20 * REM * seconds_per_tick)
+ kronkaine_fiend.AdjustSleeping(-2 SECONDS * REM * seconds_per_tick)
kronkaine_fiend.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick)
if(volume < 10)
return
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index d6fef868831d7..da743f9656352 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -646,7 +646,7 @@
overdose_threshold = 30
ph = 8.96
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
- addiction_types = list(/datum/addiction/opioids = 10)
+ addiction_types = list(/datum/addiction/opioids = 20) // 30 units of morphine may cause addition
metabolized_traits = list(TRAIT_ANALGESIA)
/datum/reagent/medicine/morphine/on_mob_metabolize(mob/living/affected_mob)
@@ -661,13 +661,28 @@
. = ..()
if(current_cycle > 5)
affected_mob.add_mood_event("numb", /datum/mood_event/narcotic_medium, name)
+ if(affected_mob.disgust < DISGUST_LEVEL_VERYGROSS && SPT_PROB(50 * (2 - creation_purity), seconds_per_tick))
+ affected_mob.adjust_disgust(1.5 * REM * seconds_per_tick)
+
switch(current_cycle)
- if(12)
- to_chat(affected_mob, span_warning("You start to feel tired...") )
- if(13 to 25)
- affected_mob.adjust_drowsiness(2 SECONDS * REM * seconds_per_tick)
- if(25 to INFINITY)
- affected_mob.Sleeping(40 * REM * seconds_per_tick)
+ if(16) //~3u
+ to_chat(affected_mob, span_warning("You start to feel tired..."))
+ affected_mob.adjust_eye_blur(2 SECONDS * REM * seconds_per_tick)
+ if(SPT_PROB(66, seconds_per_tick))
+ affected_mob.emote("yawn")
+
+ if(24 to 36) // 5u to 7.5u
+ if(SPT_PROB(66 * (2 - creation_purity), seconds_per_tick))
+ affected_mob.adjust_drowsiness_up_to(2 SECONDS * REM * seconds_per_tick, 12 SECONDS)
+
+ if(36 to 48) // 7.5u to 10u
+ affected_mob.adjust_drowsiness_up_to(2 SECONDS * REM * seconds_per_tick, 12 SECONDS)
+
+ if(48 to INFINITY) //10u onward
+ affected_mob.adjust_drowsiness_up_to(3 SECONDS * REM * seconds_per_tick, 20 SECONDS)
+ // doesn't scale from purity - at this point it tries to guarantee sleep
+ if(SPT_PROB(30 * (48 - current_cycle), seconds_per_tick))
+ affected_mob.Sleeping(4 SECONDS * REM * seconds_per_tick)
/datum/reagent/medicine/morphine/overdose_process(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
@@ -1184,7 +1199,7 @@
/datum/reagent/medicine/insulin/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- affected_mob.AdjustSleeping(-20 * REM * seconds_per_tick)
+ affected_mob.AdjustSleeping(-2 SECONDS * REM * seconds_per_tick)
holder.remove_reagent(/datum/reagent/consumable/sugar, 3 * REM * seconds_per_tick)
//Trek Chems, used primarily by medibots. Only heals a specific damage type, but is very efficient.
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 2941e5ecd7d08..af160235c4dcc 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -3096,11 +3096,11 @@
. = ..()
if(affected_mob.mob_biotypes & MOB_UNDEAD || HAS_MIND_TRAIT(affected_mob, TRAIT_MORBID)) //if morbid or undead,acts like an addiction-less drug
affected_mob.remove_status_effect(/datum/status_effect/jitter)
- affected_mob.AdjustStun(-50 * REM * seconds_per_tick)
- affected_mob.AdjustKnockdown(-50 * REM * seconds_per_tick)
- affected_mob.AdjustUnconscious(-50 * REM * seconds_per_tick)
- affected_mob.AdjustParalyzed(-50 * REM * seconds_per_tick)
- affected_mob.AdjustImmobilized(-50 * REM * seconds_per_tick)
+ affected_mob.AdjustStun(-5 SECONDS * REM * seconds_per_tick)
+ affected_mob.AdjustKnockdown(-5 SECONDS * REM * seconds_per_tick)
+ affected_mob.AdjustUnconscious(-5 SECONDS * REM * seconds_per_tick)
+ affected_mob.AdjustParalyzed(-5 SECONDS * REM * seconds_per_tick)
+ affected_mob.AdjustImmobilized(-5 SECONDS * REM * seconds_per_tick)
else
if(affected_mob.adjustOrganLoss(ORGAN_SLOT_HEART, REM * seconds_per_tick)) //1 heart damage per tick
. = UPDATE_MOB_HEALTH
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index 0814834b25a51..f331dcfbab740 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -578,7 +578,7 @@
required_reagents = list(/datum/reagent/teslium = 1, /datum/reagent/water = 1)
strengthdiv = 100
modifier = -100
- mix_message = span_boldannounce("The teslium starts to spark as electricity arcs away from it!")
+ mix_message = span_bolddanger("The teslium starts to spark as electricity arcs away from it!")
mix_sound = 'sound/machines/defib/defib_zap.ogg'
var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_LOW_POWER_GEN
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_EXPLOSIVE | REACTION_TAG_DANGEROUS
@@ -640,4 +640,4 @@
/datum/chemical_reaction/reagent_explosion/patriotism_overload
required_reagents = list(/datum/reagent/consumable/ethanol/planet_cracker = 1, /datum/reagent/consumable/ethanol/triumphal_arch = 1)
strengthdiv = 20
- mix_message = span_boldannounce("The two patriotic drinks instantly reject each other!")
+ mix_message = span_bolddanger("The two patriotic drinks instantly reject each other!")
diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm
index 241dfd7c6f89f..841539fa0cc55 100644
--- a/code/modules/reagents/reagent_containers/cups/drinks.dm
+++ b/code/modules/reagents/reagent_containers/cups/drinks.dm
@@ -31,11 +31,11 @@
qdel(src)
target.Bumped(B)
-/obj/item/reagent_containers/cup/glass/bullet_act(obj/projectile/P)
+/obj/item/reagent_containers/cup/glass/bullet_act(obj/projectile/proj)
. = ..()
if(QDELETED(src))
return
- if(P.damage > 0 && P.damage_type == BRUTE)
+ if(proj.damage > 0 && proj.damage_type == BRUTE)
var/atom/T = get_turf(src)
smash(T)
diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm
index a23e9c323545b..c9380d2b9b9c1 100644
--- a/code/modules/reagents/reagent_containers/cups/soda.dm
+++ b/code/modules/reagents/reagent_containers/cups/soda.dm
@@ -76,17 +76,17 @@
return TRUE
return ..()
-/obj/item/reagent_containers/cup/soda_cans/bullet_act(obj/projectile/P)
+/obj/item/reagent_containers/cup/soda_cans/bullet_act(obj/projectile/proj)
. = ..()
if(QDELETED(src))
return
- if(P.damage > 0 && P.damage_type == BRUTE)
- var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc)
- crushed_can.icon_state = icon_state
- var/atom/throw_target = get_edge_target_turf(crushed_can, pick(GLOB.alldirs))
- crushed_can.throw_at(throw_target, rand(1,2), 7)
- qdel(src)
+ if(!proj.damage || proj.damage_type != BRUTE)
return
+ var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(loc)
+ crushed_can.icon_state = icon_state
+ var/atom/throw_target = get_edge_target_turf(crushed_can, pick(GLOB.alldirs))
+ crushed_can.throw_at(throw_target, rand(1,2), 7)
+ qdel(src)
/obj/item/reagent_containers/cup/soda_cans/proc/open_soda(mob/user)
if(prob(fizziness))
@@ -138,7 +138,7 @@
burst_soda(hit_atom, hide_message = TRUE)
visible_message(span_danger("[src]'s impact with [hit_atom] causes it to rupture, spilling everywhere!"))
- var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(src.loc)
+ var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(loc)
crushed_can.icon_state = icon_state
moveToNullspace()
QDEL_IN(src, 1 SECONDS) // give it a second so it can still be logged for the throw impact
diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm
index 40e203dcb3456..29cfadd745b3e 100644
--- a/code/modules/reagents/reagent_containers/patch.dm
+++ b/code/modules/reagents/reagent_containers/patch.dm
@@ -11,20 +11,21 @@
self_delay = 30 // three seconds
dissolvable = FALSE
-/obj/item/reagent_containers/pill/patch/attack(mob/living/L, mob/user)
- if(ishuman(L))
- var/obj/item/bodypart/affecting = L.get_bodypart(check_zone(user.zone_selected))
- if(!affecting)
- to_chat(user, span_warning("The limb is missing!"))
- return
- if(!IS_ORGANIC_LIMB(affecting))
- to_chat(user, span_notice("Medicine won't work on an inorganic limb!"))
- return
- ..()
-
/obj/item/reagent_containers/pill/patch/canconsume(mob/eater, mob/user)
if(!iscarbon(eater))
return FALSE
+ if(!ishuman(eater))
+ return TRUE
+ var/mob/living/carbon/human/human_eater = eater
+ var/obj/item/bodypart/affecting = human_eater.get_bodypart(check_zone(user.zone_selected))
+ if(!affecting)
+ to_chat(user, span_warning("The limb is missing!"))
+ return FALSE
+
+ if(!IS_ORGANIC_LIMB(affecting))
+ to_chat(user, span_notice("Medicine won't work on an inorganic limb!"))
+ return FALSE
+
return TRUE // Masks were stopping people from "eating" patches. Thanks, inheritance.
/obj/item/reagent_containers/pill/patch/libital
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 629e0e96937db..f407a75030a65 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -25,27 +25,6 @@
if(apply_type == INGEST)
AddComponent(/datum/component/germ_sensitive, mapload)
-/obj/item/reagent_containers/pill/attack(mob/M, mob/user, def_zone)
- if(!canconsume(M, user))
- return FALSE
-
- if(M == user)
- M.visible_message(span_notice("[user] attempts to [apply_method] [src]."))
- if(self_delay)
- if(!do_after(user, self_delay, M))
- return FALSE
- to_chat(M, span_notice("You [apply_method] [src]."))
-
- else
- M.visible_message(span_danger("[user] attempts to force [M] to [apply_method] [src]."), \
- span_userdanger("[user] attempts to force you to [apply_method] [src]."))
- if(!do_after(user, CHEM_INTERACT_DELAY(3 SECONDS, user), M))
- return FALSE
- M.visible_message(span_danger("[user] forces [M] to [apply_method] [src]."), \
- span_userdanger("[user] forces you to [apply_method] [src]."))
-
- return on_consumption(M, user)
-
///Runs the consumption code, can be overriden for special effects
/obj/item/reagent_containers/pill/proc/on_consumption(mob/consumer, mob/giver)
if(icon_state == "pill4" && prob(5)) //you take the red pill - you stay in Wonderland, and I show you how deep the rabbit hole goes
@@ -56,15 +35,35 @@
if(reagents.total_volume)
reagents.trans_to(consumer, reagents.total_volume, transferred_by = giver, methods = apply_type)
qdel(src)
- return TRUE
-
/obj/item/reagent_containers/pill/interact_with_atom(atom/target, mob/living/user, list/modifiers)
+ if (ismob(target))
+ var/mob/target_mob = target
+ if(!canconsume(target_mob, user))
+ return ITEM_INTERACT_BLOCKING
+ if(target_mob == user)
+ target_mob.visible_message(span_notice("[user] attempts to [apply_method] [src]."))
+ if(self_delay)
+ if(!do_after(user, self_delay, target_mob))
+ return ITEM_INTERACT_BLOCKING
+ to_chat(target_mob, span_notice("You [apply_method] [src]."))
+ else
+ target_mob.visible_message(span_danger("[user] attempts to force [target_mob] to [apply_method] [src]."), \
+ span_userdanger("[user] attempts to force you to [apply_method] [src]."))
+ if(!do_after(user, CHEM_INTERACT_DELAY(3 SECONDS, user), target_mob))
+ return ITEM_INTERACT_BLOCKING
+ target_mob.visible_message(span_danger("[user] forces [target_mob] to [apply_method] [src]."), \
+ span_userdanger("[user] forces you to [apply_method] [src]."))
+ on_consumption(target_mob, user)
+ return ITEM_INTERACT_SUCCESS
+
if(!dissolvable || !target.is_refillable())
return NONE
+
if(target.is_drainable() && !target.reagents.total_volume)
to_chat(user, span_warning("[target] is empty! There's nothing to dissolve [src] in."))
return ITEM_INTERACT_BLOCKING
+
if(target.reagents.holder_full())
to_chat(user, span_warning("[target] is full."))
return ITEM_INTERACT_BLOCKING
@@ -277,10 +276,9 @@
if(prob(30))
desc = pick(descs)
-/obj/item/reagent_containers/pill/maintenance/achievement/on_consumption(mob/M, mob/user)
+/obj/item/reagent_containers/pill/maintenance/achievement/on_consumption(mob/consumer, mob/user)
. = ..()
-
- M.client?.give_award(/datum/award/score/maintenance_pill, M)
+ consumer.client?.give_award(/datum/award/score/maintenance_pill, consumer)
/obj/item/reagent_containers/pill/potassiodide
name = "potassium iodide pill"
diff --git a/code/modules/religion/sparring/sparring_datum.dm b/code/modules/religion/sparring/sparring_datum.dm
index 8e01403e5a64c..fc128a401cc31 100644
--- a/code/modules/religion/sparring/sparring_datum.dm
+++ b/code/modules/religion/sparring/sparring_datum.dm
@@ -227,9 +227,9 @@
cleanup_sparring_match()
if(chaplain) //flubing means we don't know who is still standing
- to_chat(chaplain, span_boldannounce("The match was flub'd! No winners, no losers. You may restart the match with another contract."))
+ to_chat(chaplain, span_bolddanger("The match was flub'd! No winners, no losers. You may restart the match with another contract."))
if(opponent)
- to_chat(opponent, span_boldannounce("The match was flub'd! No winners, no losers."))
+ to_chat(opponent, span_bolddanger("The match was flub'd! No winners, no losers."))
qdel(src)
///helper to remove all the effects after a match ends
@@ -243,8 +243,8 @@
/datum/sparring_match/proc/end_match(mob/living/carbon/human/winner, mob/living/carbon/human/loser, violation_victory = FALSE)
cleanup_sparring_match()
- to_chat(chaplain, span_boldannounce("[violation_victory ? "[loser] DISQUALIFIED!" : ""] [winner] HAS WON!"))
- to_chat(opponent, span_boldannounce("[violation_victory ? "[loser] DISQUALIFIED!" : ""] [winner] HAS WON!"))
+ to_chat(chaplain, span_bolddanger("[violation_victory ? "[loser] DISQUALIFIED!" : ""] [winner] HAS WON!"))
+ to_chat(opponent, span_bolddanger("[violation_victory ? "[loser] DISQUALIFIED!" : ""] [winner] HAS WON!"))
win(winner, loser, violation_victory)
lose(loser, winner)
if(stakes_condition != STAKES_YOUR_SOUL)
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 3aaa99e5ae04b..56764318f1b85 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -1046,6 +1046,18 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE
+/datum/design/bluespace_fish_tank
+ name = "Bluespace Fish Tank Kit"
+ desc = "The required components to upgrade the capacity of a fish tank."
+ id = "bluespace_fish_tank_kit"
+ build_type = PROTOLATHE | AWAY_LATHE
+ materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 3, /datum/material/titanium = SMALL_MATERIAL_AMOUNT, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3)
+ build_path = /obj/item/aquarium_upgrade/bluespace_tank
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_SERVICE,
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE
+
// Coffeemaker Stuff
/datum/design/coffeepot
diff --git a/code/modules/research/designs/power_designs.dm b/code/modules/research/designs/power_designs.dm
index deb2256ff10f0..38edc5b5593a7 100644
--- a/code/modules/research/designs/power_designs.dm
+++ b/code/modules/research/designs/power_designs.dm
@@ -167,10 +167,12 @@
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
-/datum/design/board/bioelec_gen
+/datum/design/bioelec_gen
name = "Aquarium Bioelectricity Kit"
desc = "The required components to convert an aquarium into a bioelectricity generator."
id = "bioelec_gen"
+ build_type = PROTOLATHE | AWAY_LATHE
+ materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/gold = SMALL_MATERIAL_AMOUNT)
build_path = /obj/item/aquarium_upgrade/bioelec_gen
category = list(
RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_ENGINEERING,
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 998995436ad52..c78ca6601d414 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -363,7 +363,7 @@
visible_message(span_danger("[src] dangerously overheats, launching a flaming fuel orb!"))
investigate_log("Experimentor has launched a fireball at [M]!", INVESTIGATE_EXPERIMENTOR)
var/obj/projectile/magic/fireball/FB = new /obj/projectile/magic/fireball(start)
- FB.preparePixelProjectile(MT, start)
+ FB.aim_projectile(MT, start)
FB.fire()
else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_danger("[src] malfunctions, melting [exp_on] and releasing a burst of flame!"))
diff --git a/code/modules/research/techweb/nodes/service_nodes.dm b/code/modules/research/techweb/nodes/service_nodes.dm
index a2f6b03007109..824cd611b837d 100644
--- a/code/modules/research/techweb/nodes/service_nodes.dm
+++ b/code/modules/research/techweb/nodes/service_nodes.dm
@@ -174,6 +174,7 @@
"auto_reel",
"fish_analyzer",
"bluespace_fish_case",
+ "bluespace_fish_tank_kit",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
required_experiments = list(/datum/experiment/scanning/fish)
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index fc6d236f96a25..66cbd4b93de5b 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -1,22 +1,20 @@
//Xenobio control console
-/mob/eye/ai_eye/remote/xenobio
- visible_icon = TRUE
- icon = 'icons/mob/eyemob.dmi'
- icon_state = "generic_camera"
+/mob/eye/camera/remote/xenobio
+ visible_to_user = TRUE
var/allowed_area = null
-/mob/eye/ai_eye/remote/xenobio/Initialize(mapload)
+/mob/eye/camera/remote/xenobio/Initialize(mapload)
var/area/our_area = get_area(loc)
allowed_area = our_area.name
. = ..()
-/mob/eye/ai_eye/remote/xenobio/setLoc(turf/destination, force_update = FALSE)
+/mob/eye/camera/remote/xenobio/setLoc(turf/destination, force_update = FALSE)
var/area/new_area = get_area(destination)
if(new_area && new_area.name == allowed_area || new_area && (new_area.area_flags & XENOBIOLOGY_COMPATIBLE))
return ..()
-/mob/eye/ai_eye/remote/xenobio/can_z_move(direction, turf/start, turf/destination, z_move_flags = NONE, mob/living/rider)
+/mob/eye/camera/remote/xenobio/can_z_move(direction, turf/start, turf/destination, z_move_flags = NONE, mob/living/rider)
. = ..()
if(!.)
return
@@ -84,11 +82,9 @@
stored_slimes -= gone
/obj/machinery/computer/camera_advanced/xenobio/CreateEye()
- eyeobj = new /mob/eye/ai_eye/remote/xenobio(get_turf(src))
- eyeobj.origin = src
- eyeobj.visible_icon = TRUE
- eyeobj.icon = 'icons/mob/eyemob.dmi'
- eyeobj.icon_state = "generic_camera"
+ eyeobj = new /mob/eye/camera/remote/xenobio(get_turf(src), src)
+
+ return TRUE
/obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/user)
. = ..()
@@ -151,7 +147,7 @@ Boilerplate check for a valid area to perform a camera action in.
Checks if the AI eye is on a valid turf and then checks if the target turf is xenobiology compatible
Due to keyboard shortcuts, the second one is not necessarily the remote eye's location.
*/
-/obj/machinery/computer/camera_advanced/xenobio/proc/validate_area(mob/living/user, mob/eye/ai_eye/remote/xenobio/remote_eye, turf/open/target_turf)
+/obj/machinery/computer/camera_advanced/xenobio/proc/validate_area(mob/living/user, mob/eye/camera/remote/xenobio/remote_eye, turf/open/target_turf)
if(!GLOB.cameranet.checkTurfVis(remote_eye.loc))
to_chat(user, span_warning("Target is not near a camera. Cannot proceed."))
return FALSE
@@ -228,7 +224,7 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
if(!target || !isliving(owner))
return
var/mob/living/owner_mob = owner
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = owner_mob.remote_control
+ var/mob/eye/camera/remote/xenobio/remote_eye = owner_mob.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = target
if(!xeno_console.validate_area(owner, remote_eye, remote_eye.loc))
@@ -245,7 +241,7 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
if(!target || !isliving(owner))
return
var/mob/living/owner_mob = owner
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = owner_mob.remote_control
+ var/mob/eye/camera/remote/xenobio/remote_eye = owner_mob.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = target
if(!xeno_console.validate_area(owner, remote_eye, remote_eye.loc))
@@ -264,7 +260,7 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
if(!target || !isliving(owner))
return
var/mob/living/living_owner = owner
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = living_owner.remote_control
+ var/mob/eye/camera/remote/xenobio/remote_eye = living_owner.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = target
if(!xeno_console.validate_area(owner, remote_eye, remote_eye.loc))
@@ -282,7 +278,7 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
if(!target || !isliving(owner))
return
var/mob/living/owner_mob = owner
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = owner_mob.remote_control
+ var/mob/eye/camera/remote/xenobio/remote_eye = owner_mob.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = target
var/obj/machinery/monkey_recycler/recycler = xeno_console.connected_recycler
@@ -305,7 +301,7 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
if(!target || !isliving(owner))
return
var/mob/living/owner_mob = owner
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = owner_mob.remote_control
+ var/mob/eye/camera/remote/xenobio/remote_eye = owner_mob.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = target
if(!xeno_console.validate_area(owner, remote_eye, remote_eye.loc))
@@ -324,7 +320,7 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
return
var/mob/living/owner_mob = owner
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = owner_mob.remote_control
+ var/mob/eye/camera/remote/xenobio/remote_eye = owner_mob.remote_control
var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = target
if(!xeno_console.validate_area(owner, remote_eye, remote_eye.loc))
@@ -375,8 +371,8 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
if(!isslime(target_slime))
return
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = user.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin
+ var/mob/eye/camera/remote/xenobio/remote_eye = user.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin_ref.resolve()
if(!xeno_console.validate_area(user, remote_eye, target_slime.loc))
return
@@ -391,8 +387,8 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
/obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickShift(mob/living/user, mob/living/basic/slime/target_slime)
SIGNAL_HANDLER
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = user.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin
+ var/mob/eye/camera/remote/xenobio/remote_eye = user.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin_ref.resolve()
if(!xeno_console.validate_area(user, remote_eye, target_slime.loc))
return
@@ -404,8 +400,8 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
SIGNAL_HANDLER
var/mob/living/user_mob = user
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = user_mob.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin
+ var/mob/eye/camera/remote/xenobio/remote_eye = user_mob.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin_ref.resolve()
if(!xeno_console.validate_area(user, remote_eye, target_turf))
return
@@ -430,8 +426,8 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
return
var/cleanup = FALSE
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = user.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin
+ var/mob/eye/camera/remote/xenobio/remote_eye = user.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin_ref.resolve()
if(!xeno_console.validate_area(user, remote_eye, target_turf))
return
@@ -449,8 +445,8 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
if(!ismonkey(target_mob))
return
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = user.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin
+ var/mob/eye/camera/remote/xenobio/remote_eye = user.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin_ref.resolve()
if(!xeno_console.connected_recycler)
to_chat(user, span_warning("There is no connected monkey recycler. Use a multitool to link one."))
@@ -466,8 +462,8 @@ Due to keyboard shortcuts, the second one is not necessarily the remote eye's lo
if(!isslime(target_slime))
return
- var/mob/eye/ai_eye/remote/xenobio/remote_eye = user.remote_control
- var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin
+ var/mob/eye/camera/remote/xenobio/remote_eye = user.remote_control
+ var/obj/machinery/computer/camera_advanced/xenobio/xeno_console = remote_eye.origin_ref.resolve()
if(!xeno_console.validate_area(user, remote_eye, target_slime.loc))
return
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index fbe528b870380..7c588e06dc005 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -107,8 +107,8 @@
shuttle_port = null
return
- eyeobj = new /mob/eye/ai_eye/remote/shuttle_docker(null, src)
- var/mob/eye/ai_eye/remote/shuttle_docker/the_eye = eyeobj
+ eyeobj = new /mob/eye/camera/remote/shuttle_docker(null, src)
+ var/mob/eye/camera/remote/shuttle_docker/the_eye = eyeobj
the_eye.setDir(shuttle_port.dir)
var/turf/origin = locate(shuttle_port.x + x_offset, shuttle_port.y + y_offset, shuttle_port.z)
for(var/area/shuttle_area as anything in shuttle_port.shuttle_areas)
@@ -125,10 +125,12 @@
I.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
the_eye.placement_images[I] = list(x_off, y_off)
+ return TRUE
+
/obj/machinery/computer/camera_advanced/shuttle_docker/give_eye_control(mob/user)
..()
if(!QDELETED(user) && user.client)
- var/mob/eye/ai_eye/remote/shuttle_docker/the_eye = eyeobj
+ var/mob/eye/camera/remote/shuttle_docker/the_eye = eyeobj
var/list/to_add = list()
to_add += the_eye.placement_images
to_add += the_eye.placed_images
@@ -141,7 +143,7 @@
/obj/machinery/computer/camera_advanced/shuttle_docker/remove_eye_control(mob/living/user)
..()
if(!QDELETED(user) && user.client)
- var/mob/eye/ai_eye/remote/shuttle_docker/the_eye = eyeobj
+ var/mob/eye/camera/remote/shuttle_docker/the_eye = eyeobj
var/list/to_remove = list()
to_remove += the_eye.placement_images
to_remove += the_eye.placed_images
@@ -155,7 +157,7 @@
if(designating_target_loc || !current_user)
return
- var/mob/eye/ai_eye/remote/shuttle_docker/the_eye = eyeobj
+ var/mob/eye/camera/remote/shuttle_docker/the_eye = eyeobj
var/landing_clear = checkLandingSpot()
if(designate_time && (landing_clear != SHUTTLE_DOCKER_BLOCKED))
to_chat(current_user, span_warning("Targeting transit location, please wait [DisplayTimeText(designate_time)]..."))
@@ -223,7 +225,7 @@
return TRUE
/obj/machinery/computer/camera_advanced/shuttle_docker/proc/rotateLandingSpot()
- var/mob/eye/ai_eye/remote/shuttle_docker/the_eye = eyeobj
+ var/mob/eye/camera/remote/shuttle_docker/the_eye = eyeobj
var/list/image_cache = the_eye.placement_images
the_eye.setDir(turn(the_eye.dir, -90))
for(var/i in 1 to image_cache.len)
@@ -239,7 +241,7 @@
checkLandingSpot()
/obj/machinery/computer/camera_advanced/shuttle_docker/proc/checkLandingSpot()
- var/mob/eye/ai_eye/remote/shuttle_docker/the_eye = eyeobj
+ var/mob/eye/camera/remote/shuttle_docker/the_eye = eyeobj
var/turf/eyeturf = get_turf(the_eye)
if(!eyeturf)
return SHUTTLE_DOCKER_BLOCKED
@@ -316,22 +318,17 @@
add_jumpable_port(dock.shuttle_id)
return TRUE
-/mob/eye/ai_eye/remote/shuttle_docker
- visible_icon = FALSE
- use_static = FALSE
+/mob/eye/camera/remote/shuttle_docker
+ use_visibility = FALSE
var/list/image/placement_images = list()
var/list/image/placed_images = list()
-/mob/eye/ai_eye/remote/shuttle_docker/Initialize(mapload, obj/machinery/computer/camera_advanced/origin)
- src.origin = origin
- return ..()
-
-/mob/eye/ai_eye/remote/shuttle_docker/setLoc(turf/destination, force_update = FALSE)
+/mob/eye/camera/remote/shuttle_docker/setLoc(turf/destination, force_update = FALSE)
. = ..()
- var/obj/machinery/computer/camera_advanced/shuttle_docker/console = origin
+ var/obj/machinery/computer/camera_advanced/shuttle_docker/console = origin_ref?.resolve()
console.checkLandingSpot()
-/mob/eye/ai_eye/remote/shuttle_docker/update_remote_sight(mob/living/user)
+/mob/eye/camera/remote/shuttle_docker/update_remote_sight(mob/living/user)
user.set_sight(BLIND|SEE_TURFS)
// Pale blue, should look nice I think
user.lighting_color_cutoffs = list(30, 40, 50)
@@ -346,8 +343,8 @@
/datum/action/innate/shuttledocker_rotate/Activate()
if(QDELETED(owner) || !isliving(owner))
return
- var/mob/eye/ai_eye/remote/remote_eye = owner.remote_control
- var/obj/machinery/computer/camera_advanced/shuttle_docker/origin = remote_eye.origin
+ var/mob/eye/camera/remote/remote_eye = owner.remote_control
+ var/obj/machinery/computer/camera_advanced/shuttle_docker/origin = remote_eye.origin_ref.resolve()
origin.rotateLandingSpot()
/datum/action/innate/shuttledocker_place
@@ -358,8 +355,8 @@
/datum/action/innate/shuttledocker_place/Activate()
if(QDELETED(owner) || !isliving(owner))
return
- var/mob/eye/ai_eye/remote/remote_eye = owner.remote_control
- var/obj/machinery/computer/camera_advanced/shuttle_docker/origin = remote_eye.origin
+ var/mob/eye/camera/remote/remote_eye = owner.remote_control
+ var/obj/machinery/computer/camera_advanced/shuttle_docker/origin = remote_eye.origin_ref.resolve()
origin.placeLandingSpot(owner)
/datum/action/innate/camera_jump/shuttle_docker
@@ -369,8 +366,8 @@
/datum/action/innate/camera_jump/shuttle_docker/Activate()
if(QDELETED(owner) || !isliving(owner))
return
- var/mob/eye/ai_eye/remote/remote_eye = owner.remote_control
- var/obj/machinery/computer/camera_advanced/shuttle_docker/console = remote_eye.origin
+ var/mob/eye/camera/remote/remote_eye = owner.remote_control
+ var/obj/machinery/computer/camera_advanced/shuttle_docker/console = remote_eye.origin_ref.resolve()
playsound(console, 'sound/machines/terminal/terminal_prompt_deny.ogg', 25, FALSE)
diff --git a/code/modules/spells/spell_types/aoe_spell/magic_missile.dm b/code/modules/spells/spell_types/aoe_spell/magic_missile.dm
index 02f19f45323c2..743ea8b23d880 100644
--- a/code/modules/spells/spell_types/aoe_spell/magic_missile.dm
+++ b/code/modules/spells/spell_types/aoe_spell/magic_missile.dm
@@ -31,7 +31,7 @@
/datum/action/cooldown/spell/aoe/magic_missile/proc/fire_projectile(atom/victim, mob/caster)
var/obj/projectile/to_fire = new projectile_type()
- to_fire.preparePixelProjectile(victim, caster)
+ to_fire.aim_projectile(victim, caster)
SEND_SIGNAL(caster, COMSIG_MOB_SPELL_PROJECTILE, src, victim, to_fire)
to_fire.fire()
diff --git a/code/modules/spells/spell_types/pointed/_pointed.dm b/code/modules/spells/spell_types/pointed/_pointed.dm
index a96e2fe9fd291..39d6fb9d6736f 100644
--- a/code/modules/spells/spell_types/pointed/_pointed.dm
+++ b/code/modules/spells/spell_types/pointed/_pointed.dm
@@ -168,7 +168,7 @@
/datum/action/cooldown/spell/pointed/projectile/proc/ready_projectile(obj/projectile/to_fire, atom/target, mob/user, iteration)
to_fire.firer = owner
to_fire.fired_from = src
- to_fire.preparePixelProjectile(target, owner)
+ to_fire.aim_projectile(target, owner)
RegisterSignal(to_fire, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(on_cast_hit))
if(istype(to_fire, /obj/projectile/magic))
diff --git a/code/modules/spells/spell_types/pointed/spell_cards.dm b/code/modules/spells/spell_types/pointed/spell_cards.dm
index 65f9561658b7b..bbaed5ad66d64 100644
--- a/code/modules/spells/spell_types/pointed/spell_cards.dm
+++ b/code/modules/spells/spell_types/pointed/spell_cards.dm
@@ -81,4 +81,4 @@
to_fire.pixel_x = rand(-projectile_location_spread_amount, projectile_location_spread_amount)
to_fire.pixel_y = rand(-projectile_location_spread_amount, projectile_location_spread_amount)
- to_fire.preparePixelProjectile(target, user, null, current_angle)
+ to_fire.aim_projectile(target, user, null, current_angle)
diff --git a/code/modules/spells/spell_types/projectile/_basic_projectile.dm b/code/modules/spells/spell_types/projectile/_basic_projectile.dm
index 343de438cd669..bcab5633eccb7 100644
--- a/code/modules/spells/spell_types/projectile/_basic_projectile.dm
+++ b/code/modules/spells/spell_types/projectile/_basic_projectile.dm
@@ -25,6 +25,6 @@
/datum/action/cooldown/spell/basic_projectile/proc/fire_projectile(atom/target, atom/caster)
var/obj/projectile/to_fire = new projectile_type()
- to_fire.preparePixelProjectile(target, caster)
+ to_fire.aim_projectile(target, caster)
SEND_SIGNAL(caster, COMSIG_MOB_SPELL_PROJECTILE, src, target, to_fire)
to_fire.fire()
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
index a5f4a0505f6fd..712c3a2901c07 100644
--- a/code/modules/surgery/organ_manipulation.dm
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -12,6 +12,47 @@
/datum/surgery_step/close,
)
+//So far, this surgery type should be the only way carbon mobs can be fishing spots, also because the comp doesn't allow dupes.
+/datum/surgery/organ_manipulation/next_step(mob/living/user, modifiers)
+ . = ..()
+ if(!.)
+ return
+
+ // We've completed the surgery
+ if(status > length(steps))
+ return
+
+ if(!ispath(steps[status], /datum/surgery_step/manipulate_organs))
+ //The manipulate_organs step either hasn't been reached yet or we're already past it.
+ if(!HAS_TRAIT(target, TRAIT_FISHING_SPOT))
+ return
+ remove_fishing_spot()
+ return
+
+ if(HAS_TRAIT(target, TRAIT_FISHING_SPOT))
+ return
+
+ target.AddComponent(/datum/component/fishing_spot, /datum/fish_source/surgery)
+
+/datum/surgery/organ_manipulation/Destroy()
+ if(QDELETED(target) || !HAS_TRAIT(target, TRAIT_FISHING_SPOT))
+ return ..()
+ // The surgery is not finished yet and we're currently on manipulate organs step
+ if(status <= length(steps) && ispath(steps[status], /datum/surgery_step/manipulate_organs))
+ remove_fishing_spot()
+ return ..()
+
+/**
+ * The target is a fishing spot, but we're past the step that allows us to fish organs from him, so we need
+ * to check if there are other organ manipulation surgeries that still meet this criteria before we remove
+ * the component
+ */
+/datum/surgery/organ_manipulation/proc/remove_fishing_spot()
+ for(var/datum/surgery/organ_manipulation/manipulation in target.surgeries)
+ if(manipulation != src && ispath(manipulation.steps[manipulation.status], /datum/surgery_step/manipulate_organs))
+ return
+ qdel(target.GetComponent(/datum/component/fishing_spot))
+
/datum/surgery/organ_manipulation/soft
possible_locs = list(BODY_ZONE_PRECISE_GROIN, BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)
steps = list(
@@ -57,7 +98,7 @@
/datum/surgery/organ_manipulation/mechanic
name = "Hardware Manipulation"
requires_bodypart_type = BODYTYPE_ROBOTIC
- surgery_flags = SURGERY_SELF_OPERABLE | SURGERY_REQUIRE_LIMB
+ surgery_flags = SURGERY_SELF_OPERABLE | SURGERY_REQUIRE_LIMB | SURGERY_CHECK_TOOL_BEHAVIOUR
possible_locs = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD)
steps = list(
/datum/surgery_step/mechanic_open,
@@ -69,32 +110,6 @@
/datum/surgery_step/mechanic_close,
)
-/datum/surgery/organ_manipulation/mechanic/next_step(mob/living/user, modifiers)
- if(location != user.zone_selected)
- return FALSE
- if(user.combat_mode)
- return FALSE
- if(step_in_progress)
- return TRUE
-
- var/try_to_fail = FALSE
- if(LAZYACCESS(modifiers, RIGHT_CLICK))
- try_to_fail = TRUE
-
- var/datum/surgery_step/step = get_surgery_step()
- if(isnull(step))
- return FALSE
- var/obj/item/tool = user.get_active_held_item()
- if(tool)
- tool = tool.get_proxy_attacker_for(target, user)
- if(step.try_op(user, target, user.zone_selected, tool, src, try_to_fail))
- return TRUE
- if(tool && tool.tool_behaviour) //Mechanic organ manipulation isn't done with just surgery tools
- to_chat(user, span_warning("This step requires a different tool!"))
- return TRUE
-
- return FALSE
-
/datum/surgery/organ_manipulation/mechanic/soft
possible_locs = list(
BODY_ZONE_PRECISE_GROIN,
@@ -176,7 +191,7 @@
to_chat(user, span_warning("[target_organ] seems to have been chewed on, you can't use this!"))
return SURGERY_STEP_FAIL
- if(!can_use_organ(user, meatslab))
+ if(!can_use_organ(meatslab))
return SURGERY_STEP_FAIL
if (target_zone == BODY_ZONE_PRECISE_EYES)
@@ -196,7 +211,7 @@
var/list/unfiltered_organs = target.get_organs_for_zone(target_zone)
var/list/organs = list()
for(var/organ in unfiltered_organs)
- if(can_use_organ(user, organ))
+ if(can_use_organ(organ))
organs.Add(organ)
if (target_zone == BODY_ZONE_PRECISE_EYES)
target_zone = check_zone(target_zone)
@@ -295,7 +310,7 @@
return ..()
///You can never use this MUHAHAHAHAHAHAH (because its the byond version of abstract)
-/datum/surgery_step/manipulate_organs/proc/can_use_organ(mob/user, obj/item/organ/organ)
+/datum/surgery_step/manipulate_organs/proc/can_use_organ(obj/item/organ/organ)
return FALSE
///Surgery step for internal organs, like hearts and brains
@@ -304,7 +319,7 @@
name = "manipulate organs (hemostat/organ)"
///only operate on internal organs
-/datum/surgery_step/manipulate_organs/internal/can_use_organ(mob/user, obj/item/organ/organ)
+/datum/surgery_step/manipulate_organs/internal/can_use_organ(obj/item/organ/organ)
return !(organ.organ_flags & ORGAN_EXTERNAL)
///prosthetic surgery gives full effectiveness to crowbars (and hemostats)
@@ -318,7 +333,7 @@
name = "manipulate features (hemostat/feature)"
///Only operate on external organs
-/datum/surgery_step/manipulate_organs/external/can_use_organ(mob/user, obj/item/organ/organ)
+/datum/surgery_step/manipulate_organs/external/can_use_organ(obj/item/organ/organ)
return (organ.organ_flags & ORGAN_EXTERNAL)
///prosthetic surgery gives full effectiveness to crowbars (and hemostats)
diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm
index e2f05a9ed5610..1f036ad3be9bb 100644
--- a/code/modules/surgery/organs/_organ.dm
+++ b/code/modules/surgery/organs/_organ.dm
@@ -85,6 +85,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
if(bodypart_overlay)
setup_bodypart_overlay()
+ START_PROCESSING(SSobj, src)
/obj/item/organ/Destroy()
if(bodypart_owner && !owner && !QDELETED(bodypart_owner))
@@ -126,10 +127,6 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
return
owner.remove_status_effect(status, type)
-/obj/item/organ/proc/on_owner_examine(datum/source, mob/user, list/examine_list)
- SIGNAL_HANDLER
- return
-
/obj/item/organ/proc/on_find(mob/living/finder)
return
@@ -140,14 +137,43 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
if(!IS_ROBOTIC_ORGAN(src) && (clean_types & CLEAN_TYPE_BLOOD))
add_blood_DNA(blood_dna_info)
-/obj/item/organ/process(seconds_per_tick, times_fired)
- return
+/obj/item/organ/proc/on_death(seconds_per_tick, times_fired) //runs decay when outside of a person
+ if(organ_flags & (ORGAN_ROBOTIC | ORGAN_FROZEN))
+ return
-/obj/item/organ/proc/on_death(seconds_per_tick, times_fired)
- return
+ if(owner)
+ if(owner.bodytemperature > T0C)
+ var/air_temperature_factor = min((owner.bodytemperature - T0C) / 20, 1)
+ apply_organ_damage(decay_factor * maxHealth * seconds_per_tick * air_temperature_factor)
+ else
+ var/datum/gas_mixture/exposed_air = return_air()
+ if(exposed_air && exposed_air.temperature > T0C)
+ var/air_temperature_factor = min((exposed_air.temperature - T0C) / 20, 1)
+ apply_organ_damage(decay_factor * maxHealth * seconds_per_tick * air_temperature_factor)
-/obj/item/organ/proc/on_life(seconds_per_tick, times_fired)
- return
+/obj/item/organ/proc/on_life(seconds_per_tick, times_fired) //repair organ damage if the organ is not failing
+ if(organ_flags & ORGAN_FAILING)
+ handle_failing_organs(seconds_per_tick)
+ return
+
+ if(failure_time > 0)
+ failure_time--
+
+ if(organ_flags & ORGAN_EMP) //Synthetic organ has been emped, is now failing.
+ apply_organ_damage(decay_factor * maxHealth * seconds_per_tick)
+ return
+
+ if(!damage) // No sense healing if you're not even hurt bro
+ return
+
+ if(IS_ROBOTIC_ORGAN(src)) // Robotic organs don't naturally heal
+ return
+
+ ///Damage decrements by a percent of its maxhealth
+ var/healing_amount = healing_factor
+ ///Damage decrements again by a percent of its maxhealth, up to a total of 4 extra times depending on the owner's health
+ healing_amount += (owner.satiety > 0) ? (4 * healing_factor * owner.satiety / MAX_SATIETY) : 0
+ apply_organ_damage(-healing_amount * maxHealth * seconds_per_tick, damage) // pass curent damage incase we are over cap
/obj/item/organ/examine(mob/user)
. = ..()
@@ -166,11 +192,14 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
///Used as callbacks by object pooling
/obj/item/organ/proc/exit_wardrobe()
- return
+ START_PROCESSING(SSobj, src)
//See above
/obj/item/organ/proc/enter_wardrobe()
- return
+ STOP_PROCESSING(SSobj, src)
+
+/obj/item/organ/process(seconds_per_tick, times_fired)
+ on_death(seconds_per_tick, times_fired) //Kinda hate doing it like this, but I really don't want to call process directly.
/obj/item/organ/proc/OnEatFrom(eater, feeder)
useable = FALSE //You can't use it anymore after eating it you spaztic
@@ -288,8 +317,14 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
ears.Insert(src)
ears.adjustEarDamage(-INFINITY, -INFINITY) // actually do: set_organ_damage(0) and deaf = 0
+///Organs don't die instantly, and neither should you when you get fucked up
/obj/item/organ/proc/handle_failing_organs(seconds_per_tick)
- return
+ if(owner.stat == DEAD)
+ return
+
+ failure_time += seconds_per_tick
+ organ_failure(seconds_per_tick)
+
/** organ_failure
* generic proc for handling dying organs
diff --git a/code/modules/surgery/organs/external/_visual_organs.dm b/code/modules/surgery/organs/external/_visual_organs.dm
index 52ed3e031cb93..682326fa26f05 100644
--- a/code/modules/surgery/organs/external/_visual_organs.dm
+++ b/code/modules/surgery/organs/external/_visual_organs.dm
@@ -213,13 +213,13 @@ Unlike normal organs, we're actually inside a persons limbs at all times
///Store our old datum here for if our antennae are healed
var/original_sprite_datum
-/obj/item/organ/antennae/mob_insert(mob/living/carbon/receiver, special, movement_flags)
+/obj/item/organ/antennae/on_mob_insert(mob/living/carbon/receiver, special, movement_flags)
. = ..()
RegisterSignal(receiver, COMSIG_HUMAN_BURNING, PROC_REF(try_burn_antennae))
RegisterSignal(receiver, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(heal_antennae))
-/obj/item/organ/antennae/mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
+/obj/item/organ/antennae/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
UnregisterSignal(organ_owner, list(COMSIG_HUMAN_BURNING, COMSIG_LIVING_POST_FULLY_HEAL))
diff --git a/code/modules/surgery/organs/external/spines.dm b/code/modules/surgery/organs/external/spines.dm
index 23c29358a0dfc..77e0f63e6b0e9 100644
--- a/code/modules/surgery/organs/external/spines.dm
+++ b/code/modules/surgery/organs/external/spines.dm
@@ -16,13 +16,13 @@
organ_flags = parent_type::organ_flags | ORGAN_EXTERNAL
-/obj/item/organ/spines/mob_insert(mob/living/carbon/receiver, special, movement_flags)
+/obj/item/organ/spines/on_mob_insert(mob/living/carbon/receiver, special, movement_flags)
// If we have a tail, attempt to add a tail spines overlay
var/obj/item/organ/tail/our_tail = receiver.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
our_tail?.try_insert_tail_spines(our_tail.bodypart_owner)
return ..()
-/obj/item/organ/spines/mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
+/obj/item/organ/spines/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
// If we have a tail, remove any tail spines overlay
var/obj/item/organ/tail/our_tail = organ_owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
our_tail?.remove_tail_spines(our_tail.bodypart_owner)
diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm
index 8b77159308c2a..2717711e45ca1 100644
--- a/code/modules/surgery/organs/external/tails.dm
+++ b/code/modules/surgery/organs/external/tails.dm
@@ -23,11 +23,10 @@
///The overlay for tail spines, if any
var/datum/bodypart_overlay/mutant/tail_spines/tail_spines_overlay
-/obj/item/organ/tail/mob_insert(mob/living/carbon/receiver, special, movement_flags)
+/obj/item/organ/tail/on_mob_insert(mob/living/carbon/receiver, special, movement_flags)
. = ..()
- if(.)
- receiver.clear_mood_event("tail_lost")
- receiver.clear_mood_event("tail_balance_lost")
+ receiver.clear_mood_event("tail_lost")
+ receiver.clear_mood_event("tail_balance_lost")
if(!special) // if some admin wants to give someone tail moodles for tail shenanigans, they can spawn it and do it by hand
original_owner ||= WEAKREF(receiver)
@@ -85,7 +84,7 @@
bodypart.remove_bodypart_overlay(tail_spines_overlay)
QDEL_NULL(tail_spines_overlay)
-/obj/item/organ/tail/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/tail/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
if(wag_flags & WAG_WAGGING)
diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm
index f773630f8bf1d..775894458349a 100644
--- a/code/modules/surgery/organs/external/wings/functional_wings.dm
+++ b/code/modules/surgery/organs/external/wings/functional_wings.dm
@@ -33,14 +33,14 @@
QDEL_NULL(fly)
return ..()
-/obj/item/organ/wings/functional/mob_insert(mob/living/carbon/receiver, special, movement_flags)
+/obj/item/organ/wings/functional/on_mob_insert(mob/living/carbon/receiver, special, movement_flags)
. = ..()
if(QDELETED(fly))
fly = new
fly.Grant(receiver)
-/obj/item/organ/wings/functional/mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
+/obj/item/organ/wings/functional/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
fly?.Remove(organ_owner)
if(wings_open)
diff --git a/code/modules/surgery/organs/internal/_internal_organ.dm b/code/modules/surgery/organs/internal/_internal_organ.dm
deleted file mode 100644
index 0527e6d79808f..0000000000000
--- a/code/modules/surgery/organs/internal/_internal_organ.dm
+++ /dev/null
@@ -1,86 +0,0 @@
-/obj/item/organ
- name = "organ"
-
-/obj/item/organ/Initialize(mapload)
- . = ..()
- START_PROCESSING(SSobj, src)
-
-/obj/item/organ/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
- . = ..()
-
- // organs_slot must ALWAYS be ordered in the same way as organ_process_order
- // Otherwise life processing breaks down
- sortTim(owner.organs_slot, GLOBAL_PROC_REF(cmp_organ_slot_asc))
-
- STOP_PROCESSING(SSobj, src)
-
-/obj/item/organ/on_mob_remove(mob/living/carbon/organ_owner, special = FALSE)
- . = ..()
-
- if((organ_flags & ORGAN_VITAL) && !special && !HAS_TRAIT(organ_owner, TRAIT_GODMODE))
- if(organ_owner.stat != DEAD)
- organ_owner.investigate_log("has been killed by losing a vital organ ([src]).", INVESTIGATE_DEATHS)
- organ_owner.death()
-
- START_PROCESSING(SSobj, src)
-
-/obj/item/organ/process(seconds_per_tick, times_fired)
- on_death(seconds_per_tick, times_fired) //Kinda hate doing it like this, but I really don't want to call process directly.
-
-/obj/item/organ/on_death(seconds_per_tick, times_fired) //runs decay when outside of a person
- if(organ_flags & (ORGAN_ROBOTIC | ORGAN_FROZEN))
- return
-
- if(owner)
- if(owner.bodytemperature > T0C)
- var/air_temperature_factor = min((owner.bodytemperature - T0C) / 20, 1)
- apply_organ_damage(decay_factor * maxHealth * seconds_per_tick * air_temperature_factor)
- else
- var/datum/gas_mixture/exposed_air = return_air()
- if(exposed_air && exposed_air.temperature > T0C)
- var/air_temperature_factor = min((exposed_air.temperature - T0C) / 20, 1)
- apply_organ_damage(decay_factor * maxHealth * seconds_per_tick * air_temperature_factor)
-
-/// Called once every life tick on every organ in a carbon's body
-/// NOTE: THIS IS VERY HOT. Be careful what you put in here
-/// To give you some scale, if there's 100 carbons in the game, they each have maybe 9 organs
-/// So that's 900 calls to this proc every life process. Please don't be dumb
-/obj/item/organ/on_life(seconds_per_tick, times_fired) //repair organ damage if the organ is not failing
- if(organ_flags & ORGAN_FAILING)
- handle_failing_organs(seconds_per_tick)
- return
-
- if(failure_time > 0)
- failure_time--
-
- if(organ_flags & ORGAN_EMP) //Synthetic organ has been emped, is now failing.
- apply_organ_damage(decay_factor * maxHealth * seconds_per_tick)
- return
-
- if(!damage) // No sense healing if you're not even hurt bro
- return
-
- if(IS_ROBOTIC_ORGAN(src)) // Robotic organs don't naturally heal
- return
-
- ///Damage decrements by a percent of its maxhealth
- var/healing_amount = healing_factor
- ///Damage decrements again by a percent of its maxhealth, up to a total of 4 extra times depending on the owner's health
- healing_amount += (owner.satiety > 0) ? (4 * healing_factor * owner.satiety / MAX_SATIETY) : 0
- apply_organ_damage(-healing_amount * maxHealth * seconds_per_tick, damage) // pass curent damage incase we are over cap
-
-///Used as callbacks by object pooling
-/obj/item/organ/exit_wardrobe()
- START_PROCESSING(SSobj, src)
-
-//See above
-/obj/item/organ/enter_wardrobe()
- STOP_PROCESSING(SSobj, src)
-
-///Organs don't die instantly, and neither should you when you get fucked up
-/obj/item/organ/handle_failing_organs(seconds_per_tick)
- if(owner.stat == DEAD)
- return
-
- failure_time += seconds_per_tick
- organ_failure(seconds_per_tick)
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
index 6a1e4272cd567..8b77ef5ec78b5 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
@@ -292,7 +292,7 @@
organ_owner.AddElement(/datum/element/forced_gravity, 1)
add_organ_trait(TRAIT_STURDY_FRAME)
-/obj/item/organ/cyberimp/chest/spine/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/cyberimp/chest/spine/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
remove_organ_trait(TRAIT_BOULDER_BREAKER)
if(stone_overlay)
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm b/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm
index d720953a24ca5..204247e4de822 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_eyes.dm
@@ -27,13 +27,13 @@
eye_owner.remove_traits(HUD_traits, ORGAN_TRAIT)
balloon_alert(eye_owner, "hud enabled")
-/obj/item/organ/cyberimp/eyes/hud/mob_insert(mob/living/carbon/eye_owner, special = FALSE, movement_flags)
+/obj/item/organ/cyberimp/eyes/hud/on_mob_insert(mob/living/carbon/eye_owner, special = FALSE, movement_flags)
. = ..()
eye_owner.add_traits(HUD_traits, ORGAN_TRAIT)
toggled_on = TRUE
-/obj/item/organ/cyberimp/eyes/hud/mob_remove(mob/living/carbon/eye_owner, special, movement_flags)
+/obj/item/organ/cyberimp/eyes/hud/on_mob_remove(mob/living/carbon/eye_owner, special, movement_flags)
. = ..()
eye_owner.remove_traits(HUD_traits, ORGAN_TRAIT)
toggled_on = FALSE
diff --git a/code/modules/surgery/organs/internal/ears/_ears.dm b/code/modules/surgery/organs/internal/ears/_ears.dm
index 850d45df016db..3443cf9249e33 100644
--- a/code/modules/surgery/organs/internal/ears/_ears.dm
+++ b/code/modules/surgery/organs/internal/ears/_ears.dm
@@ -52,7 +52,7 @@
. = ..()
update_temp_deafness()
-/obj/item/organ/ears/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/ears/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
UnregisterSignal(organ_owner, COMSIG_MOB_SAY)
REMOVE_TRAIT(organ_owner, TRAIT_DEAF, EAR_DAMAGE)
diff --git a/code/modules/surgery/organs/internal/eyes/_eyes.dm b/code/modules/surgery/organs/internal/eyes/_eyes.dm
index 2f88f2e5dea03..d63dfc6c37214 100644
--- a/code/modules/surgery/organs/internal/eyes/_eyes.dm
+++ b/code/modules/surgery/organs/internal/eyes/_eyes.dm
@@ -50,12 +50,14 @@
/// Scarring on this organ
var/scarring = NONE
-/obj/item/organ/eyes/mob_insert(mob/living/carbon/receiver, special, movement_flags)
+/obj/item/organ/eyes/on_mob_insert(mob/living/carbon/receiver, special, movement_flags)
. = ..()
receiver.cure_blind(NO_EYES)
apply_damaged_eye_effects()
refresh(receiver, call_update = TRUE)
RegisterSignal(receiver, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act))
+ if (scarring)
+ apply_scarring_effects()
/// Refreshes the visuals of the eyes
/// If call_update is TRUE, we also will call update_body
@@ -85,7 +87,7 @@
if(call_update)
affected_human.update_body()
-/obj/item/organ/eyes/mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
+/obj/item/organ/eyes/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
if(ishuman(organ_owner))
@@ -110,13 +112,17 @@
organ_owner.update_sight()
UnregisterSignal(organ_owner, COMSIG_ATOM_BULLET_ACT)
-/obj/item/organ/eyes/proc/on_bullet_act(datum/source, obj/projectile/proj, def_zone)
+/obj/item/organ/eyes/proc/on_bullet_act(mob/living/carbon/source, obj/projectile/proj, def_zone, piercing_hit, blocked)
SIGNAL_HANDLER
// Once-a-dozen-rounds level of rare
if (def_zone != BODY_ZONE_HEAD || !prob(proj.damage * 0.1) || !(proj.damage_type == BRUTE || proj.damage_type == BURN))
return
+ if (blocked && source.is_eyes_covered())
+ if (!proj.armour_penetration || prob(blocked - proj.armour_penetration))
+ return
+
var/valid_sides = list()
if (!(scarring & RIGHT_EYE_SCAR))
valid_sides += RIGHT_EYE_SCAR
@@ -270,11 +276,6 @@
owner.cure_blind(EYE_SCARRING_TRAIT)
owner.update_body()
-/obj/item/organ/eyes/on_mob_insert(mob/living/carbon/eye_owner)
- . = ..()
- if (scarring)
- apply_scarring_effects()
-
/obj/item/organ/eyes/on_mob_remove(mob/living/carbon/eye_owner)
. = ..()
if (scarring)
@@ -560,14 +561,11 @@
deactivate(close_ui = TRUE)
/// Set the initial color of the eyes on insert to be the mob's previous eye color.
-/obj/item/organ/eyes/robotic/glow/mob_insert(mob/living/carbon/eye_recipient, special = FALSE, movement_flags = DELETE_IF_REPLACED)
+/obj/item/organ/eyes/robotic/glow/on_mob_insert(mob/living/carbon/eye_recipient, special = FALSE, movement_flags)
. = ..()
left_eye_color_string = eye_color_left
right_eye_color_string = eye_color_right
update_mob_eye_color(eye_recipient)
-
-/obj/item/organ/eyes/robotic/glow/on_mob_insert(mob/living/carbon/eye_recipient)
- . = ..()
deactivate(close_ui = TRUE)
eye.forceMove(eye_recipient)
@@ -871,6 +869,6 @@
apply_organ_damage(-10) //heal quickly
. = ..()
-/obj/item/organ/eyes/night_vision/maintenance_adapted/on_mob_remove(mob/living/carbon/unadapted, special = FALSE)
+/obj/item/organ/eyes/night_vision/maintenance_adapted/on_mob_remove(mob/living/carbon/unadapted, special = FALSE, movement_flags)
REMOVE_TRAIT(unadapted, TRAIT_UNNATURAL_RED_GLOWY_EYES, ORGAN_TRAIT)
return ..()
diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm
index 20ad378529ff3..c1ebed9afbf17 100644
--- a/code/modules/surgery/organs/internal/heart/_heart.dm
+++ b/code/modules/surgery/organs/internal/heart/_heart.dm
@@ -163,7 +163,7 @@
accursed.AddComponent(/datum/component/manual_heart, pump_delay = pump_delay, blood_loss = blood_loss, heal_brute = heal_brute, heal_burn = heal_burn, heal_oxy = heal_oxy)
-/obj/item/organ/heart/cursed/on_mob_remove(mob/living/carbon/accursed, special = FALSE)
+/obj/item/organ/heart/cursed/on_mob_remove(mob/living/carbon/accursed, special = FALSE, movement_flags)
. = ..()
qdel(accursed.GetComponent(/datum/component/manual_heart))
@@ -247,7 +247,7 @@
addtimer(VARSET_CALLBACK(src, stabilization_available, TRUE), 5 MINUTES, TIMER_DELETE_ME)
// Largely a sanity check
-/obj/item/organ/heart/cybernetic/on_mob_remove(mob/living/carbon/heart_owner, special = FALSE)
+/obj/item/organ/heart/cybernetic/on_mob_remove(mob/living/carbon/heart_owner, special = FALSE, movement_flags)
. = ..()
if(HAS_TRAIT_FROM(heart_owner, TRAIT_NOSOFTCRIT, ORGAN_TRAIT))
REMOVE_TRAIT(heart_owner, TRAIT_NOSOFTCRIT, ORGAN_TRAIT)
diff --git a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
index df60b8243ef72..19f0aef7a5227 100644
--- a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
+++ b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
@@ -28,6 +28,10 @@
///If the core is removable once socketed.
var/core_removable = TRUE
+/obj/item/organ/heart/cybernetic/anomalock/Destroy()
+ QDEL_NULL(core)
+ return ..()
+
/obj/item/organ/heart/cybernetic/anomalock/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
if(!core)
@@ -39,7 +43,7 @@
RegisterSignal(organ_owner, SIGNAL_ADDTRAIT(TRAIT_CRITICAL_CONDITION), PROC_REF(activate_survival))
RegisterSignal(organ_owner, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act))
-/obj/item/organ/heart/cybernetic/anomalock/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/heart/cybernetic/anomalock/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
if(!core)
return
diff --git a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm
index 5c6602834cb07..0e34fc581c3fb 100644
--- a/code/modules/surgery/organs/internal/heart/heart_ethereal.dm
+++ b/code/modules/surgery/organs/internal/heart/heart_ethereal.dm
@@ -21,14 +21,14 @@
add_atom_colour(ethereal_color, FIXED_COLOUR_PRIORITY)
update_appearance()
-/obj/item/organ/heart/ethereal/mob_insert(mob/living/carbon/heart_owner, special = FALSE, movement_flags)
+/obj/item/organ/heart/ethereal/on_mob_insert(mob/living/carbon/heart_owner, special = FALSE, movement_flags)
. = ..()
RegisterSignal(heart_owner, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change))
RegisterSignal(heart_owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(on_owner_fully_heal))
RegisterSignal(heart_owner, COMSIG_QDELETING, PROC_REF(owner_deleted))
-/obj/item/organ/heart/ethereal/mob_remove(mob/living/carbon/heart_owner, special, movement_flags)
+/obj/item/organ/heart/ethereal/on_mob_remove(mob/living/carbon/heart_owner, special, movement_flags)
UnregisterSignal(heart_owner, list(COMSIG_MOB_STATCHANGE, COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_QDELETING))
REMOVE_TRAIT(heart_owner, TRAIT_CORPSELOCKED, SPECIES_TRAIT)
stop_crystalization_process(heart_owner)
diff --git a/code/modules/surgery/organs/internal/liver/_liver.dm b/code/modules/surgery/organs/internal/liver/_liver.dm
index 866813d02aa13..e3d6d51704458 100755
--- a/code/modules/surgery/organs/internal/liver/_liver.dm
+++ b/code/modules/surgery/organs/internal/liver/_liver.dm
@@ -60,14 +60,15 @@
qdel(GetComponent(/datum/component/squeak))
/// Registers COMSIG_SPECIES_HANDLE_CHEMICAL from owner
-/obj/item/organ/liver/on_mob_insert(mob/living/carbon/organ_owner, special)
+/obj/item/organ/liver/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
RegisterSignal(organ_owner, COMSIG_SPECIES_HANDLE_CHEMICAL, PROC_REF(handle_chemical))
+ RegisterSignal(organ_owner, COMSIG_ATOM_EXAMINE, PROC_REF(on_owner_examine))
/// Unregisters COMSIG_SPECIES_HANDLE_CHEMICAL from owner
-/obj/item/organ/liver/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/liver/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
- UnregisterSignal(organ_owner, COMSIG_SPECIES_HANDLE_CHEMICAL)
+ UnregisterSignal(organ_owner, list(COMSIG_SPECIES_HANDLE_CHEMICAL, COMSIG_ATOM_EXAMINE))
/**
* This proc can be overriden by liver subtypes so they can handle certain chemicals in special ways.
@@ -188,7 +189,7 @@
if(SPT_PROB(3, seconds_per_tick))
owner.emote("drool")
-/obj/item/organ/liver/on_owner_examine(datum/source, mob/user, list/examine_list)
+/obj/item/organ/liver/proc/on_owner_examine(datum/source, mob/user, list/examine_list)
if(!ishuman(owner) || !(organ_flags & ORGAN_FAILING))
return
diff --git a/code/modules/surgery/organs/internal/lungs/_lungs.dm b/code/modules/surgery/organs/internal/lungs/_lungs.dm
index 60332123a8c4e..2026458a35949 100644
--- a/code/modules/surgery/organs/internal/lungs/_lungs.dm
+++ b/code/modules/surgery/organs/internal/lungs/_lungs.dm
@@ -157,7 +157,7 @@
add_gas_reaction(/datum/gas/zauker, while_present = PROC_REF(too_much_zauker))
///Simply exists so that you don't keep any alerts from your previous lack of lungs.
-/obj/item/organ/lungs/mob_insert(mob/living/carbon/receiver, special = FALSE, movement_flags)
+/obj/item/organ/lungs/on_mob_insert(mob/living/carbon/receiver, special = FALSE, movement_flags)
. = ..()
receiver.clear_alert(ALERT_NOT_ENOUGH_OXYGEN)
@@ -166,7 +166,7 @@
receiver.clear_alert(ALERT_NOT_ENOUGH_PLASMA)
receiver.clear_alert(ALERT_NOT_ENOUGH_N2O)
-/obj/item/organ/lungs/mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
+/obj/item/organ/lungs/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
// This is very "manual" I realize, but it's useful to ensure cleanup for gases we're removing happens
// Avoids stuck alerts and such
diff --git a/code/modules/surgery/organs/internal/stomach/_stomach.dm b/code/modules/surgery/organs/internal/stomach/_stomach.dm
index 768f3483c030f..40d3265684d13 100644
--- a/code/modules/surgery/organs/internal/stomach/_stomach.dm
+++ b/code/modules/surgery/organs/internal/stomach/_stomach.dm
@@ -246,13 +246,13 @@
disgusted.throw_alert(ALERT_DISGUST, /atom/movable/screen/alert/disgusted)
disgusted.add_mood_event("disgust", /datum/mood_event/disgusted)
-/obj/item/organ/stomach/mob_insert(mob/living/carbon/receiver, special, movement_flags)
+/obj/item/organ/stomach/on_mob_insert(mob/living/carbon/receiver, special, movement_flags)
. = ..()
receiver.hud_used?.hunger?.update_appearance()
-/obj/item/organ/stomach/mob_remove(mob/living/carbon/stomach_owner, special, movement_flags)
+/obj/item/organ/stomach/on_mob_remove(mob/living/carbon/stomach_owner, special, movement_flags)
if(ishuman(stomach_owner))
- var/mob/living/carbon/human/human_owner = owner
+ var/mob/living/carbon/human/human_owner = stomach_owner
human_owner.clear_alert(ALERT_DISGUST)
human_owner.clear_mood_event("disgust")
stomach_owner.hud_used?.hunger?.update_appearance()
diff --git a/code/modules/surgery/organs/internal/stomach/stomach_golem.dm b/code/modules/surgery/organs/internal/stomach/stomach_golem.dm
index 3921cdc64e59c..0f817b5230745 100644
--- a/code/modules/surgery/organs/internal/stomach/stomach_golem.dm
+++ b/code/modules/surgery/organs/internal/stomach/stomach_golem.dm
@@ -11,11 +11,11 @@
/// How slow are you if you have absolutely nothing in the tank?
var/max_hunger_slowdown = 4
-/obj/item/organ/stomach/golem/on_mob_insert(mob/living/carbon/organ_owner, special)
+/obj/item/organ/stomach/golem/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
RegisterSignal(owner, COMSIG_CARBON_ATTEMPT_EAT, PROC_REF(try_eating))
-/obj/item/organ/stomach/golem/on_mob_remove(mob/living/carbon/organ_owner, special)
+/obj/item/organ/stomach/golem/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
UnregisterSignal(organ_owner, COMSIG_CARBON_ATTEMPT_EAT)
organ_owner.remove_movespeed_modifier(/datum/movespeed_modifier/golem_hunger)
diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm
index 7b5cecb34115a..e5e54a1e68a4f 100644
--- a/code/modules/surgery/organs/internal/tongue/_tongue.dm
+++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm
@@ -124,7 +124,7 @@
food_taste_reaction = FOOD_LIKED
return food_taste_reaction
-/obj/item/organ/tongue/mob_insert(mob/living/carbon/receiver, special, movement_flags)
+/obj/item/organ/tongue/on_mob_insert(mob/living/carbon/receiver, special, movement_flags)
. = ..()
if(modifies_speech)
@@ -138,7 +138,7 @@
REMOVE_TRAIT(receiver, TRAIT_AGEUSIA, NO_TONGUE_TRAIT)
apply_tongue_effects()
-/obj/item/organ/tongue/mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
+/obj/item/organ/tongue/on_mob_remove(mob/living/carbon/organ_owner, special, movement_flags)
. = ..()
temp_say_mod = ""
diff --git a/code/modules/surgery/organs/organ_movement.dm b/code/modules/surgery/organs/organ_movement.dm
index 16889ec0588a3..de2ac86c9de3a 100644
--- a/code/modules/surgery/organs/organ_movement.dm
+++ b/code/modules/surgery/organs/organ_movement.dm
@@ -15,12 +15,15 @@
/obj/item/organ/proc/Insert(mob/living/carbon/receiver, special = FALSE, movement_flags)
SHOULD_CALL_PARENT(TRUE)
- mob_insert(receiver, special, movement_flags)
+ if(!mob_insert(receiver, special, movement_flags))
+ return FALSE
bodypart_insert(limb_owner = receiver, movement_flags = movement_flags)
if(!special && !(receiver.living_flags & STOP_OVERLAY_UPDATE_BODY_PARTS))
receiver.update_body_parts()
+ return TRUE
+
/*
* Remove the organ from the select mob.
*
@@ -44,15 +47,17 @@
* movement_flags - Flags for how we behave in movement. See DEFINES/organ_movement for flags
*/
/obj/item/organ/proc/mob_insert(mob/living/carbon/receiver, special, movement_flags)
- SHOULD_CALL_PARENT(TRUE)
+ SHOULD_NOT_OVERRIDE(TRUE)
if(!iscarbon(receiver))
- stack_trace("Tried to insert organ into non-carbon: [receiver.type]")
- return
+ //We try to insert the organ in a corgi when running the test, expecting it to return FALSE.
+ if(!PERFORM_ALL_TESTS(organ_sanity))
+ stack_trace("Tried to insert organ into non-carbon: [receiver.type]")
+ return FALSE
if(owner == receiver)
stack_trace("Organ receiver is already organ owner")
- return
+ return FALSE
var/obj/item/organ/replaced = receiver.get_organ_slot(slot)
if(replaced)
@@ -78,7 +83,7 @@
receiver.organs_slot[slot] = src
owner = receiver
- on_mob_insert(receiver, special)
+ on_mob_insert(receiver, special, movement_flags)
return TRUE
@@ -99,10 +104,15 @@
if(!special)
organ_owner.hud_used?.update_locked_slots()
- RegisterSignal(owner, COMSIG_ATOM_EXAMINE, PROC_REF(on_owner_examine))
SEND_SIGNAL(src, COMSIG_ORGAN_IMPLANTED, organ_owner)
SEND_SIGNAL(organ_owner, COMSIG_CARBON_GAIN_ORGAN, src, special)
+ // organs_slot must ALWAYS be ordered in the same way as organ_process_order
+ // Otherwise life processing breaks down
+ sortTim(owner.organs_slot, GLOBAL_PROC_REF(cmp_organ_slot_asc))
+
+ STOP_PROCESSING(SSobj, src)
+
/// Insert an organ into a limb, assume the limb as always detached and include no owner operations here (except the get_bodypart helper here I guess)
/// Give EITHER a limb OR a limb owner
/obj/item/organ/proc/bodypart_insert(obj/item/bodypart/bodypart, mob/living/carbon/limb_owner, movement_flags)
@@ -148,7 +158,7 @@
* * special - "quick swapping" an organ out - when TRUE, the mob will be unaffected by not having that organ for the moment
*/
/obj/item/organ/proc/mob_remove(mob/living/carbon/organ_owner, special = FALSE, movement_flags)
- SHOULD_CALL_PARENT(TRUE)
+ SHOULD_NOT_OVERRIDE(TRUE)
if(organ_owner)
if(organ_owner.organs_slot[slot] == src)
@@ -156,9 +166,7 @@
organ_owner.organs -= src
owner = null
-
- on_mob_remove(organ_owner, special)
-
+ on_mob_remove(organ_owner, special, movement_flags)
return TRUE
/// Called after the organ is removed from a mob.
@@ -179,7 +187,6 @@
for(var/datum/status_effect/effect as anything in organ_effects)
organ_owner.remove_status_effect(effect, type)
- UnregisterSignal(organ_owner, COMSIG_ATOM_EXAMINE)
SEND_SIGNAL(src, COMSIG_ORGAN_REMOVED, organ_owner)
SEND_SIGNAL(organ_owner, COMSIG_CARBON_LOSE_ORGAN, src, special)
ADD_TRAIT(src, TRAIT_USED_ORGAN, ORGAN_TRAIT)
@@ -189,6 +196,13 @@
if(!special)
organ_owner.hud_used?.update_locked_slots()
+ if((organ_flags & ORGAN_VITAL) && !special && !HAS_TRAIT(organ_owner, TRAIT_GODMODE))
+ if(organ_owner.stat != DEAD)
+ organ_owner.investigate_log("has been killed by losing a vital organ ([src]).", INVESTIGATE_DEATHS)
+ organ_owner.death()
+
+ START_PROCESSING(SSobj, src)
+
var/list/diseases = organ_owner.get_static_viruses()
if(!LAZYLEN(diseases))
return
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index d23267fa326bd..c8ca5ba8fb517 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -4,8 +4,7 @@
///The description of the surgery, what it does.
var/desc
- ///From __DEFINES/surgery.dm
- ///Selection: SURGERY_IGNORE_CLOTHES | SURGERY_SELF_OPERABLE | SURGERY_REQUIRE_RESTING | SURGERY_REQUIRE_LIMB | SURGERY_REQUIRES_REAL_LIMB | SURGERY_MORBID_CURIOSITY
+ ///Bitfield for flags that determine different behaviors and requirement for the surgery. See __DEFINES/surgery.dm
var/surgery_flags = SURGERY_REQUIRE_RESTING | SURGERY_REQUIRE_LIMB
///The surgery step we're currently on, increases each time we do a step.
var/status = 1
@@ -120,24 +119,23 @@
if(LAZYACCESS(modifiers, RIGHT_CLICK))
try_to_fail = TRUE
- var/datum/surgery_step/step = get_surgery_step()
- if(isnull(step))
+ var/datum/surgery_step/surgery_step = GLOB.surgery_steps[steps[status]]
+ if(isnull(surgery_step))
return FALSE
var/obj/item/tool = user.get_active_held_item()
if(tool)
tool = tool.get_proxy_attacker_for(target, user)
- if(step.try_op(user, target, user.zone_selected, tool, src, try_to_fail))
+ if(surgery_step.try_op(user, target, user.zone_selected, tool, src, try_to_fail))
return TRUE
- if(tool && tool.item_flags & SURGICAL_TOOL) //Just because you used the wrong tool it doesn't mean you meant to whack the patient with it
+ if(!tool)
+ return FALSE
+ //Just because you used the wrong tool it doesn't mean you meant to whack the patient with it
+ if((surgery_flags & SURGERY_CHECK_TOOL_BEHAVIOUR) ? tool.tool_behaviour : (tool.item_flags & SURGICAL_TOOL))
to_chat(user, span_warning("This step requires a different tool!"))
return TRUE
return FALSE
-/datum/surgery/proc/get_surgery_step()
- var/step_type = steps[status]
- return new step_type
-
/datum/surgery/proc/get_surgery_next_step()
if(status < steps.len)
var/step_type = steps[status + 1]
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 86d29d4bef327..50acf4d5c379d 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -83,6 +83,8 @@
#endif
/// A trait source when adding traits through unit tests
#define TRAIT_SOURCE_UNIT_TESTS "unit_tests"
+/// Helper to allocate a new object with the implied type (the type of the variable it's assigned to) in the corner of the test room
+#define EASY_ALLOCATE(arguments...) allocate(__IMPLIED_TYPE__, run_loc_floor_bottom_left, ##arguments)
// BEGIN_INCLUDE
#include "abductor_baton_spell.dm"
@@ -122,6 +124,12 @@
#include "clothing_drops_items.dm"
#include "clothing_under_armor_subtype_check.dm"
#include "combat.dm"
+#include "combat_blocking.dm"
+#include "combat_cuffs.dm"
+#include "combat_eyestab.dm"
+#include "combat_flash.dm"
+#include "combat_help.dm"
+#include "combat_pistol_whip.dm"
#include "combat_stamina.dm"
#include "combat_welder.dm"
#include "component_tests.dm"
@@ -130,6 +138,7 @@
#include "container_sanity.dm"
#include "crayons.dm"
#include "create_and_destroy.dm"
+#include "damp_rag.dm"
#include "dcs_check_list_arguments.dm"
#include "dcs_get_id_from_elements.dm"
#include "designs.dm"
@@ -138,11 +147,13 @@
#include "door_access.dm"
#include "dragon_expiration.dm"
#include "drink_icons.dm"
+#include "dropper.dm"
#include "dummy_spawn.dm"
#include "dynamic_ruleset_sanity.dm"
#include "egg_glands.dm"
#include "embedding.dm"
#include "emoting.dm"
+#include "emp_flashlight.dm"
#include "ensure_subtree_operational_datum.dm"
#include "explosion_action.dm"
#include "fish_unit_tests.dm"
@@ -161,6 +172,7 @@
#include "high_five.dm"
#include "holder_loving.dm"
#include "holidays.dm"
+#include "holofan_placement.dm"
#include "hulk.dm"
#include "human_through_recycler.dm"
#include "hunger_curse.dm"
@@ -169,8 +181,12 @@
#include "hydroponics_self_mutations.dm"
#include "hydroponics_validate_genes.dm"
#include "inhands.dm"
+#include "interaction_door.dm"
+#include "interaction_silicon.dm"
+#include "interaction_structures.dm"
#include "json_savefile_importing.dm"
#include "keybinding_init.dm"
+#include "kinetic_crusher.dm"
#include "knockoff_component.dm"
#include "language_transfer.dm"
#include "leash.dm"
@@ -268,6 +284,7 @@
#include "spell_shapeshift.dm"
#include "spell_timestop.dm"
#include "spies.dm"
+#include "spraycan.dm"
#include "spritesheets.dm"
#include "stack_singular_name.dm"
#include "station_trait_tests.dm"
@@ -280,6 +297,7 @@
#include "subsystem_init.dm"
#include "suit_storage_icons.dm"
#include "surgeries.dm"
+#include "syringe_gun.dm"
#include "tail_wag.dm"
#include "teleporters.dm"
#include "tgui_create_message.dm"
diff --git a/code/modules/unit_tests/bake_a_cake.dm b/code/modules/unit_tests/bake_a_cake.dm
index d0838b69cfd8c..a4013d1c13794 100644
--- a/code/modules/unit_tests/bake_a_cake.dm
+++ b/code/modules/unit_tests/bake_a_cake.dm
@@ -10,9 +10,6 @@
var/obj/structure/table/the_table = allocate(/obj/structure/table, table_loc)
var/obj/item/knife/kitchen/a_knife = allocate(/obj/item/knife/kitchen, table_loc)
var/obj/item/reagent_containers/cup/beaker/beaker = allocate(/obj/item/reagent_containers/cup/beaker, table_loc)
- /// DOPPLER SHIFT ADDITION BEGIN
- beaker.set_cap_status(FALSE)
- /// DOPPLER SHIFT ADDITION END
var/obj/item/reagent_containers/condiment/flour/flour_bag = allocate(/obj/item/reagent_containers/condiment/flour, table_loc)
var/obj/item/reagent_containers/condiment/sugar/sugar_bag = allocate(/obj/item/reagent_containers/condiment/sugar, table_loc)
var/obj/item/storage/fancy/egg_box/egg_box = allocate(/obj/item/storage/fancy/egg_box, table_loc)
diff --git a/code/modules/unit_tests/combat_blocking.dm b/code/modules/unit_tests/combat_blocking.dm
new file mode 100644
index 0000000000000..45c1450708509
--- /dev/null
+++ b/code/modules/unit_tests/combat_blocking.dm
@@ -0,0 +1,35 @@
+/// Test that items can block unarmed attacks
+/datum/unit_test/unarmed_blocking
+
+/datum/unit_test/unarmed_blocking/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
+ var/obj/item/chair/chair = EASY_ALLOCATE()
+ chair.hit_reaction_chance = 100
+ victim.put_in_active_hand(chair, forced = TRUE)
+ attacker.set_combat_mode(TRUE)
+ ADD_TRAIT(attacker, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
+
+ click_wrapper(attacker, victim)
+ TEST_ASSERT_EQUAL(victim.getBruteLoss(), 0, "Victim took damage from being punched despite having a 100% block chance chair in their hands.")
+
+/// Test that items can block weapon attacks
+/datum/unit_test/armed_blocking
+
+/datum/unit_test/armed_blocking/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
+ var/obj/item/shield/riot/shield = EASY_ALLOCATE()
+ shield.block_chance = INFINITY
+ victim.put_in_active_hand(shield, forced = TRUE)
+ attacker.set_combat_mode(TRUE)
+ ADD_TRAIT(attacker, TRAIT_PERFECT_ATTACKER, TRAIT_SOURCE_UNIT_TESTS)
+
+ click_wrapper(attacker, victim)
+ TEST_ASSERT_EQUAL(victim.getBruteLoss(), 0, "Victim took damage from being punched despite having a 100% block chance shield in their hands.")
+
+ var/obj/item/storage/toolbox/weapon = EASY_ALLOCATE()
+ attacker.put_in_active_hand(weapon, forced = TRUE)
+
+ click_wrapper(attacker, victim)
+ TEST_ASSERT_EQUAL(victim.getBruteLoss(), 0, "Victim took damage from being hit with a weapon despite having a 100% block chance shield in their hands.")
diff --git a/code/modules/unit_tests/combat_cuffs.dm b/code/modules/unit_tests/combat_cuffs.dm
new file mode 100644
index 0000000000000..18505966a4486
--- /dev/null
+++ b/code/modules/unit_tests/combat_cuffs.dm
@@ -0,0 +1,18 @@
+/// Tests that handcuffs can be applied.
+/datum/unit_test/apply_cuffs
+ priority = TEST_LONGER
+
+/datum/unit_test/apply_cuffs/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
+ var/obj/item/restraints/handcuffs/cuffs = EASY_ALLOCATE()
+ cuffs.handcuff_time = 0.2 SECONDS
+ attacker.put_in_active_hand(cuffs, forced = TRUE)
+ click_wrapper(attacker, victim)
+ TEST_ASSERT_EQUAL(victim.handcuffed, cuffs, "Handcuff attempt (non-combat-mode) failed in an otherwise valid setup.")
+
+ victim.clear_cuffs(cuffs)
+ attacker.put_in_active_hand(cuffs, forced = TRUE)
+ attacker.set_combat_mode(TRUE)
+ click_wrapper(attacker, victim)
+ TEST_ASSERT_EQUAL(victim.handcuffed, cuffs, "Handcuff attempt (combat-mode) failed in an otherwise valid setup.")
diff --git a/code/modules/unit_tests/combat_eyestab.dm b/code/modules/unit_tests/combat_eyestab.dm
new file mode 100644
index 0000000000000..bb1126ae40dbf
--- /dev/null
+++ b/code/modules/unit_tests/combat_eyestab.dm
@@ -0,0 +1,17 @@
+/// Tests that eyestabbing with combat mode on does damage to the eyes.
+/datum/unit_test/eyestab
+
+/datum/unit_test/eyestab/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
+ var/obj/item/screwdriver/stabber = EASY_ALLOCATE()
+
+ attacker.zone_selected = BODY_ZONE_PRECISE_EYES
+ attacker.put_in_active_hand(stabber, forced = TRUE)
+
+ attacker.set_combat_mode(TRUE)
+ click_wrapper(attacker, victim)
+ TEST_ASSERT_NOTEQUAL(victim.getBruteLoss(), 0, "Victim should have taken some brute damage from an eyestab with combat mode on")
+
+ var/obj/item/organ/eyes/eyes = victim.get_organ_slot(ORGAN_SLOT_EYES)
+ TEST_ASSERT_NOTEQUAL(eyes.damage, 0, "Victim's eyes should have taken some damage from an eyestab with combat mode on")
diff --git a/code/modules/unit_tests/combat_flash.dm b/code/modules/unit_tests/combat_flash.dm
new file mode 100644
index 0000000000000..815be27f486d0
--- /dev/null
+++ b/code/modules/unit_tests/combat_flash.dm
@@ -0,0 +1,41 @@
+/// Tests that flashes, well, flash.
+/datum/unit_test/flash_click
+ var/apply_verb = "while Attacker was not on combat mode"
+
+/datum/unit_test/flash_click/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
+ var/obj/item/assembly/flash/handheld/flash = EASY_ALLOCATE()
+
+ attacker.put_in_active_hand(flash, forced = TRUE)
+ ready_subjects(attacker, victim)
+ click_wrapper(attacker, victim)
+ check_results(attacker, victim)
+
+/datum/unit_test/flash_click/proc/ready_subjects(mob/living/carbon/human/attacker, mob/living/carbon/human/victim)
+ victim.forceMove(locate(attacker.x + 1, attacker.y, attacker.z))
+ attacker.face_atom(victim)
+ victim.face_atom(attacker)
+
+/datum/unit_test/flash_click/proc/check_results(mob/living/carbon/human/attacker, mob/living/carbon/human/victim)
+ TEST_ASSERT_NOTEQUAL(victim.getStaminaLoss(), 0, "Victim should have sustained stamina loss from being flashed head-on [apply_verb].")
+
+/// Tests that flashes flash on combat mode.
+/datum/unit_test/flash_click/combat_mode
+ apply_verb = "while Attacker was on combat mode"
+
+/datum/unit_test/flash_click/combat_mode/ready_subjects(mob/living/carbon/human/attacker, mob/living/carbon/human/victim)
+ . = ..()
+ attacker.set_combat_mode(TRUE)
+
+/// Tests that flashes do not flash if wearing protection.
+/datum/unit_test/flash_click/flash_protection
+ apply_verb = "while wearing flash protection"
+
+/datum/unit_test/flash_click/flash_protection/ready_subjects(mob/living/carbon/human/attacker, mob/living/carbon/human/victim)
+ . = ..()
+ var/obj/item/clothing/glasses/sunglasses/glasses = EASY_ALLOCATE()
+ victim.equip_to_appropriate_slot(glasses)
+
+/datum/unit_test/flash_click/flash_protection/check_results(mob/living/carbon/human/attacker, mob/living/carbon/human/victim)
+ TEST_ASSERT_EQUAL(victim.getStaminaLoss(), 0, "Victim should not have sustained stamina loss from being flashed head-on [apply_verb].")
diff --git a/code/modules/unit_tests/combat_help.dm b/code/modules/unit_tests/combat_help.dm
new file mode 100644
index 0000000000000..cfa32609e249b
--- /dev/null
+++ b/code/modules/unit_tests/combat_help.dm
@@ -0,0 +1,33 @@
+/// Tests help intent clicking on people, particularly ensuring it results in a help_shake (check self or hug)
+/datum/unit_test/help_click
+ var/helper_times_helped = 0
+ var/helpee_times_helped = 0
+
+/datum/unit_test/help_click/Run()
+ var/mob/living/carbon/human/consistent/helps_the_guy = EASY_ALLOCATE()
+ var/mob/living/carbon/human/consistent/gets_the_help = EASY_ALLOCATE()
+
+ gets_the_help.forceMove(locate(helps_the_guy.x + 1, helps_the_guy.y, helps_the_guy.z))
+
+ RegisterSignal(helps_the_guy, COMSIG_CARBON_PRE_MISC_HELP, PROC_REF(helper_help_received))
+ RegisterSignal(gets_the_help, COMSIG_CARBON_PRE_MISC_HELP, PROC_REF(helpee_help_received))
+
+ // Click on self
+ click_wrapper(helps_the_guy, helps_the_guy)
+
+ TEST_ASSERT_EQUAL(helper_times_helped, 1, "Helper should have been helped once - clicking on themselves should check self.")
+ TEST_ASSERT_EQUAL(helpee_times_helped, 0, "Helpee should not have been helped - helper clicked on themselves.")
+
+ // Click on the other guy
+ click_wrapper(helps_the_guy, gets_the_help)
+
+ TEST_ASSERT_EQUAL(helper_times_helped, 1, "Helper should not have been helped - helper clicked on helpee.")
+ TEST_ASSERT_EQUAL(helpee_times_helped, 1, "Helpee should have been helped once - helper clicked on helpee.")
+
+/datum/unit_test/help_click/proc/helper_help_received()
+ SIGNAL_HANDLER
+ helper_times_helped += 1
+
+/datum/unit_test/help_click/proc/helpee_help_received()
+ SIGNAL_HANDLER
+ helpee_times_helped += 1
diff --git a/code/modules/unit_tests/combat_pistol_whip.dm b/code/modules/unit_tests/combat_pistol_whip.dm
new file mode 100644
index 0000000000000..4a3a45b9e3f9b
--- /dev/null
+++ b/code/modules/unit_tests/combat_pistol_whip.dm
@@ -0,0 +1,60 @@
+/// Tests that guns (bayonetted or otherwise) are able to be used as melee weapons in close range
+/datum/unit_test/pistol_whip
+
+/datum/unit_test/pistol_whip/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
+ var/obj/item/gun/ballistic/automatic/pistol/gun = EASY_ALLOCATE()
+
+ attacker.put_in_active_hand(gun, forced = TRUE)
+ victim.forceMove(locate(attacker.x + 1, attacker.y, attacker.z))
+
+ var/expected_ammo = gun.magazine.max_ammo + 1
+ // These assertions are just here because I don't understand gun code
+ TEST_ASSERT(gun.chambered, "Gun spawned without a chambered round.")
+ TEST_ASSERT_EQUAL(gun.get_ammo(countchambered = TRUE), expected_ammo, "Gun spawned without a full magazine, \
+ when it should spawn with mag size + 1 (chambered) rounds.")
+
+ // Combat mode in melee range -> pistol whip
+ attacker.set_combat_mode(TRUE)
+ click_wrapper(attacker, victim)
+ TEST_ASSERT_NOTEQUAL(victim.getBruteLoss(), 0, "Victim did not take brute damage from being pistol-whipped.")
+ TEST_ASSERT_EQUAL(gun.get_ammo(countchambered = TRUE), expected_ammo, "The gun fired a shot when it was used for a pistol whip.")
+ victim.fully_heal()
+
+ // No combat mode -> point blank shot
+ attacker.set_combat_mode(FALSE)
+ click_wrapper(attacker, victim)
+ TEST_ASSERT_NOTEQUAL(victim.getBruteLoss(), 0, "Victim did not take brute damage from being fired upon point-blank.")
+ TEST_ASSERT(locate(/obj/item/ammo_casing/c9mm) in attacker.loc, "The gun did not eject a casing when it was used for a point-blank shot.")
+ TEST_ASSERT_EQUAL(gun.get_ammo(countchambered = TRUE), expected_ammo - 1, "The gun did not fire a shot when it was used for a point-blank shot.")
+ victim.fully_heal()
+
+ // Combat mode in melee range with bayonet -> bayonet stab
+ var/obj/item/knife/combat/knife = EASY_ALLOCATE()
+ gun.AddComponent(/datum/component/bayonet_attachable, starting_bayonet = knife)
+
+ attacker.set_combat_mode(TRUE)
+ click_wrapper(attacker, victim)
+ TEST_ASSERT_NOTEQUAL(victim.getBruteLoss(), 0, "Victim did not take brute damage from being bayonet stabbed.")
+ victim.fully_heal()
+
+/// Test that bayonetted weapons can be used to butcher
+/datum/unit_test/bayonet_butchering
+
+/datum/unit_test/bayonet_butchering/Run()
+ var/mob/living/carbon/human/species/monkey/meat = EASY_ALLOCATE()
+ meat.death()
+
+ var/mob/living/carbon/human/consistent/butcher = EASY_ALLOCATE()
+ butcher.set_combat_mode(TRUE)
+ var/obj/item/gun/energy/recharge/kinetic_accelerator/gun = EASY_ALLOCATE()
+ var/obj/item/knife/combat/knife = EASY_ALLOCATE()
+ var/datum/component/bayonet_attachable/bayonet = gun.GetComponent(/datum/component/bayonet_attachable)
+ bayonet.add_bayonet(knife)
+ var/datum/component/butchering/butcher_comp = knife.GetComponent(/datum/component/butchering)
+ butcher_comp.speed = 1 SECONDS
+
+ butcher.put_in_active_hand(gun, forced = TRUE)
+ click_wrapper(butcher, meat)
+ TEST_ASSERT(DOING_INTERACTION(butcher, meat), "The butcher did not start butchering the monkey when using a bayonetted weapon.")
diff --git a/code/modules/unit_tests/combat_welder.dm b/code/modules/unit_tests/combat_welder.dm
index 2fa9052d6fba0..b44022fe04993 100644
--- a/code/modules/unit_tests/combat_welder.dm
+++ b/code/modules/unit_tests/combat_welder.dm
@@ -1,9 +1,9 @@
/datum/unit_test/welder_combat
/datum/unit_test/welder_combat/Run()
- var/mob/living/carbon/human/tider = allocate(__IMPLIED_TYPE__, run_loc_floor_bottom_left)
- var/mob/living/carbon/human/victim = allocate(__IMPLIED_TYPE__, run_loc_floor_bottom_left)
- var/obj/item/weldingtool/weapon = allocate(__IMPLIED_TYPE__, run_loc_floor_bottom_left)
+ var/mob/living/carbon/human/consistent/tider = EASY_ALLOCATE()
+ var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
+ var/obj/item/weldingtool/weapon = EASY_ALLOCATE()
tider.put_in_active_hand(weapon, forced = TRUE)
tider.set_combat_mode(TRUE)
@@ -13,7 +13,7 @@
TEST_ASSERT_NOTEQUAL(victim.getFireLoss(), 0, "Victim did not get burned by welder.")
TEST_ASSERT_EQUAL(weapon.get_fuel(), weapon.max_fuel - 1, "Welder did not consume fuel on attacking a mob")
- var/obj/structure/blob/blobby = allocate(__IMPLIED_TYPE__, run_loc_floor_bottom_left)
+ var/obj/structure/blob/blobby = EASY_ALLOCATE()
weapon.melee_attack_chain(tider, blobby)
TEST_ASSERT_NOTEQUAL(blobby.get_integrity(), blobby.max_integrity, "Blob did not get burned by welder.")
diff --git a/code/modules/unit_tests/component_tests.dm b/code/modules/unit_tests/component_tests.dm
index f609e73c4b729..1fae39825105a 100644
--- a/code/modules/unit_tests/component_tests.dm
+++ b/code/modules/unit_tests/component_tests.dm
@@ -1,12 +1,7 @@
/datum/unit_test/component_duping/Run()
var/list/bad_dms = list()
- var/list/bad_dts = list()
for(var/t in typesof(/datum/component))
var/datum/component/comp = t
if(!isnum(initial(comp.dupe_mode)))
bad_dms += t
- var/dupe_type = initial(comp.dupe_type)
- if(dupe_type && !ispath(dupe_type))
- bad_dts += t
- TEST_ASSERT(!length(bad_dms) && !length(bad_dts),
- "Components with invalid dupe modes: ([bad_dms.Join(",")]) ||| Components with invalid dupe types: ([bad_dts.Join(",")])")
+ TEST_ASSERT(!length(bad_dms), "Components with invalid dupe modes: ([bad_dms.Join(",")])")
diff --git a/code/modules/unit_tests/damp_rag.dm b/code/modules/unit_tests/damp_rag.dm
new file mode 100644
index 0000000000000..6a3948036af04
--- /dev/null
+++ b/code/modules/unit_tests/damp_rag.dm
@@ -0,0 +1,17 @@
+/// Tests that damp rags can smother people.
+/// When smothing reagents are ingested (go to the stomach).
+/datum/unit_test/damp_rag_smother
+
+/datum/unit_test/damp_rag_smother/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
+ var/obj/item/organ/stomach/victim_stomach = victim.get_organ_slot(ORGAN_SLOT_STOMACH)
+ var/obj/item/reagent_containers/cup/rag/rag = EASY_ALLOCATE()
+
+ attacker.put_in_active_hand(rag, forced = TRUE)
+ attacker.zone_selected = BODY_ZONE_PRECISE_MOUTH
+ attacker.set_combat_mode(TRUE)
+ rag.reagents.add_reagent(/datum/reagent/water, rag.reagents.maximum_volume)
+ click_wrapper(attacker, victim)
+ TEST_ASSERT_EQUAL(victim_stomach.reagents.get_reagent_amount(/datum/reagent/water), rag.reagents.maximum_volume, \
+ "The victim should have been smothered by the rag, gaining water reagent.")
diff --git a/code/modules/unit_tests/dropper.dm b/code/modules/unit_tests/dropper.dm
new file mode 100644
index 0000000000000..7ada84513a8db
--- /dev/null
+++ b/code/modules/unit_tests/dropper.dm
@@ -0,0 +1,21 @@
+/// Tests the droppper picks up and dispenses reagents correctly.
+/datum/unit_test/dropper_use
+
+/datum/unit_test/dropper_use/Run()
+ var/mob/living/carbon/human/consistent/chemist = EASY_ALLOCATE()
+ var/obj/item/reagent_containers/dropper/dropper = EASY_ALLOCATE()
+ var/obj/item/reagent_containers/cup/beaker/large/beaker = EASY_ALLOCATE()
+
+ var/starting_volume = 50
+ beaker.reagents.add_reagent(/datum/reagent/water, starting_volume)
+
+ chemist.put_in_active_hand(dropper, forced = TRUE)
+ click_wrapper(chemist, beaker)
+
+ TEST_ASSERT_EQUAL(dropper.reagents.total_volume, 5, "Dropper should have taken 5 units of reagents from the beaker.")
+ TEST_ASSERT_EQUAL(beaker.reagents.total_volume, starting_volume - 5, "Beaker should have transferred reagents to the dropper.")
+
+ click_wrapper(chemist, beaker)
+
+ TEST_ASSERT_EQUAL(dropper.reagents.total_volume, 0, "Dropper should have emptied itself into the beaker.")
+ TEST_ASSERT_EQUAL(beaker.reagents.total_volume, starting_volume, "Beaker should have received reagents from the dropper.")
diff --git a/code/modules/unit_tests/embedding.dm b/code/modules/unit_tests/embedding.dm
index 05e8cc8b8aa27..5e6a8a90647ef 100644
--- a/code/modules/unit_tests/embedding.dm
+++ b/code/modules/unit_tests/embedding.dm
@@ -6,7 +6,7 @@
var/obj/projectile/bullet/c38/bullet = new(get_turf(firer))
bullet.set_embed(bullet.get_embed().generate_with_values(embed_chance = 100))
TEST_ASSERT_EQUAL(bullet.get_embed().embed_chance, 100, "embed_chance failed to modify")
- bullet.preparePixelProjectile(victim, firer)
+ bullet.aim_projectile(victim, firer)
bullet.fire(get_angle(firer, victim), victim)
var/list/components = victim.GetComponents(/datum/component/embedded)
TEST_ASSERT_EQUAL(components.len, 1, "Projectile with 100% embed chance didn't embed, or embedded multiple times")
diff --git a/code/modules/unit_tests/emp_flashlight.dm b/code/modules/unit_tests/emp_flashlight.dm
new file mode 100644
index 0000000000000..e6e78009fb36a
--- /dev/null
+++ b/code/modules/unit_tests/emp_flashlight.dm
@@ -0,0 +1,18 @@
+/// Test EMP flashlight EMPs people you point it at
+/datum/unit_test/emp_flashlight
+ var/sig_caught = 0
+
+/datum/unit_test/emp_flashlight/Run()
+ var/mob/living/carbon/human/consistent/flashlighter = EASY_ALLOCATE()
+ var/mob/living/carbon/human/consistent/victim = EASY_ALLOCATE()
+ var/obj/item/flashlight/emp/debug/flashlight = EASY_ALLOCATE()
+
+ flashlighter.put_in_active_hand(flashlight, forced = TRUE)
+ RegisterSignal(victim, COMSIG_ATOM_EMP_ACT, PROC_REF(sig_caught))
+
+ click_wrapper(flashlighter, victim)
+ TEST_ASSERT_NOTEQUAL(sig_caught, 0, "EMP flashlight did not EMP the target on click.")
+
+/datum/unit_test/emp_flashlight/proc/sig_caught()
+ SIGNAL_HANDLER
+ sig_caught++
diff --git a/code/modules/unit_tests/fish_unit_tests.dm b/code/modules/unit_tests/fish_unit_tests.dm
index 94337ae2cc2fc..b399dcb94e12e 100644
--- a/code/modules/unit_tests/fish_unit_tests.dm
+++ b/code/modules/unit_tests/fish_unit_tests.dm
@@ -128,7 +128,6 @@
description = "It smells fishy."
/obj/structure/aquarium/traits
- reproduction_and_growth = TRUE
var/obj/item/fish/testdummy/crossbreeder/crossbreeder
var/obj/item/fish/testdummy/cloner/cloner
var/obj/item/fish/testdummy/sterile/sterile
@@ -155,7 +154,6 @@
fish_traits = list(/datum/fish_trait/no_mating)
/obj/structure/aquarium/evolution
- reproduction_and_growth = TRUE
var/obj/item/fish/testdummy/evolve/evolve
var/obj/item/fish/testdummy/evolve_two/evolve_two
@@ -195,7 +193,7 @@
///During the fish_growth unit test, we spawn a fish outside of the aquarium and check that this actually stops it from growing
/datum/fish_evolution/dummy/two/growth_checks(obj/item/fish/source, seconds_per_tick, growth)
. = ..()
- if(!isaquarium(source.loc))
+ if(!source.loc || !HAS_TRAIT(source.loc, TRAIT_IS_AQUARIUM))
return COMPONENT_DONT_GROW
///A test that checks that fishing portals can be linked and function as expected
@@ -244,7 +242,7 @@
/obj/structure/toilet/unit_test/Initialize(mapload)
. = ..()
if(!HAS_TRAIT(src, TRAIT_FISHING_SPOT)) //Ensure this toilet has a fishing spot because only maploaded ones have it.
- AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/toilet)
+ AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[/datum/fish_source/toilet])
// we want no default spawns in this unit test
/datum/chasm_detritus/restricted/bodies/no_defaults
@@ -353,7 +351,6 @@
TEST_ASSERT(dummy_boogaloo, "The new fish type cannot be found inside the aquarium")
/obj/structure/aquarium/crab
- reproduction_and_growth = TRUE //needed for growing up
///Our test subject
var/obj/item/fish/chasm_crab/instant_growth/crabbie
@@ -382,7 +379,8 @@
///From here, we check that the profound_fisher as well as fish source procs for rolling rewards don't fail.
source = GLOB.preset_fish_sources[/datum/fish_source/unit_test_profound_fisher]
- run_loc_floor_bottom_left.AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/unit_test_profound_fisher)
+
+ run_loc_floor_bottom_left.AddComponent(/datum/component/fishing_spot, source)
var/mob/living/basic/fisher = allocate(/mob/living/basic)
fisher.AddComponent(/datum/component/profound_fisher)
fisher.set_combat_mode(FALSE)
@@ -391,7 +389,7 @@
TEST_FAIL("The unit test profound fisher didn't catch the test fish on a lazy fishing spot (element)")
///For good measure, let's try it again, but with the component this time, and a human mob and gloves
- run_loc_floor_bottom_left.RemoveElement(/datum/element/lazy_fishing_spot, /datum/fish_source/unit_test_profound_fisher)
+ qdel(run_loc_floor_bottom_left.GetComponent(/datum/component/fishing_spot))
var/datum/component/comp = run_loc_floor_bottom_left.AddComponent(/datum/component/fishing_spot, source)
var/mob/living/carbon/human/consistent/angler = allocate(/mob/living/carbon/human/consistent)
var/obj/item/clothing/gloves/noodling = allocate(/obj/item/clothing/gloves)
@@ -489,5 +487,36 @@
for(var/obj/item/fish/fish as anything in box)
fish.randomize_size_and_weight()
+/datum/unit_test/aquarium_upgrade
+
+/datum/unit_test/aquarium_upgrade/Run()
+ var/mob/living/carbon/human/dummy/user = allocate(__IMPLIED_TYPE__)
+ var/obj/item/aquarium_upgrade/bioelec_gen/upgrade = allocate(__IMPLIED_TYPE__)
+ var/obj/structure/aquarium/aquarium = allocate(upgrade::upgrade_from_type)
+
+ var/datum/component/aquarium/comp = aquarium.GetComponent(__IMPLIED_TYPE__)
+ TEST_ASSERT(comp, "[aquarium.type] doesn't have an aquarium component")
+ comp.set_fluid_type(AQUARIUM_FLUID_AIR)
+ comp.fluid_temp = MAX_AQUARIUM_TEMP
+ aquarium.add_traits(list(TRAIT_AQUARIUM_PANEL_OPEN, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH), AQUARIUM_TRAIT)
+
+ var/type_to_check = upgrade::upgrade_to_type
+ var/turf/aquarium_loc = aquarium.loc
+ user.put_in_hands(upgrade)
+ upgrade.melee_attack_chain(user, aquarium)
+ TEST_ASSERT(QDELETED(aquarium), "Old [aquarium.type] was not deleted after upgrade")
+
+ var/obj/structure/aquarium/upgraded_aquarium = locate(type_to_check) in aquarium_loc
+ TEST_ASSERT(upgraded_aquarium, "New [upgraded_aquarium.type] was not spawned after upgrade")
+ comp = upgraded_aquarium.GetComponent(/datum/component/aquarium)
+ TEST_ASSERT(comp, "New [upgraded_aquarium.type] doesn't have an aquarium component")
+
+ TEST_ASSERT_EQUAL(comp.fluid_type, AQUARIUM_FLUID_AIR, "Inherited aquarium fluid type should be [AQUARIUM_FLUID_AIR]")
+ TEST_ASSERT_EQUAL(comp.fluid_temp, MAX_AQUARIUM_TEMP, "Inherited aquarium fluid temperature should be [MAX_AQUARIUM_TEMP]")
+ TEST_ASSERT(HAS_TRAIT(upgraded_aquarium, TRAIT_AQUARIUM_PANEL_OPEN), "The new aquarium should have its panel open")
+ TEST_ASSERT(HAS_TRAIT(upgraded_aquarium, TRAIT_STOP_FISH_REPRODUCTION_AND_GROWTH), "The 'growth and reproduction' setting for this aquarium should be disabled")
+
+ TEST_ASSERT(QDELETED(upgrade), "Aquarium upgrade wasn't deleted afterward")
+
#undef FISH_REAGENT_AMOUNT
#undef TRAIT_FISH_TESTING
diff --git a/code/modules/unit_tests/greyscale_config.dm b/code/modules/unit_tests/greyscale_config.dm
index d3d9ce9d4fdd4..9c0484eff7d11 100644
--- a/code/modules/unit_tests/greyscale_config.dm
+++ b/code/modules/unit_tests/greyscale_config.dm
@@ -21,9 +21,9 @@
TEST_FAIL("[worn.DebugName()] is missing a sprite for the worn overlay for [item_path]. Expected icon state: '[worn_icon_state]'")
var/datum/greyscale_config/belt = SSgreyscale.configurations["[initial(item_path.greyscale_config_belt)]"]
- var/belt_icon_state = initial(item_path.belt_icon_state) || initial(item_path.icon_state)
- if(belt && !belt.icon_states[belt_icon_state])
- TEST_FAIL("[belt.DebugName()] is missing a sprite for the belt overlay for [item_path]. Expected icon state: '[belt_icon_state]'")
+ var/inside_belt_icon_state = initial(item_path.inside_belt_icon_state) || initial(item_path.icon_state)
+ if(belt && !belt.icon_states[inside_belt_icon_state])
+ TEST_FAIL("[belt.DebugName()] is missing a sprite for the belt overlay for [item_path]. Expected icon state: '[inside_belt_icon_state]'")
/// Makes sure objects using greyscale configs have, if any, the correct number of colors
/datum/unit_test/greyscale_color_count
diff --git a/code/modules/unit_tests/holofan_placement.dm b/code/modules/unit_tests/holofan_placement.dm
new file mode 100644
index 0000000000000..532d0c30e939f
--- /dev/null
+++ b/code/modules/unit_tests/holofan_placement.dm
@@ -0,0 +1,14 @@
+/// Tests the ability to place holosigns from a holosign creator.
+/datum/unit_test/place_holosign
+
+/datum/unit_test/place_holosign/Run()
+ var/mob/living/carbon/human/consistent/jannie = EASY_ALLOCATE()
+ var/obj/item/holosign_creator/janibarrier/jannie_holosign_creator = EASY_ALLOCATE()
+
+ jannie.put_in_active_hand(jannie_holosign_creator, forced = TRUE)
+ var/turf/open/next_to_the_jannie = locate(jannie.x + 1, jannie.y, jannie.z)
+
+ click_wrapper(jannie, next_to_the_jannie)
+
+ var/obj/structure/holosign/barrier/wetsign/placed_sign = locate() in next_to_the_jannie
+ TEST_ASSERT_NOTNULL(placed_sign, "Holosign creator failed to place a holosign in an adjacent tile.")
diff --git a/code/modules/unit_tests/interaction_door.dm b/code/modules/unit_tests/interaction_door.dm
new file mode 100644
index 0000000000000..418f02213fec2
--- /dev/null
+++ b/code/modules/unit_tests/interaction_door.dm
@@ -0,0 +1,13 @@
+/// Tests that airlocks can be closed by clicking on the floor, as [/datum/component/redirect_attack_hand_from_turf ] dictates
+/datum/unit_test/door_click
+
+/datum/unit_test/door_click/Run()
+ var/mob/living/carbon/human/consistent/tider = EASY_ALLOCATE()
+ var/obj/machinery/door/airlock/public/glass/door = EASY_ALLOCATE()
+
+ tider.forceMove(locate(door.x + 1, door.y, door.z))
+ door.open() // this sleeps we just have to cope
+ TEST_ASSERT(!door.operating, "Airlock was operating after being opened.")
+ TEST_ASSERT(!door.density, "Airlock was not open after being opened.")
+ click_wrapper(tider, get_turf(door))
+ TEST_ASSERT(door.operating, "Airlock was not closing after clicking the turf below, as per /datum/component/redirect_attack_hand_from_turf.")
diff --git a/code/modules/unit_tests/interaction_silicon.dm b/code/modules/unit_tests/interaction_silicon.dm
new file mode 100644
index 0000000000000..4b4efe85ee466
--- /dev/null
+++ b/code/modules/unit_tests/interaction_silicon.dm
@@ -0,0 +1,38 @@
+/// Tests the ability to unlock and crowbar open a silicon
+/datum/unit_test/silicon_interacting
+
+/datum/unit_test/silicon_interacting/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/mob/living/silicon/robot/borgo = EASY_ALLOCATE()
+ var/obj/item/card/id/advanced/gold/captains_spare/id = EASY_ALLOCATE()
+ var/obj/item/crowbar/crowbar = EASY_ALLOCATE()
+ // unlock
+ attacker.put_in_active_hand(id, forced = TRUE)
+ click_wrapper(attacker, borgo)
+ TEST_ASSERT(!borgo.locked, "Robot was not unlocked when swiped with ID")
+ // open
+ id.forceMove(attacker.drop_location())
+ attacker.put_in_active_hand(crowbar, forced = TRUE)
+ click_wrapper(attacker, borgo)
+ TEST_ASSERT(borgo.opened, "Robot was not opened when crowbarred")
+ // close
+ attacker.put_in_active_hand(crowbar, forced = TRUE)
+ click_wrapper(attacker, borgo)
+ TEST_ASSERT(!borgo.opened, "Robot was not closed when crowbarred")
+ // lock
+ crowbar.forceMove(attacker.drop_location())
+ attacker.put_in_active_hand(id, forced = TRUE)
+ click_wrapper(attacker, borgo)
+ TEST_ASSERT(borgo.locked, "Robot was not re-locked when swiped with ID")
+
+/// Tests unarmed clicking a cyborg doesn't cause damage
+/datum/unit_test/silicon_punch
+
+/datum/unit_test/silicon_punch/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/mob/living/silicon/robot/borgo = EASY_ALLOCATE()
+ borgo.forceMove(locate(attacker.x + 1, attacker.y, attacker.z))
+ attacker.set_combat_mode(TRUE)
+ click_wrapper(attacker, borgo)
+ TEST_ASSERT_EQUAL(borgo.getBruteLoss(), 0, "Cyborg took damage from an unarmed punched - \
+ their unarmed damage threshold should be too high for this to happen.")
diff --git a/code/modules/unit_tests/interaction_structures.dm b/code/modules/unit_tests/interaction_structures.dm
new file mode 100644
index 0000000000000..d5be4b6d863fe
--- /dev/null
+++ b/code/modules/unit_tests/interaction_structures.dm
@@ -0,0 +1,40 @@
+/// Tests that mobs are able to bash down tables by clicking on them.
+/datum/unit_test/structure_table_bash
+
+/datum/unit_test/structure_table_bash/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/obj/item/storage/toolbox/toolbox = EASY_ALLOCATE()
+ var/obj/structure/table/to_smack = EASY_ALLOCATE()
+ attacker.put_in_active_hand(toolbox, forced = TRUE)
+ click_wrapper(attacker, to_smack)
+ TEST_ASSERT_EQUAL(toolbox.loc, to_smack.loc, "The toolbox should have been placed on the table. Instead, its loc is [toolbox.loc].")
+ TEST_ASSERT_EQUAL(to_smack.get_integrity(), to_smack.max_integrity, "Table took damage despite not being smacked.")
+
+ attacker.put_in_active_hand(toolbox, forced = TRUE)
+ attacker.set_combat_mode(TRUE)
+ click_wrapper(attacker, to_smack)
+ TEST_ASSERT_NOTEQUAL(toolbox.loc, to_smack.loc, "The toolbox should not have been placed on the table.")
+ TEST_ASSERT_NOTEQUAL(to_smack.get_integrity(), to_smack.max_integrity, "Table failed to take damage from being smacked.")
+
+/// Tests that mobs are able to bash down barricades / structures by clicking on them.
+/datum/unit_test/structure_generic_bash
+
+/datum/unit_test/structure_generic_bash/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/obj/item/storage/toolbox/toolbox = EASY_ALLOCATE()
+ var/obj/structure/barricade/to_smack = EASY_ALLOCATE()
+ attacker.put_in_active_hand(toolbox, forced = TRUE)
+ click_wrapper(attacker, to_smack)
+ TEST_ASSERT_NOTEQUAL(to_smack.get_integrity(), to_smack.max_integrity, "The barricade should have taken damage a from a non-combat-mode click.")
+
+/// Tests that common tool interactions are possible still, by attempting to open the panel of an air alarm.
+/datum/unit_test/machinery_tool_interaction
+
+/datum/unit_test/machinery_tool_interaction/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/obj/item/screwdriver/screwdriver = EASY_ALLOCATE()
+ var/obj/machinery/airalarm/to_smack = EASY_ALLOCATE()
+ attacker.put_in_active_hand(screwdriver, forced = TRUE)
+ click_wrapper(attacker, to_smack)
+ TEST_ASSERT_EQUAL(to_smack.get_integrity(), to_smack.max_integrity, "The air alarm took damage when interacted with a screwdriver.")
+ TEST_ASSERT(to_smack.panel_open, "The air alarm should have opened its panel after being interacted with a screwdriver.")
diff --git a/code/modules/unit_tests/kinetic_crusher.dm b/code/modules/unit_tests/kinetic_crusher.dm
new file mode 100644
index 0000000000000..cb15d70e62c6d
--- /dev/null
+++ b/code/modules/unit_tests/kinetic_crusher.dm
@@ -0,0 +1,13 @@
+/// Tests that the Kinetic Crusher fires a projectile on RMB
+/datum/unit_test/crusher_projectile
+
+/datum/unit_test/crusher_projectile/Run()
+ var/mob/living/carbon/human/consistent/attacker = EASY_ALLOCATE()
+ var/obj/item/kinetic_crusher/crusher = EASY_ALLOCATE()
+
+ attacker.put_in_active_hand(crusher, forced = TRUE)
+ crusher.attack_self(attacker) // wields the crusher
+
+ click_wrapper(attacker, run_loc_floor_top_right, list(RIGHT_CLICK = TRUE, BUTTON = RIGHT_CLICK))
+
+ TEST_ASSERT(!crusher.charged, "Attacker failed to fire the kinetic crusher on right clicking a distant target")
diff --git a/code/modules/unit_tests/metabolizing.dm b/code/modules/unit_tests/metabolizing.dm
index 53bd3277dc485..5397bc13e4fc2 100644
--- a/code/modules/unit_tests/metabolizing.dm
+++ b/code/modules/unit_tests/metabolizing.dm
@@ -28,7 +28,7 @@
// Give them enough meth to be consumed in 2 metabolizations
pill.reagents.add_reagent(meth, 1.9 * initial(meth.metabolization_rate) * SSMOBS_DT)
- pill.attack(user, user)
+ pill.interact_with_atom(user, user)
user.Life(SSMOBS_DT)
@@ -77,7 +77,7 @@
// Let's start with stomach metabolism
pill.reagents.add_reagent(meth.type, 5)
- pill.attack(pill_user, pill_user)
+ pill.interact_with_atom(pill_user, pill_user)
// Set the metabolism efficiency to 1.0 so it transfers all reagents to the body in one go.
var/obj/item/organ/stomach/pill_belly = pill_user.get_organ_slot(ORGAN_SLOT_STOMACH)
@@ -105,7 +105,7 @@
// One half pill
pill_two.reagents.add_reagent(meth.type, (5 * 0.5) + 1)
- pill_two.attack(pill_syringe_user, pill_syringe_user)
+ pill_two.interact_with_atom(pill_syringe_user, pill_syringe_user)
syringe.melee_attack_chain(pill_syringe_user, pill_syringe_user)
// Set the metabolism efficiency to 1.0 so it transfers all reagents to the body in one go.
diff --git a/code/modules/unit_tests/mob_faction.dm b/code/modules/unit_tests/mob_faction.dm
index f5d64918038fd..be667de731db4 100644
--- a/code/modules/unit_tests/mob_faction.dm
+++ b/code/modules/unit_tests/mob_faction.dm
@@ -10,8 +10,8 @@
)
ignored += typesof(/mob/eye/imaginary_friend)
ignored += typesof(/mob/living/silicon/robot/model)
- ignored += typesof(/mob/eye/ai_eye/remote/base_construction)
- ignored += typesof(/mob/eye/ai_eye/remote/shuttle_docker)
+ ignored += typesof(/mob/eye/camera/remote/base_construction)
+ ignored += typesof(/mob/eye/camera/remote/shuttle_docker)
for (var/mob_type in typesof(/mob) - ignored)
var/mob/mob_instance = allocate(mob_type)
if(!islist(mob_instance.faction))
diff --git a/code/modules/unit_tests/organs.dm b/code/modules/unit_tests/organs.dm
index 8f05a28405898..cf01436796db4 100644
--- a/code/modules/unit_tests/organs.dm
+++ b/code/modules/unit_tests/organs.dm
@@ -10,22 +10,9 @@
var/static/list/species_changing_organs = typecacheof(list(
/obj/item/organ/brain/shadow/nightmare,
))
- // List of organ typepaths which are not test-able, such as certain class prototypes.
- var/static/list/test_organ_blacklist = typecacheof(list(
- /obj/item/organ,
- /obj/item/organ,
- /obj/item/organ/wings,
- /obj/item/organ/cyberimp,
- /obj/item/organ/cyberimp/brain,
- /obj/item/organ/cyberimp/mouth,
- /obj/item/organ/cyberimp/arm,
- /obj/item/organ/cyberimp/chest,
- /obj/item/organ/cyberimp/eyes,
- /obj/item/organ/alien,
- ))
/datum/unit_test/organ_sanity/Run()
- for(var/obj/item/organ/organ_type as anything in subtypesof(/obj/item/organ) - test_organ_blacklist)
+ for(var/obj/item/organ/organ_type as anything in subtypesof(/obj/item/organ) - GLOB.prototype_organs)
organ_test_insert(organ_type)
/datum/unit_test/organ_sanity/proc/organ_test_insert(obj/item/organ/organ_type)
diff --git a/code/modules/unit_tests/pills.dm b/code/modules/unit_tests/pills.dm
index 234abbfe1c1df..8567bf390eae7 100644
--- a/code/modules/unit_tests/pills.dm
+++ b/code/modules/unit_tests/pills.dm
@@ -4,7 +4,7 @@
TEST_ASSERT_EQUAL(human.has_reagent(/datum/reagent/iron), FALSE, "Human somehow has iron before taking pill")
- pill.attack(human, human)
+ pill.interact_with_atom(human, human)
human.Life(SSMOBS_DT)
TEST_ASSERT(human.has_reagent(/datum/reagent/iron), "Human doesn't have iron after taking pill")
diff --git a/code/modules/unit_tests/reagent_mob_expose.dm b/code/modules/unit_tests/reagent_mob_expose.dm
index d6ed81292a97d..bf31291e3654e 100644
--- a/code/modules/unit_tests/reagent_mob_expose.dm
+++ b/code/modules/unit_tests/reagent_mob_expose.dm
@@ -50,7 +50,7 @@
TEST_ASSERT_EQUAL(human.health, 100, "Human health did not set properly")
patch.reagents.add_reagent(/datum/reagent/method_patch_test, 1)
patch.self_delay = 0
- patch.attack(human, human)
+ patch.interact_with_atom(human, human)
TEST_ASSERT_EQUAL(human.health, 90, "Human health did not update after patch was applied")
// INJECT
diff --git a/code/modules/unit_tests/spraycan.dm b/code/modules/unit_tests/spraycan.dm
new file mode 100644
index 0000000000000..2ee4ab14454b1
--- /dev/null
+++ b/code/modules/unit_tests/spraycan.dm
@@ -0,0 +1,22 @@
+/// Tests spray painting the ground to create graffiti.
+/datum/unit_test/spraypainting
+
+/datum/unit_test/spraypainting/Run()
+ var/mob/living/carbon/human/consistent/artist = EASY_ALLOCATE()
+ var/obj/item/toy/crayon/spraycan/can = EASY_ALLOCATE()
+ var/turf/spray_turf = get_turf(artist)
+ artist.put_in_active_hand(can, forced = TRUE)
+
+ // Try to spray with a capped spraycan.
+ click_wrapper(artist, spray_turf)
+ TEST_ASSERT_EQUAL(can.charges, can.charges_left, "Spraypaint sprayed paint while capped.")
+ // Uncap it
+ click_wrapper(artist, can, list(ALT_CLICK = TRUE, BUTTON = ALT_CLICK))
+ TEST_ASSERT(!can.is_capped, "Spraypaint did not uncap when alt-clicked.")
+ // Try to spray with an uncapped spraycan.
+ click_wrapper(artist, spray_turf)
+ TEST_ASSERT_NOTEQUAL(can.charges, can.charges_left, "Spraypaint did not spray any paint when clicking on a turf with it.")
+
+ // Cleanup
+ for(var/obj/effect/decal/cleanable/crayon/made_art in spray_turf)
+ qdel(made_art)
diff --git a/code/modules/unit_tests/stomach.dm b/code/modules/unit_tests/stomach.dm
index 5d2b948e82b36..69ef7c06628b6 100644
--- a/code/modules/unit_tests/stomach.dm
+++ b/code/modules/unit_tests/stomach.dm
@@ -18,7 +18,7 @@
//Give them meth and let it kick in
pill.reagents.add_reagent(meth, 1.9 * initial(meth.metabolization_rate) * SSMOBS_DT)
- pill.attack(human, human)
+ pill.interact_with_atom(human, human)
human.Life(SSMOBS_DT)
TEST_ASSERT(human.reagents.has_reagent(meth), "Human body does not have meth after life tick")
diff --git a/code/modules/unit_tests/syringe_gun.dm b/code/modules/unit_tests/syringe_gun.dm
new file mode 100644
index 0000000000000..2d3e56a58089a
--- /dev/null
+++ b/code/modules/unit_tests/syringe_gun.dm
@@ -0,0 +1,14 @@
+/// Tests the ability to load syringe into a syringe gun
+/datum/unit_test/load_syringe
+
+/datum/unit_test/load_syringe/Run()
+ var/mob/living/carbon/human/consistent/chemist = EASY_ALLOCATE()
+ var/obj/item/gun/syringe/syringe_gun = EASY_ALLOCATE()
+ var/obj/item/reagent_containers/syringe/syringe = EASY_ALLOCATE()
+
+ chemist.put_in_active_hand(syringe, forced = TRUE)
+ chemist.put_in_inactive_hand(syringe_gun, forced = TRUE)
+
+ click_wrapper(chemist, syringe_gun)
+
+ TEST_ASSERT_EQUAL(syringe.loc, syringe_gun, "Syringe was not added to syringe gun when clicking on it to load it.")
diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm
index ce59bd3d61d49..6a2bda4ee25af 100644
--- a/code/modules/unit_tests/unit_test.dm
+++ b/code/modules/unit_tests/unit_test.dm
@@ -166,6 +166,18 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests())
log_world("::[priority] file=[file],line=[line],title=[map_name]: [type]::[annotation_text]")
+/**
+ * Helper to perform a click
+ *
+ * * clicker: The mob that will be clicking
+ * * clicked_on: The atom that will be clicked
+ * * passed_params: A list of parameters to pass to the click
+ */
+/datum/unit_test/proc/click_wrapper(mob/living/clicker, atom/clicked_on, list/passed_params = list(LEFT_CLICK = 1, BUTTON = LEFT_CLICK))
+ clicker.next_click = -1
+ clicker.next_move = -1
+ clicker.ClickOn(clicked_on, list2params(passed_params))
+
/proc/RunUnitTest(datum/unit_test/test_path, list/test_results)
if(ispath(test_path, /datum/unit_test/focus_only))
return
@@ -289,9 +301,9 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests())
//No heart to give
returnable_list += typesof(/obj/structure/ethereal_crystal)
//No linked console
- returnable_list += typesof(/mob/eye/ai_eye/remote/base_construction)
+ returnable_list += typesof(/mob/eye/camera/remote/base_construction)
//See above
- returnable_list += typesof(/mob/eye/ai_eye/remote/shuttle_docker)
+ returnable_list += typesof(/mob/eye/camera/remote/shuttle_docker)
//Hangs a ref post invoke async, which we don't support. Could put a qdeleted check but it feels hacky
returnable_list += typesof(/obj/effect/anomaly/grav/high)
//See above
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 77eaeba11140f..dc8b776131e59 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -200,14 +200,6 @@
/datum/uplink_item/proc/can_be_bought(datum/uplink_handler/source)
return TRUE
-///Real cost if this item, accounting for progression_points if uplink_handler has_progression is TRUE
-/datum/uplink_item/proc/real_cost(datum/uplink_handler/source)
- if (progression_minimum <= 0 || !source?.has_progression)
- return cost
- var percentage = CLAMP01(source.progression_points / progression_minimum)
- var mult = (1 - percentage) * 3 + percentage * 1
- return ceil(cost * mult)
-
/datum/uplink_category/discounts
name = "Discounted Gear"
weight = -1
diff --git a/code/modules/uplink/uplink_items/bundle.dm b/code/modules/uplink/uplink_items/bundle.dm
index eac30c41a16c2..b6cdc2fd3d657 100644
--- a/code/modules/uplink/uplink_items/bundle.dm
+++ b/code/modules/uplink/uplink_items/bundle.dm
@@ -89,26 +89,28 @@
continue
if(!uplink_item.surplus)
continue
+ if(handler.not_enough_reputation(uplink_item))
+ continue
possible_items += uplink_item
return possible_items
/// picks items from the list given to proc and generates a valid uplink item that is less or equal to the amount of TC it can spend
-/datum/uplink_item/bundles_tc/surplus/proc/pick_possible_item(list/possible_items, tc_budget, datum/uplink_handler/handler)
+/datum/uplink_item/bundles_tc/surplus/proc/pick_possible_item(list/possible_items, tc_budget)
var/datum/uplink_item/uplink_item = pick(possible_items)
if(prob(100 - uplink_item.surplus))
return null
- if(tc_budget < uplink_item.real_cost(handler))
+ if(tc_budget < uplink_item.cost)
return null
return uplink_item
/// fills the crate that will be given to the traitor, edit this to change the crate and how the item is filled
-/datum/uplink_item/bundles_tc/surplus/proc/fill_crate(obj/structure/closet/crate/surplus_crate, list/possible_items, datum/uplink_handler/handler)
+/datum/uplink_item/bundles_tc/surplus/proc/fill_crate(obj/structure/closet/crate/surplus_crate, list/possible_items)
var/tc_budget = crate_tc_value
while(tc_budget)
- var/datum/uplink_item/uplink_item = pick_possible_item(possible_items, tc_budget, handler)
+ var/datum/uplink_item/uplink_item = pick_possible_item(possible_items, tc_budget)
if(!uplink_item)
continue
- tc_budget -= uplink_item.real_cost(handler)
+ tc_budget -= uplink_item.cost
new uplink_item.item(surplus_crate)
/// overwrites item spawning proc for surplus items to spawn an appropriate crate via a podspawn
@@ -140,7 +142,7 @@
crate_type = /obj/structure/closet/crate/secure/syndicrate
/// edited version of fill crate for super surplus to ensure it can only be unlocked with the syndicrate key
-/datum/uplink_item/bundles_tc/surplus/united/fill_crate(obj/structure/closet/crate/secure/syndicrate/surplus_crate, list/possible_items, datum/uplink_handler/handler)
+/datum/uplink_item/bundles_tc/surplus/united/fill_crate(obj/structure/closet/crate/secure/syndicrate/surplus_crate, list/possible_items)
if(!istype(surplus_crate))
return
var/tc_budget = crate_tc_value
@@ -148,7 +150,7 @@
var/datum/uplink_item/uplink_item = pick_possible_item(possible_items, tc_budget)
if(!uplink_item)
continue
- tc_budget -= uplink_item.real_cost(handler)
+ tc_budget -= uplink_item.cost
surplus_crate.unlock_contents += uplink_item.item
/datum/uplink_item/bundles_tc/surplus_key
diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm
index 9b86a91b0264c..ca017a552fd68 100644
--- a/code/modules/uplink/uplink_items/nukeops.dm
+++ b/code/modules/uplink/uplink_items/nukeops.dm
@@ -52,7 +52,8 @@
Note: This bundle is not at a discount. You can purchase all of these items separately. You do not NEED these items, but most operatives fail WITHOUT at \
least SOME of these items. More experienced operatives can do without."
item = /obj/item/storage/box/syndie_kit/core_gear
- cost = 22 //freedom 5, doormag 3, c-4 1, stimpack 5, shield modsuit module 8
+ //The cost for the core kit is always equivalent to the combined costs of the included items
+ cost = (/datum/uplink_item/device_tools/doorjack::cost + /datum/uplink_item/implants/freedom::cost + /datum/uplink_item/explosives/c4::cost + /datum/uplink_item/device_tools/stimpack::cost + /datum/uplink_item/suits/energy_shield::cost)
limited_stock = 1
cant_discount = TRUE
purchasable_from = UPLINK_SERIOUS_OPS
@@ -178,7 +179,7 @@
/datum/uplink_item/weapon_kits/medium_cost/sword_and_board
name = "Energy Shield and Sword Case (Very Hard)"
- desc = "A case containing an energy sword and energy shield. Paired together, it provides considerable defensive power without lethal potency. \
+ desc = "A case containing an energy sword and energy shield. Paired together, it provides considerable defensive power without compromising lethal potency. \
Perfect for the enterprising nuclear knight. Comes with a medieval helmet for your MODsuit!"
item = /obj/item/storage/toolbox/guncase/sword_and_board
@@ -195,13 +196,13 @@
/datum/uplink_item/weapon_kits/medium_cost/revolvercase
name = "Syndicate Revolver Case (Moderate)"
desc = "Waffle Corp's modernized Syndicate revolver. Fires 7 brutal rounds of .357 Magnum. \
- A classic operative weapon, brought to the modern era. Comes with 3 additional speedloaders of .357."
+ A classic operative weapon, improved for the modern era. Comes with 3 additional speedloaders of .357."
item = /obj/item/storage/toolbox/guncase/revolver
/datum/uplink_item/ammo_nuclear/basic/revolver
name = ".357 Speed Loader (Revolver)"
desc = "A speed loader that contains seven additional .357 Magnum rounds; usable with the Syndicate revolver. \
- For when you really need a lot of things dead. Operatives get a discount from most of our agents!"
+ For when you really need a lot of things dead. Unlike field agents, operatives get a premium price for their speedloaders!"
item = /obj/item/ammo_box/a357
purchasable_from = parent_type::purchasable_from | UPLINK_SPY
@@ -228,7 +229,7 @@
/datum/uplink_item/weapon_kits/medium_cost/rawketlawnchair
name = "Dardo-RE Rocket Propelled Grenade Launcher (Hard)"
desc = "A reusable rocket propelled grenade launcher preloaded with a low-yield 84mm HE round. \
- Guaranteed to send your target out with a bang or your money back! Comes with a bouquet of additional rockets!"
+ Guaranteed to take your target out with a bang, or your money back! Comes with a bouquet of additional rockets!"
item = /obj/item/storage/toolbox/guncase/rocketlauncher
/datum/uplink_item/ammo_nuclear/basic/rocket
@@ -291,8 +292,8 @@
/datum/uplink_item/weapon_kits/high_cost/carbine
name = "M-90gl Carbine Case (Hard)"
- desc = "A fully-loaded, specialized three-round burst carbine that fires .223 ammunition from a 30 round magazine \
- with a 40mm underbarrel grenade launcher. Use secondary-fire to fire the grenade launcher. Comes with two spare magazines \
+ desc = "A fully-loaded, specialized three-round burst carbine that fires .223 ammunition from a 30 round magazine.\
+ Comes with a 40mm underbarrel grenade launcher. Use secondary-fire to fire the grenade launcher. Also comes with two spare magazines \
and a box of 40mm rubber slugs."
item = /obj/item/storage/toolbox/guncase/m90gl
@@ -320,7 +321,7 @@
/datum/uplink_item/weapon_kits/high_cost/sniper
name = "Anti-Materiel Sniper Rifle Briefcase (Hard)"
- desc = "An outdated, but still extremely powerful anti-material sniper rifle. Fires .50 BMG cartridges from a 6 round magazine. \
+ desc = "An outdated, but still extremely powerful anti-materiel sniper rifle. Fires .50 BMG cartridges from a 6 round magazine. \
Can be fitted with a suppressor. If anyone asks how that even works, tell them it's Nanotrasen's fault. Comes with \
3 spare magazines; 2 regular magazines and 1 disruptor magazine. Also comes with a suit and tie."
item = /obj/item/storage/briefcase/sniper
@@ -374,9 +375,11 @@
/datum/uplink_item/weapon_kits/surplus_smg
name = "Surplus Smart-SMG (Flukie)"
- desc = "An outdated smart-SMG with limited stopping power, however it's bullets will gradually track towards whatever \
- the gun was shot at. This does require you to actually aim at the person you are shooting at before firing, but \
- surely a highly trained operative such as yourself can manage that."
+ desc = "A failed experimental 'smart gun'. The use of .160 rocket propelled projectiles resulted in reduced stopping power \
+ but increased overally accuracy so long as the shooter vaguely aimed towards their target. The relative increase in \
+ operator effort from absurd recoil contradicted advertized advantages, resulting in poor market performance. However, \
+ there sure are a lots still lying around in poorly secured warehouses. So we took them. And now you can have them. \
+ If you REALLY want it. All I'm saying is: good luck."
item = /obj/item/gun/ballistic/automatic/smartgun
cost = 2
purchasable_from = UPLINK_SERIOUS_OPS
diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm
index 4aa28d6fe5a47..3840bfe0cd201 100644
--- a/code/modules/vehicles/atv.dm
+++ b/code/modules/vehicles/atv.dm
@@ -112,12 +112,12 @@
smoke.set_up(0, holder = src, location = src)
smoke.start()
-/obj/vehicle/ridden/atv/bullet_act(obj/projectile/P)
+/obj/vehicle/ridden/atv/bullet_act(obj/projectile/proj)
if(prob(50) || !LAZYLEN(buckled_mobs))
return ..()
for(var/mob/buckled_mob as anything in buckled_mobs)
- buckled_mob.bullet_act(P)
- return BULLET_ACT_HIT
+ return buckled_mob.projectile_hit(proj)
+ return ..()
/obj/vehicle/ridden/atv/atom_destruction()
explosion(src, devastation_range = -1, light_impact_range = 2, flame_range = 3, flash_range = 4)
diff --git a/code/modules/vehicles/cars/vim.dm b/code/modules/vehicles/cars/vim.dm
index e2d9c50e5d66c..e762aec22bd5e 100644
--- a/code/modules/vehicles/cars/vim.dm
+++ b/code/modules/vehicles/cars/vim.dm
@@ -46,7 +46,7 @@
/obj/vehicle/sealed/car/vim/atom_destruction(damage_flag)
new /obj/effect/decal/cleanable/oil(get_turf(src))
do_sparks(5, TRUE, src)
- visible_message(span_boldannounce("[src] blows apart!"))
+ visible_message(span_bolddanger("[src] blows apart!"))
return ..()
/obj/vehicle/sealed/car/vim/mob_try_enter(mob/entering)
diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm
index da1f7122dd14a..1497c4c615de7 100644
--- a/code/modules/vehicles/mecha/combat/durand.dm
+++ b/code/modules/vehicles/mecha/combat/durand.dm
@@ -84,7 +84,7 @@
//Redirects projectiles to the shield if defense_check decides they should be blocked and returns true.
/obj/vehicle/sealed/mecha/durand/bullet_act(obj/projectile/source, def_zone, mode)
if(defense_check(source.loc) && shield)
- return shield.bullet_act(source, def_zone, mode)
+ return shield.projectile_hit(source, def_zone, mode)
return ..()
diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
index 329ade4f377c6..3c49e18c7552e 100644
--- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm
@@ -148,11 +148,11 @@
STOP_PROCESSING(SSobj, src)
patient = null
ex_patient.adjustOxyLoss(-2 * seconds_per_tick)
- ex_patient.AdjustStun(-40 * seconds_per_tick)
- ex_patient.AdjustKnockdown(-40 * seconds_per_tick)
- ex_patient.AdjustParalyzed(-40 * seconds_per_tick)
- ex_patient.AdjustImmobilized(-40 * seconds_per_tick)
- ex_patient.AdjustUnconscious(-40 * seconds_per_tick)
+ ex_patient.AdjustStun(-4 SECONDS * seconds_per_tick)
+ ex_patient.AdjustKnockdown(-4 SECONDS * seconds_per_tick)
+ ex_patient.AdjustParalyzed(-4 SECONDS * seconds_per_tick)
+ ex_patient.AdjustImmobilized(-4 SECONDS * seconds_per_tick)
+ ex_patient.AdjustUnconscious(-4 SECONDS * seconds_per_tick)
if(ex_patient.reagents.get_reagent_amount(/datum/reagent/medicine/epinephrine) < 5 \
&& ex_patient.reagents.get_reagent_amount(/datum/reagent/medicine/c2/penthrite) <= 0 \
&& ex_patient.stat >= SOFT_CRIT)
diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
index b29c5501a7959..c62b2a0d9ce45 100644
--- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
+++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
@@ -68,13 +68,13 @@
var/obj/projectile/projectile_obj = new projectile(get_turf(src))
projectile_obj.log_override = TRUE //we log being fired ourselves a little further down.
projectile_obj.firer = chassis
- projectile_obj.preparePixelProjectile(target, source, modifiers, spread)
+ projectile_obj.aim_projectile(target, source, modifiers, spread)
if(isliving(source) && source.client) //dont want it to happen from syndie mecha npc mobs, they do direct fire anyways
var/mob/living/shooter = source
projectile_obj.hit_prone_targets = shooter.combat_mode
projectile_obj.fire()
if(!projectile_obj.suppressed && firing_effect_type)
- new firing_effect_type(get_turf(src), chassis.dir)
+ new firing_effect_type(chassis || get_turf(src), chassis.dir)
playsound(chassis, fire_sound, 50, TRUE)
log_combat(source, target, "fired [projectile_obj] at", src, "from [chassis] at [get_area_name(src, TRUE)]")
diff --git a/code/modules/vehicles/mecha/mecha_ai_interaction.dm b/code/modules/vehicles/mecha/mecha_ai_interaction.dm
index 6dc1e2307dc28..168b2e0ea029d 100644
--- a/code/modules/vehicles/mecha/mecha_ai_interaction.dm
+++ b/code/modules/vehicles/mecha/mecha_ai_interaction.dm
@@ -99,7 +99,7 @@
mecha_flags |= SILICON_PILOT
moved_inside(AI)
AI.eyeobj?.forceMove(src)
- AI.eyeobj?.RegisterSignal(src, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/mob/eye/ai_eye, update_visibility))
+ AI.eyeobj?.RegisterSignal(src, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/mob/eye/camera/ai, update_visibility))
AI.controlled_equipment = src
AI.remote_control = src
add_occupant(AI)
diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm
index f0fdc3997a39d..d7f52915a4b2b 100644
--- a/code/modules/vehicles/mecha/mecha_defense.dm
+++ b/code/modules/vehicles/mecha/mecha_defense.dm
@@ -121,7 +121,7 @@
&& !(mecha_flags & SILICON_PILOT) \
&& (def_zone == BODY_ZONE_HEAD || def_zone == BODY_ZONE_CHEST))
var/mob/living/hitmob = pick(occupants)
- return hitmob.bullet_act(hitting_projectile, def_zone, piercing_hit) //If the sides are open, the occupant can be hit
+ return hitmob.projectile_hit(hitting_projectile, def_zone, piercing_hit) //If the sides are open, the occupant can be hit
. = ..()
diff --git a/code/modules/vehicles/mecha/working/ripley.dm b/code/modules/vehicles/mecha/working/ripley.dm
index a2aaa53784f45..7d8452893ac21 100644
--- a/code/modules/vehicles/mecha/working/ripley.dm
+++ b/code/modules/vehicles/mecha/working/ripley.dm
@@ -301,6 +301,10 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/ripley/cargo)
var/obj/vehicle/sealed/mecha/ripley/workmech = chassis
workmech.cargo_hold = src
+/obj/item/mecha_parts/mecha_equipment/ejector/detach()
+ var/obj/vehicle/sealed/mecha/ripley/workmech = chassis
+ workmech.cargo_hold = null
+ return ..()
/obj/item/mecha_parts/mecha_equipment/ejector/Destroy()
for(var/atom/stored in contents)
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 392c890ca8fd2..9b0dd29b5fe48 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -213,7 +213,7 @@
instability = 3
icon_state = "hoverboard_holy"
-/obj/vehicle/ridden/scooter/skateboard/hoverboard/make_ridable()
+/obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded/make_ridable()
AddElement(/datum/element/ridable, /datum/component/riding/vehicle/scooter/skateboard/hover/holy)
/obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded/Initialize(mapload)
diff --git a/code/modules/vehicles/secway.dm b/code/modules/vehicles/secway.dm
index ab366da4b283e..6042210d01ca1 100644
--- a/code/modules/vehicles/secway.dm
+++ b/code/modules/vehicles/secway.dm
@@ -97,9 +97,9 @@
return ..()
//bullets will have a 60% chance to hit any riders
-/obj/vehicle/ridden/secway/bullet_act(obj/projectile/P)
+/obj/vehicle/ridden/secway/bullet_act(obj/projectile/proj)
if(!buckled_mobs || prob(40))
return ..()
for(var/mob/rider as anything in buckled_mobs)
- return rider.bullet_act(P)
+ return rider.projectile_hit(proj)
return ..()
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index 27d2afa88e57d..a5f2c84920d24 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -57,6 +57,7 @@
/obj/item/reagent_containers/cup/fish_feed = 4,
/obj/item/fish_analyzer = 2,
/obj/item/fishing_rod/telescopic = 1,
+ /obj/item/fish_tank = 1,
),
),
list(
diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm
index 29147aefa9458..b31f3ce151bcd 100644
--- a/code/modules/wiremod/shell/brain_computer_interface.dm
+++ b/code/modules/wiremod/shell/brain_computer_interface.dm
@@ -93,8 +93,6 @@
var/datum/port/output/user_port
- var/datum/weakref/user
-
var/obj/item/organ/cyberimp/bci/bci
/obj/item/circuit_component/bci_core/populate_ports()
@@ -111,19 +109,18 @@
/obj/item/circuit_component/bci_core/proc/update_charge_action()
CIRCUIT_TRIGGER
- var/mob/living/carbon/resolved_owner = user?.resolve()
if (show_charge_meter.value)
if (charge_action)
return
charge_action = new(src)
- if (resolved_owner)
- charge_action.Grant(resolved_owner)
+ if (bci.owner)
+ charge_action.Grant(bci.owner)
bci.actions += charge_action
else
if (!charge_action)
return
- if (resolved_owner)
- charge_action.Remove(resolved_owner)
+ if (bci.owner)
+ charge_action.Remove(bci.owner)
bci.actions -= charge_action
QDEL_NULL(charge_action)
@@ -139,9 +136,8 @@
bci = shell
if (charge_action)
- var/mob/living/carbon/resolved_owner = user?.resolve()
- if (resolved_owner)
- charge_action.Remove(resolved_owner)
+ if (bci.owner)
+ charge_action.Remove(bci.owner)
bci.actions -= charge_action
QDEL_NULL(charge_action)
@@ -158,14 +154,13 @@
if (!sent_message)
return
- var/mob/living/carbon/resolved_owner = user?.resolve()
- if (isnull(resolved_owner))
+ if (isnull(bci.owner))
return
- if (resolved_owner.stat == DEAD)
+ if (bci.owner.stat == DEAD)
return
- to_chat(resolved_owner, "You hear a strange, robotic voice in your head... \"[span_robot("[html_encode(sent_message)]")]\"")
+ to_chat(bci.owner, "You hear a strange, robotic voice in your head... \"[span_robot("[html_encode(sent_message)]")]\"")
/obj/item/circuit_component/bci_core/proc/on_organ_implanted(datum/source, mob/living/carbon/owner)
SIGNAL_HANDLER
@@ -173,7 +168,6 @@
update_charge_action()
user_port.set_output(owner)
- user = WEAKREF(owner)
RegisterSignal(owner, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
RegisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(on_borg_charge))
@@ -183,7 +177,6 @@
SIGNAL_HANDLER
user_port.set_output(null)
- user = null
UnregisterSignal(owner, list(
COMSIG_ATOM_EXAMINE,
diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm
index f6f21b7e1eed1..e524bdee5cb94 100644
--- a/code/modules/zombie/organs.dm
+++ b/code/modules/zombie/organs.dm
@@ -23,26 +23,19 @@
GLOB.zombie_infection_list -= src
. = ..()
-/obj/item/organ/zombie_infection/on_mob_insert(mob/living/carbon/M, special = FALSE, movement_flags)
+/obj/item/organ/zombie_infection/on_mob_insert(mob/living/carbon/new_owner, special = FALSE, movement_flags)
. = ..()
-
+ RegisterSignal(new_owner, COMSIG_LIVING_DEATH, PROC_REF(organ_owner_died))
START_PROCESSING(SSobj, src)
-/obj/item/organ/zombie_infection/on_mob_remove(mob/living/carbon/M, special = FALSE)
+/obj/item/organ/zombie_infection/on_mob_remove(mob/living/carbon/new_owner, special = FALSE, movement_flags)
. = ..()
STOP_PROCESSING(SSobj, src)
- if(iszombie(M) && old_species && !special)
- M.set_species(old_species)
+ if(iszombie(new_owner) && old_species && !special)
+ new_owner.set_species(old_species)
if(timer_id)
deltimer(timer_id)
-
-/obj/item/organ/zombie_infection/on_mob_insert(mob/living/carbon/organ_owner, special)
- . = ..()
- RegisterSignal(organ_owner, COMSIG_LIVING_DEATH, PROC_REF(organ_owner_died))
-
-/obj/item/organ/zombie_infection/on_mob_remove(mob/living/carbon/organ_owner, special)
- . = ..()
- UnregisterSignal(organ_owner, COMSIG_LIVING_DEATH)
+ UnregisterSignal(new_owner, COMSIG_LIVING_DEATH)
/obj/item/organ/zombie_infection/proc/organ_owner_died(mob/living/carbon/source, gibbed)
SIGNAL_HANDLER
diff --git a/config/maps.txt b/config/maps.txt
index 3004238631e8b..ccb393621480c 100644
--- a/config/maps.txt
+++ b/config/maps.txt
@@ -37,11 +37,6 @@ map metastation
votable
endmap
-map northstar
- minplayers 50
- votable
-endmap
-
map tramstation
minplayers 35
votable
diff --git a/html/changelogs/AutoChangeLog-pr-87902.yml b/html/changelogs/AutoChangeLog-pr-87902.yml
deleted file mode 100644
index fd16ccdeafb71..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87902.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "mc-oofert"
-delete-after: True
-changes:
- - qol: "alerts that do stuff when clicked glow gold"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88007.yml b/html/changelogs/AutoChangeLog-pr-88007.yml
deleted file mode 100644
index e0edf1ba61878..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-88007.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SmArtKar"
-delete-after: True
-changes:
- - bugfix: "Berets no longer make you go bald above your earline."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88144.yml b/html/changelogs/AutoChangeLog-pr-88144.yml
new file mode 100644
index 0000000000000..541f128a1d81f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88144.yml
@@ -0,0 +1,8 @@
+author: "Ben10Omintrix"
+delete-after: True
+changes:
+ - bugfix: "repairbots no longer get flashed by their own welder"
+ - bugfix: "repairbots no longer break glass tables they step on"
+ - bugfix: "repairbots can no longer flush their own welders"
+ - bugfix: "fixes some runtimes when emagged repairbots try to deconstruct things"
+ - bugfix: "fixes sentient repairbots not being able to see or remove their material counts"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88207.yml b/html/changelogs/AutoChangeLog-pr-88207.yml
new file mode 100644
index 0000000000000..627db590cf4dd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88207.yml
@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+ - bugfix: "ACTUALLY allow dot radio prefixes to also work with the tgui-say radio prefix display."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88212.yml b/html/changelogs/AutoChangeLog-pr-88212.yml
new file mode 100644
index 0000000000000..d8eeded5b519f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88212.yml
@@ -0,0 +1,4 @@
+author: "ValuedEmployee"
+delete-after: True
+changes:
+ - rscadd: "New purr and meow emotes for players with felinid tongues"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88217.yml b/html/changelogs/AutoChangeLog-pr-88217.yml
new file mode 100644
index 0000000000000..54f0d00580506
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88217.yml
@@ -0,0 +1,4 @@
+author: "Mothblocks"
+delete-after: True
+changes:
+ - qol: "IV drips now create a beam from their spout to your body, and will visually pull you closer."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88218.yml b/html/changelogs/AutoChangeLog-pr-88218.yml
new file mode 100644
index 0000000000000..aa138e0ae745f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88218.yml
@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+ - bugfix: "Maybe fixes some organ manipulation bugs"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88219.yml b/html/changelogs/AutoChangeLog-pr-88219.yml
new file mode 100644
index 0000000000000..563f6d175141a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88219.yml
@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+ - bugfix: "Frozen slimes can't latch on to you (but they can still attack you technically)"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88220.yml b/html/changelogs/AutoChangeLog-pr-88220.yml
new file mode 100644
index 0000000000000..9e84257f5f611
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88220.yml
@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+ - bugfix: "Mulebot wire hacking is less fourth wall breaking"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88221.yml b/html/changelogs/AutoChangeLog-pr-88221.yml
new file mode 100644
index 0000000000000..6c78766a75c52
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88221.yml
@@ -0,0 +1,4 @@
+author: "Melbert"
+delete-after: True
+changes:
+ - bugfix: "Stuff like the SM exploding will no longer output to your OOC tab"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88223.yml b/html/changelogs/AutoChangeLog-pr-88223.yml
new file mode 100644
index 0000000000000..9d9c5dcb84022
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88223.yml
@@ -0,0 +1,4 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+ - bugfix: "Fixed colossus committing suicide on a regular basis"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-88225.yml b/html/changelogs/AutoChangeLog-pr-88225.yml
new file mode 100644
index 0000000000000..f1b2dddd24e1c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-88225.yml
@@ -0,0 +1,6 @@
+author: "SyncIt21"
+delete-after: True
+changes:
+ - bugfix: "chainsaw is not invisible when turned off in hand"
+ - bugfix: "chainsaw won't play ping sound when turned on"
+ - bugfix: "mounted chainsaw has a new animated sprite when turned on & won't go invisible in hand"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
index 61fd21d9b4c51..f01bf01ffa3c6 100644
--- a/html/changelogs/archive/2024-11.yml
+++ b/html/changelogs/archive/2024-11.yml
@@ -714,3 +714,269 @@
larentoun:
- bugfix: 'Mafia: Psych''s reveal ability now correctly has a single use'
- bugfix: 'Mafia: Fugitive''s vest ability now correctly should have two uses'
+2024-11-21:
+ Ghommie:
+ - refactor: refactored aquariums heavily. Please report any fishy bug.
+ - rscadd: Added portable/handheld fish tanks to the game. They can be crafted with
+ an aquarium kit and 5 sheets of plastic. While portable, they cannot store fish
+ that are too big or if there're too many already. This restriction can be removed
+ by using the new "bluespace fish tank kit" techweb item.
+ - map: Replaced the lawyer's stationary pet aquarium with a fish tank, so you can
+ carry McGill around.
+ - balance: Reduced the iron cost of stationary aquariums a little.
+ - bugfix: Fixed a couple nits with the water visuals not appearing on objects with
+ a very low layer (rendered just above the floor), as well as atmos pipes looking
+ a bit funky on untiled turfs beside catwalks and platings when beside connected,
+ under-floored pipes.
+ SmArtKar:
+ - refactor: Firestacks, burning/acid/decaying effects and (brought back after being
+ temporarily removed) slimed status effects now use a new "shared" particles
+ system, which should considerably improve client performance when encountering
+ a lot of burning/slimed entities.
+ - bugfix: Berets no longer make you go bald above your earline.
+ SyncIt21:
+ - bugfix: plumbing pill press advertises the correct maximum volume of your selected
+ product instead of always 50u on the UI
+ - code_imp: plumbing pill press validates selected container to prevent href exploits
+ - code_imp: plumbing pill press validates input volume to see if it's a number
+ grungussuss:
+ - sound: the glove pickup sound will no longer play for modsuits undeploying
+ mc-oofert:
+ - qol: alerts that do stuff when clicked glow gold
+ necromanceranne:
+ - balance: 'After months of rigorous training montages, handwork and dedication.
+ Nanotrasen can proudly say that their staff is now more capable of performing
+ various judo techniques to disable and incapacitate any would-be troublemakers.
+ They have proclaimed the Spinward ''safer than ever''. Unfortunately for Nanotrasen
+ and the Spinward as a whole,, most of these same techniques have been incorporated
+ into the Tunnel Arts through the use of Khan spies. (See: Extremely bored assistants
+ who are getting tired of suplexing the clown). Is this the end for the Spinward
+ Sector? Will anyone be able to stop Maint Khan''s advance?'
+ - balance: Being grabbed can be harder to break out of depending on how vulnerable
+ you are; being prone, staggered and wounded, or just being a pushover (the quirk)
+ makes it easier to keep hold of you. Particularly if more than one of these
+ is true. Though if you're a fishman, you probably can't get grabbed at all.
+ - balance: Your arm power now contributes to the stamina damage someone is dealt
+ when they attempt and fail to break out of your grab.
+ - balance: Bartenders while drunk are great at grappling.
+ - bugfix: The values used for determining at what point you must resist if you have
+ taken damage and are staggered are now correctly set to 40, not incorrectly
+ to 80.
+ timothymtorres, MrMelbert:
+ - bugfix: Fix lustrous brain trauma not removing during polymorph
+2024-11-22:
+ Acantharctia:
+ - balance: Numb quirk now stops you from screaming and seeing the damage overlay
+ when damaged. Better keep a close eye on your health.
+ Ben10Omintrix:
+ - bugfix: fixes monkey AI not being able to attack
+ Dawnseer:
+ - bugfix: Turns Cap (White) into a white cap in loadout
+ KikoWen0:
+ - map: Nebula Arrivals stairs are now easier to navigate
+ - map: Fixed unconnected wire in dormitories on Nebula
+ - map: Fixed engineers having free pass to cargo department on Nebula
+ Melbert:
+ - bugfix: Monkeys no longer ignore basic rules such as "you can't escape a passive
+ grab if you're cuffed or in crit"
+ - bugfix: Fixes some atmos and record related log messages
+ SmArtKar:
+ - bugfix: Reconnected Wawa's sci to atmos distro
+ - bugfix: Fixed incorrect coverage descriptions
+ - refactor: Converted most common particle sources to use our new pooling system.
+ - bugfix: Fixed all hoverboards having holyboard space slowdown effect
+ - bugfix: Fixed limping status effect harddels
+ SyncIt21:
+ - bugfix: Labour stacker machine gives points for sheets again
+ carlarctg:
+ - rscdel: Replaces UZI domain reward with ballistic chameleon gun
+ - rscadd: Also added a separate possible reward for an uzi bitrunning disk.
+ grungussuss:
+ - sound: the "curse you" sfx has been replaced
+ - admin: admins can now control the volume that some admin triggered sounds are
+ played at
+ jlsnow301:
+ - bugfix: TGUI panel light mode should no longer be gross gray
+ mc-oofert:
+ - rscdel: removed quiet succumb which is pointless now that the bug got fixed
+ necromanceranne:
+ - image: Cleans up some redundant pixels on the bowman sprites.
+ - image: Kitchen and eating utensils now have suit storage sprites.
+ - code_imp: The cost for Core Equipment for nuclear operatives will always be equal
+ to the cost of the contained items if purchased directly from the uplink.
+ - bugfix: Improves the descriptions for some uplink entries.
+ - bugfix: Correctly applies resistance and EMP proofing to the broadcasting camera
+ so that it doesn't cause weird things to happen.
+ tontyGH:
+ - code_imp: made /proc/getviewsize() pure
+ - refactor: mob/eye/ai_eye has been restructured, now inheriting from a generic
+ mob/eye/camera type
+ - refactor: advanced cameras and their subtypes are now mob/eye/camera/remote subtypes
+ - code_imp: the cameranet no longer expects the user to be an AI eye
+ - code_imp: remote camera eyes have had their initialization streamlined
+ - code_imp: remote cameras handle assigning and unassigning users by themselves
+ now
+ - code_imp: remote cameras now use weakrefs instead of hard referencing owners and
+ origins
+ - code_imp: also the sentient disease is_define was removed (we don't have those
+ anymore)
+ - bugfix: AI eyes no longer assign real names to themselves, fixing their orbit
+ name
+ wallem:
+ - image: Updates slot machine sprites
+2024-11-23:
+ EOBGames:
+ - rscadd: 'A new series of shipping containers have been added: keep an eye out
+ for them at your local cargo terminus.'
+ EnterTheJake:
+ - bugfix: fixes atmos goggles not showing the temperature of turfs.
+ Fikou:
+ - admin: you no longer get auto deadminned on localhost
+ - admin: default prefs are now to be deadminned as antag/head/sec/silicon
+ Ghommie:
+ - bugfix: Fixes ink spit not respecting its 21 seconds cooldown.
+ SmArtKar:
+ - balance: Armor now decreases the chances of getting your eye blown out by a rogue
+ bullet
+ - admin: Implemented final type filtering for spawn commands - putting * at the
+ end of a spawn string will signify that there should be no subtypes offered!
+ SyncIt21:
+ - bugfix: inducers can be inserted into storage objects again
+ - bugfix: fixes grown foods(like pineapples) getting deleted sometimes inside crates
+ and stuff
+2024-11-24:
+ Ben10Omintrix:
+ - bugfix: fixes the chipped quirk displaying the skill chip's typepath rather than
+ its name
+ - bugfix: fixes chipped quirk's itchy effect not working
+ - bugfix: the chipped quirk's itchy effect now goes away when the skillchip is removed
+ - refactor: projectile dampeners have been refactored. please report any bugs
+ SmArtKar:
+ - qol: Projectiles now visually impact their targets instead of disappearing about
+ a tile short of it.
+ - bugfix: Fixed multiple minor issues with projectile behavior
+ - refactor: Completely rewrote almost all of our projectile code - if anything broke
+ or started looking/behaving oddly, make an issue report!
+ - bugfix: Fixed full augmentation scan experiment being uncompletable
+ - bugfix: Organ manipulation can be completed once again and doesn't cause you to
+ be un-melee-able in some cases.
+ - bugfix: Fixed a rare runtime in jetpack component code
+ - bugfix: Fixed parsnip sabre not receiving a jousting component
+ grungussuss:
+ - bugfix: entertainment screens now properly show their tooltip for muting sound
+ lovegreenstuff:
+ - bugfix: synthmeat is no longer an nft
+ thimothymtorres:
+ - bugfix: Fix wrong status effect for watery tile
+ timothymtorres:
+ - bugfix: Fix coffee maker smoke particles not deleting
+ - bugfix: Fix fireplace particles runtimes.
+ timothymtorres, SmArtKar:
+ - bugfix: Fix chewable bubblegum not metabolizing due to microdose
+2024-11-25:
+ Absolucy:
+ - refactor: Cleaned up code relating to heretic ascension announcements and traits.
+ ArcaneMusic:
+ - rscadd: Adds a canned disease that can show randomly in space occasionally, causing
+ the target to begin to providing chemicals resulting in the target to avoid
+ needing to be affected by gravity.
+ Auris456852:
+ - bugfix: Makes a sliced baklava pie keep its complexity after slicing
+ Dawnseer:
+ - bugfix: fixed some erronous spriting on the zippo
+ EnterTheJake:
+ - image: Heretic's Moon Blade has received a new sprite.
+ Ghommie:
+ - balance: Nerfed slipperiness from fish infusion. It no longer knockdowns but it
+ staggers and slides the user one or two tiles away.
+ - balance: Added a slight natural weakness to fire/heat to the fish infusion, which,
+ taking the minor general damage resistance resistance when wet, is pretty mild.
+ - balance: hot temperature projectiles from the temperature gun (and watchers I
+ think) also dry living creatures hit by them.
+ GoblinBackwards:
+ - bugfix: fixed the fire effect not appearing on burning gasses
+ Mifutus:
+ - rscadd: Added new moth customizations available in the character creation under
+ the name "Dipped"
+ - image: 'added icons for the moth wings, antennae and markings
+
+ :cl:'
+ - bugfix: fixed the pulse rifle not spawning when won
+ - code_imp: 'added get_turf to the pulserifle when the odds are beat.
+
+ :cl:'
+ SmArtKar:
+ - code_imp: Cleaned up organ code
+ - bugfix: Fixed meteors freezing in place if they continiously miss the station
+ on a looping z level
+ - image: Muzzle flash now is attached to your sprite, meaning you won't run over
+ it if you fire while moving
+ - bugfix: Fixed some issues with defib paddle retraction.
+ - bugfix: Fixed atrocinator module footstep spam when you're moving on a tram
+ - qol: Reagent grinders display number of material sheets they hold instead of defaulting
+ to 1
+ - image: Changing clipboard skins now changes the inhands sprite as well
+ - bugfix: Fixed a runtime in cranial fissure remove code
+ - bugfix: Fixed fishing turfs not lazyloading
+ - bugfix: Blind people no longer make eye contact with their hands
+ - bugfix: Blindfolds and other sorts of opaque eye coverage now prevent eye contact
+ from occuring
+ - bugfix: Fixed a random zero in nuke ops uplink UI
+ - bugfix: Fixed a runtime caused by logging out while your runechat message was
+ appearing.
+ carlarctg:
+ - qol: carpenter hammer fits on belt slot
+ - code_imp: renames belt_icon_state to inside_belt_icon_state for intelligibiility
+ grungussuss:
+ - sound: changelings now have a sound for absorbing
+ mc-oofert:
+ - bugfix: fixed some wiring on wawastation, added an additional distro/scrubbers
+ connection to sciences network
+ - bugfix: damage done by thrown objects to objects respects their demolition modifier
+ timothymtorres:
+ - bugfix: Fix weather effects ignoring certain areas like space.
+ - bugfix: Fix coffee maker items teleporting to AI/Cyborg locations
+ - code_imp: Change some status effects to use SECONDS define.
+2024-11-26:
+ Ben10Omintrix:
+ - bugfix: raptors no longer break their trough upon interacting with it
+ - balance: removed the troublesome trait from raptors, they now wont go out to attack
+ their colleagues.
+ - rscadd: you can now give pet collars to ur raptors to rename them
+ Ghommie:
+ - bugfix: Fixed pixel position of fish overlays for aquariums.
+ - bugfix: The Aquarium ui won't show the user contents rather than that of the aquarium
+ itself
+ Hardly:
+ - bugfix: Ghosts can no longer emit spooky analyzing sounds when scanning
+ Isratosh:
+ - balance: Time-gated traitor uplink gear is returned to being hard reputation locked
+ with a static price.
+ OrionTheFox:
+ - qol: added an examine note to lighters showing their fuel
+ SmArtKar:
+ - code_imp: Projectile impacts no longer fetch mobs' armor values thrice
+ - code_imp: Converted pills and patches into interact_with_atom
+ - bugfix: Fixed a non-player facing runtime in portable atmos machinery code.
+ - bugfix: Ensures that if your brain is removed you die
+ - bugfix: Fixed a (non-player facing) runtime in organ manipulation surgery
+ grungussuss:
+ - rscdel: The northstar arcship has been removed. :(
+2024-11-27:
+ Boviro:
+ - qol: Atmos MODsuits can now hold extinguishers on their suit slot
+ Ghommie:
+ - bugfix: FIsh flops again.
+ Melbert:
+ - balance: Morphine's sedative power has been halved. It now takes ~10 units to
+ guarantee sleep, up from ~5.
+ - balance: Morphine now causes mild disgust.
+ - balance: Morphine is now twice as addictive, causing addiction if you down over
+ ~30 units without pause.
+ SmArtKar:
+ - sound: Reduced volume of fire sounds
+ Time-Green:
+ - bugfix: No more "is blacking out!"
+ - bugfix: Brain transplants work again
+ carlarctg:
+ - spellcheck: Fixes a typo in legionnaire abilities
diff --git a/icons/effects/fire.dmi b/icons/effects/fire.dmi
index 113e16163ecdc..b48164f8795a1 100644
Binary files a/icons/effects/fire.dmi and b/icons/effects/fire.dmi differ
diff --git a/icons/hud/fishing_hud.dmi b/icons/hud/fishing_hud.dmi
index f9d2d2ff9c457..84f739f9db228 100644
Binary files a/icons/hud/fishing_hud.dmi and b/icons/hud/fishing_hud.dmi differ
diff --git a/icons/hud/radial_fishing.dmi b/icons/hud/radial_fishing.dmi
index 8b914f32613be..daa4ce8abda3e 100644
Binary files a/icons/hud/radial_fishing.dmi and b/icons/hud/radial_fishing.dmi differ
diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi
index 01cf7b38913f5..95f7bc00ae9d0 100644
Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ
diff --git a/icons/mob/clothing/ears.dmi b/icons/mob/clothing/ears.dmi
index cd7f6cc9e2bc9..beca6060b70db 100644
Binary files a/icons/mob/clothing/ears.dmi and b/icons/mob/clothing/ears.dmi differ
diff --git a/icons/mob/human/species/moth/moth_antennae.dmi b/icons/mob/human/species/moth/moth_antennae.dmi
index a40013e93576f..e6d024668084b 100644
Binary files a/icons/mob/human/species/moth/moth_antennae.dmi and b/icons/mob/human/species/moth/moth_antennae.dmi differ
diff --git a/icons/mob/human/species/moth/moth_markings.dmi b/icons/mob/human/species/moth/moth_markings.dmi
index a6ebc2cedb517..1c8173eaf3903 100644
Binary files a/icons/mob/human/species/moth/moth_markings.dmi and b/icons/mob/human/species/moth/moth_markings.dmi differ
diff --git a/icons/mob/human/species/moth/moth_wings.dmi b/icons/mob/human/species/moth/moth_wings.dmi
index 91c0d8b2b2cd1..1d3aaea5e776d 100644
Binary files a/icons/mob/human/species/moth/moth_wings.dmi and b/icons/mob/human/species/moth/moth_wings.dmi differ
diff --git a/icons/mob/inhands/64x64_lefthand.dmi b/icons/mob/inhands/64x64_lefthand.dmi
index e5dc62260453a..d46d2b439f514 100644
Binary files a/icons/mob/inhands/64x64_lefthand.dmi and b/icons/mob/inhands/64x64_lefthand.dmi differ
diff --git a/icons/mob/inhands/64x64_righthand.dmi b/icons/mob/inhands/64x64_righthand.dmi
index 5f153cece749c..8adb31df8546d 100644
Binary files a/icons/mob/inhands/64x64_righthand.dmi and b/icons/mob/inhands/64x64_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index f38ce00161941..82f46b35c6cc1 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 4639b290fe371..b2e2fc8033b89 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/chainsaw_lefthand.dmi b/icons/mob/inhands/weapons/chainsaw_lefthand.dmi
index 5235f1510102a..e7da8d0ee5da6 100644
Binary files a/icons/mob/inhands/weapons/chainsaw_lefthand.dmi and b/icons/mob/inhands/weapons/chainsaw_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/chainsaw_righthand.dmi b/icons/mob/inhands/weapons/chainsaw_righthand.dmi
index 0800a5273156c..902c2b4ee07aa 100644
Binary files a/icons/mob/inhands/weapons/chainsaw_righthand.dmi and b/icons/mob/inhands/weapons/chainsaw_righthand.dmi differ
diff --git a/icons/obj/aquarium/supplies.dmi b/icons/obj/aquarium/supplies.dmi
index 08f4923a0abdd..73a1f5ffe345a 100644
Binary files a/icons/obj/aquarium/supplies.dmi and b/icons/obj/aquarium/supplies.dmi differ
diff --git a/icons/obj/aquarium/tanks.dmi b/icons/obj/aquarium/tanks.dmi
index 44f526f8c9980..b4a5e06471f8b 100644
Binary files a/icons/obj/aquarium/tanks.dmi and b/icons/obj/aquarium/tanks.dmi differ
diff --git a/icons/obj/fishing.dmi b/icons/obj/fishing.dmi
index d97384f1f7994..ac307ae23842d 100644
Binary files a/icons/obj/fishing.dmi and b/icons/obj/fishing.dmi differ
diff --git a/icons/obj/fluff/containers.dmi b/icons/obj/fluff/containers.dmi
index 8aed1ffbb9a99..0e966c9f794fb 100644
Binary files a/icons/obj/fluff/containers.dmi and b/icons/obj/fluff/containers.dmi differ
diff --git a/icons/obj/food/lizard.dmi b/icons/obj/food/lizard.dmi
index 9e60c814a2e5a..44dc43e84de9d 100644
Binary files a/icons/obj/food/lizard.dmi and b/icons/obj/food/lizard.dmi differ
diff --git a/icons/obj/machines/computer.dmi b/icons/obj/machines/computer.dmi
index 9fcc46bf9b4e8..34f632044c162 100644
Binary files a/icons/obj/machines/computer.dmi and b/icons/obj/machines/computer.dmi differ
diff --git a/icons/obj/weapons/khopesh.dmi b/icons/obj/weapons/khopesh.dmi
index 20b084396aa6d..257ccc800dfb8 100644
Binary files a/icons/obj/weapons/khopesh.dmi and b/icons/obj/weapons/khopesh.dmi differ
diff --git a/icons/ui/repairbotmanagement/repairbot_smile.dmi b/icons/ui/repairbotmanagement/repairbot_smile.dmi
new file mode 100644
index 0000000000000..6dad3497910d7
Binary files /dev/null and b/icons/ui/repairbotmanagement/repairbot_smile.dmi differ
diff --git a/modular_doppler/colony_fabricator/code/tools/tools.dm b/modular_doppler/colony_fabricator/code/tools/tools.dm
index c48670058f7c7..0ffef60ebde68 100644
--- a/modular_doppler/colony_fabricator/code/tools/tools.dm
+++ b/modular_doppler/colony_fabricator/code/tools/tools.dm
@@ -7,7 +7,7 @@
not much quicker than unpowered tools ."
icon = 'modular_doppler/colony_fabricator/icons/tools.dmi'
icon_state = "drill"
- belt_icon_state = null
+ inside_belt_icon_state = null
inhand_icon_state = "drill"
worn_icon_state = "drill"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
diff --git a/modular_doppler/hearthkin/primitive_genemod/code/map_items.dm b/modular_doppler/hearthkin/primitive_genemod/code/map_items.dm
index 8b1bbab6eea4d..dad0b54796c89 100644
--- a/modular_doppler/hearthkin/primitive_genemod/code/map_items.dm
+++ b/modular_doppler/hearthkin/primitive_genemod/code/map_items.dm
@@ -26,12 +26,12 @@
can even catch a glimpse of the odd fish darting through the water."
baseturfs = /turf/open/openspace/icemoon
initial_gas_mix = "ICEMOON_ATMOS"
+ fishing_datum = /datum/fish_source/icecat_hot_spring
/// Holder for the steam particles that show up sometimes
var/obj/effect/abstract/particle_holder/particle_effect
/turf/open/water/hot_spring/Initialize(mapload)
. = ..()
- AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/icecat_hot_spring)
if(prob(60))
particle_effect = new(src, /particles/hotspring_steam)
diff --git a/modular_doppler/kahraman_equipment/code/clothing/clothing.dm b/modular_doppler/kahraman_equipment/code/clothing/clothing.dm
index e7ef49310e2cf..59d461f9877a1 100644
--- a/modular_doppler/kahraman_equipment/code/clothing/clothing.dm
+++ b/modular_doppler/kahraman_equipment/code/clothing/clothing.dm
@@ -8,8 +8,10 @@
icon_state = "jumpsuit"
worn_icon = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn.dmi'
supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_DIGITIGRADE)
- bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn.dmi',
- BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn_digi.dmi')
+ bodyshape_icon_files = list(
+ BODYSHAPE_HUMANOID_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn.dmi',
+ BODYSHAPE_DIGITIGRADE_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn_digi.dmi',
+ )
worn_icon_state = "jumpsuit"
sensor_mode = SENSOR_COORDS
random_sensor = FALSE
@@ -193,6 +195,7 @@
icon = 'modular_doppler/kahraman_equipment/icons/clothes/clothing.dmi'
icon_state = "mask"
worn_icon = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn.dmi'
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
supported_bodyshapes = list(BODYSHAPE_HUMANOID, BODYSHAPE_SNOUTED)
bodyshape_icon_files = list(BODYSHAPE_HUMANOID_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn.dmi',
BODYSHAPE_SNOUTED_T = 'modular_doppler/kahraman_equipment/icons/clothes/clothing_worn_digi.dmi')
diff --git a/modular_doppler/modular_items/shipchem_overrides.dm b/modular_doppler/modular_items/shipchem_overrides.dm
index c85a381d3375f..a2785c5d0a0d8 100644
--- a/modular_doppler/modular_items/shipchem_overrides.dm
+++ b/modular_doppler/modular_items/shipchem_overrides.dm
@@ -23,7 +23,7 @@
if(can_have_cap)
if(!cap_icon_state)
WARNING("Container that allows caps is lacking a cap_icon_state!")
- set_cap_status(cap_on)
+ set_cap_status(FALSE)
else
cap_on = FALSE
diff --git a/modular_doppler/reagent_forging/code/forge_weapons.dm b/modular_doppler/reagent_forging/code/forge_weapons.dm
index 113d9d0138e93..fdf5049f347c8 100644
--- a/modular_doppler/reagent_forging/code/forge_weapons.dm
+++ b/modular_doppler/reagent_forging/code/forge_weapons.dm
@@ -25,7 +25,7 @@
icon_state = "sword"
inhand_icon_state = "sword"
worn_icon_state = "sword_back"
- belt_icon_state = "sword_belt"
+ inside_belt_icon_state = "sword_belt"
hitsound = 'sound/items/weapons/bladeslice.ogg'
throwforce = 10
block_chance = 25
@@ -46,7 +46,7 @@
icon_state = "katana"
inhand_icon_state = "katana"
worn_icon_state = "katana_back"
- belt_icon_state = "katana_belt"
+ inside_belt_icon_state = "katana_belt"
hitsound = 'sound/items/weapons/bladeslice.ogg'
throwforce = 10
block_chance = 20
@@ -65,7 +65,7 @@
icon_state = "dagger"
inhand_icon_state = "dagger"
worn_icon_state = "dagger_back"
- belt_icon_state = "dagger_belt"
+ inside_belt_icon_state = "dagger_belt"
hitsound = 'sound/items/weapons/bladeslice.ogg'
throw_speed = 4
embed_type = /datum/embed_data/forged_dagger
diff --git a/modular_doppler/tableflip/tableflip.dm b/modular_doppler/tableflip/tableflip.dm
index 19d119536d436..73a0cefb1a509 100644
--- a/modular_doppler/tableflip/tableflip.dm
+++ b/modular_doppler/tableflip/tableflip.dm
@@ -28,7 +28,7 @@
if(istype(mover, /obj/projectile))
var/obj/projectile/projectile = mover
//Lets through bullets shot from behind the cover of the table
- if(projectile.trajectory && angle2dir_cardinal(projectile.trajectory.angle) == dir)
+ if(angle2dir_cardinal(projectile.angle) == dir)
return TRUE
return FALSE
if(border_dir == dir)
diff --git a/modular_doppler/verbs/code/subtle.dm b/modular_doppler/verbs/code/subtle.dm
index 785119be2eb53..3d6158e47e786 100644
--- a/modular_doppler/verbs/code/subtle.dm
+++ b/modular_doppler/verbs/code/subtle.dm
@@ -39,7 +39,7 @@
in_view -= GLOB.dead_mob_list
in_view.Remove(user)
- for(var/mob/eye/ai_eye/ai_eye in in_view)
+ for(var/mob/eye/camera/ai/ai_eye in in_view)
in_view.Remove(ai_eye)
var/list/targets = list(SUBTLE_ONE_TILE_TEXT, SUBTLE_SAME_TILE_TEXT) + in_view
diff --git a/sound/effects/changeling_absorb/attribution.txt b/sound/effects/changeling_absorb/attribution.txt
new file mode 100644
index 0000000000000..8fb03b4f01c22
--- /dev/null
+++ b/sound/effects/changeling_absorb/attribution.txt
@@ -0,0 +1,2 @@
+changeling_absorb 1-7 made by sadboysuss
+license: CC-BY-SA
\ No newline at end of file
diff --git a/sound/effects/changeling_absorb/changeling_absorb1.ogg b/sound/effects/changeling_absorb/changeling_absorb1.ogg
new file mode 100644
index 0000000000000..1ce7457a2d9a3
Binary files /dev/null and b/sound/effects/changeling_absorb/changeling_absorb1.ogg differ
diff --git a/sound/effects/changeling_absorb/changeling_absorb2.ogg b/sound/effects/changeling_absorb/changeling_absorb2.ogg
new file mode 100644
index 0000000000000..86bb2495cd1d8
Binary files /dev/null and b/sound/effects/changeling_absorb/changeling_absorb2.ogg differ
diff --git a/sound/effects/changeling_absorb/changeling_absorb3.ogg b/sound/effects/changeling_absorb/changeling_absorb3.ogg
new file mode 100644
index 0000000000000..2a0dcedaf61bd
Binary files /dev/null and b/sound/effects/changeling_absorb/changeling_absorb3.ogg differ
diff --git a/sound/effects/changeling_absorb/changeling_absorb4.ogg b/sound/effects/changeling_absorb/changeling_absorb4.ogg
new file mode 100644
index 0000000000000..ea3cc51e43bb3
Binary files /dev/null and b/sound/effects/changeling_absorb/changeling_absorb4.ogg differ
diff --git a/sound/effects/changeling_absorb/changeling_absorb5.ogg b/sound/effects/changeling_absorb/changeling_absorb5.ogg
new file mode 100644
index 0000000000000..761f29a8cd89b
Binary files /dev/null and b/sound/effects/changeling_absorb/changeling_absorb5.ogg differ
diff --git a/sound/effects/changeling_absorb/changeling_absorb6.ogg b/sound/effects/changeling_absorb/changeling_absorb6.ogg
new file mode 100644
index 0000000000000..10e70742e6704
Binary files /dev/null and b/sound/effects/changeling_absorb/changeling_absorb6.ogg differ
diff --git a/sound/effects/changeling_absorb/changeling_absorb7.ogg b/sound/effects/changeling_absorb/changeling_absorb7.ogg
new file mode 100644
index 0000000000000..7a1fd52fa932f
Binary files /dev/null and b/sound/effects/changeling_absorb/changeling_absorb7.ogg differ
diff --git a/sound/effects/magic/attribution.txt b/sound/effects/magic/attribution.txt
new file mode 100644
index 0000000000000..448707cd70c76
--- /dev/null
+++ b/sound/effects/magic/attribution.txt
@@ -0,0 +1,2 @@
+curse.ogg made by sadboysuss
+license: CC-BY-SA
\ No newline at end of file
diff --git a/sound/effects/magic/curse.ogg b/sound/effects/magic/curse.ogg
index b6af218a6585a..b9134da2c5a9a 100644
Binary files a/sound/effects/magic/curse.ogg and b/sound/effects/magic/curse.ogg differ
diff --git a/strings/fishing_tips.txt b/strings/fishing_tips.txt
index af67d15e27e70..836cab85da53f 100644
--- a/strings/fishing_tips.txt
+++ b/strings/fishing_tips.txt
@@ -54,3 +54,4 @@ Fish can grow in size and weight if you fed them somewhat frequently. Giving the
Feeding a fish mutagen can triple the probability of generating evolved offsprings, provided it has an evolution.
You can print fishing rods of different materials from an autolathe, which can inrease or decrease fishing difficulty, casting range, experience gained and can have other, special effects.
Albeit scarcely, it's possible to catch fish made of the same materials of a custom material fishing rod. Equipping a shiny fishing hook and the quality of the bait can improve your odds.
+You can use a fishing rod to snatch random organs during the "manipulate organs" step of the "organ manipulation" surgery.
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index 23f7189562ba6..90edd435df87c 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1105,6 +1105,7 @@
#include "code\datums\components\amputating_limbs.dm"
#include "code\datums\components\anti_magic.dm"
#include "code\datums\components\appearance_on_aggro.dm"
+#include "code\datums\components\aquarium.dm"
#include "code\datums\components\aquarium_content.dm"
#include "code\datums\components\area_based_godmode.dm"
#include "code\datums\components\area_sound_manager.dm"
@@ -1349,6 +1350,7 @@
#include "code\datums\components\transforming.dm"
#include "code\datums\components\trapdoor.dm"
#include "code\datums\components\tree_climber.dm"
+#include "code\datums\components\tug_towards.dm"
#include "code\datums\components\twohanded.dm"
#include "code\datums\components\udder.dm"
#include "code\datums\components\unbreakable.dm"
@@ -1440,6 +1442,7 @@
#include "code\datums\diseases\rhumba_beat.dm"
#include "code\datums\diseases\transformation.dm"
#include "code\datums\diseases\tuberculosis.dm"
+#include "code\datums\diseases\weightlessness.dm"
#include "code\datums\diseases\wizarditis.dm"
#include "code\datums\diseases\advance\advance.dm"
#include "code\datums\diseases\advance\presets.dm"
@@ -1571,7 +1574,6 @@
#include "code\datums\elements\kneecapping.dm"
#include "code\datums\elements\kneejerk.dm"
#include "code\datums\elements\knockback.dm"
-#include "code\datums\elements\lazy_fishing_spot.dm"
#include "code\datums\elements\leeching_walk.dm"
#include "code\datums\elements\lifesteal.dm"
#include "code\datums\elements\light_blocking.dm"
@@ -1718,6 +1720,7 @@
#include "code\datums\looping_sounds\acid.dm"
#include "code\datums\looping_sounds\breathing.dm"
#include "code\datums\looping_sounds\burning.dm"
+#include "code\datums\looping_sounds\changeling_absorb.dm"
#include "code\datums\looping_sounds\choking.dm"
#include "code\datums\looping_sounds\cyborg.dm"
#include "code\datums\looping_sounds\item_sounds.dm"
@@ -1796,9 +1799,10 @@
#include "code\datums\proximity_monitor\proximity_monitor.dm"
#include "code\datums\proximity_monitor\fields\ai_target_tracking.dm"
#include "code\datums\proximity_monitor\fields\gravity.dm"
-#include "code\datums\proximity_monitor\fields\projectile_dampener.dm"
#include "code\datums\proximity_monitor\fields\timestop.dm"
#include "code\datums\proximity_monitor\fields\void_storm.dm"
+#include "code\datums\proximity_monitor\fields\projectile_dampener\projectile_dampener.dm"
+#include "code\datums\proximity_monitor\fields\projectile_dampener\projectile_dampener_effects.dm"
#include "code\datums\quirks\_quirk.dm"
#include "code\datums\quirks\_quirk_constant_data.dm"
#include "code\datums\quirks\negative_quirks\addict.dm"
@@ -2321,6 +2325,7 @@
#include "code\game\objects\effects\poster_motivational.dm"
#include "code\game\objects\effects\powerup.dm"
#include "code\game\objects\effects\rcd.dm"
+#include "code\game\objects\effects\shared_particle_holder.dm"
#include "code\game\objects\effects\spiderwebs.dm"
#include "code\game\objects\effects\step_triggers.dm"
#include "code\game\objects\effects\wanted_poster.dm"
@@ -4856,6 +4861,8 @@
#include "code\modules\mob\dead\observer\observer_say.dm"
#include "code\modules\mob\dead\observer\orbit.dm"
#include "code\modules\mob\eye\eye.dm"
+#include "code\modules\mob\eye\camera\camera.dm"
+#include "code\modules\mob\eye\camera\remote.dm"
#include "code\modules\mob\living\blood.dm"
#include "code\modules\mob\living\damage_procs.dm"
#include "code\modules\mob\living\death.dm"
@@ -6186,7 +6193,6 @@
#include "code\modules\surgery\organs\external\wings\functional_wings.dm"
#include "code\modules\surgery\organs\external\wings\moth_wings.dm"
#include "code\modules\surgery\organs\external\wings\wings.dm"
-#include "code\modules\surgery\organs\internal\_internal_organ.dm"
#include "code\modules\surgery\organs\internal\appendix\_appendix.dm"
#include "code\modules\surgery\organs\internal\appendix\appendix_golem.dm"
#include "code\modules\surgery\organs\internal\cyberimp\augments_arms.dm"
diff --git a/tgui/packages/tgui-panel/styles/themes/light.scss b/tgui/packages/tgui-panel/styles/themes/light.scss
index 7d769abac10ed..0d8e301001f29 100644
--- a/tgui/packages/tgui-panel/styles/themes/light.scss
+++ b/tgui/packages/tgui-panel/styles/themes/light.scss
@@ -21,7 +21,6 @@
@use '~tgui/styles/base.scss' with (
$color-fg: hsl(0, 0%, 0%),
$color-bg: hsl(0, 0%, 93.3%),
- $color-bg-section: hsl(0, 0%, 100%),
$color-bg-grad-spread: 0%
);
@@ -41,7 +40,11 @@
'tab-color-hovered': rgba(0, 0, 0, 0.075)
)
);
- @include meta.load-css('pkg:tgui-styles/components/Section');
+ @include meta.load-css(
+ 'pkg:tgui-styles/components/Section',
+ $with: ('background-color': hsl(0, 0%, 100%))
+ );
+
@include meta.load-css(
'pkg:tgui-styles/components/Button',
$with: (
diff --git a/tgui/packages/tgui-say/TguiSay.tsx b/tgui/packages/tgui-say/TguiSay.tsx
index c06e72405d4f1..1dea8c58cae44 100644
--- a/tgui/packages/tgui-say/TguiSay.tsx
+++ b/tgui/packages/tgui-say/TguiSay.tsx
@@ -23,7 +23,7 @@ type State = {
size: WINDOW_SIZES;
};
-const CHANNEL_REGEX = /^:\w\s/;
+const CHANNEL_REGEX = /^[:.]\w\s/;
export class TguiSay extends Component<{}, State> {
private channelIterator: ChannelIterator;
diff --git a/tgui/packages/tgui/interfaces/RepairbotResources.tsx b/tgui/packages/tgui/interfaces/RepairbotResources.tsx
new file mode 100644
index 0000000000000..0e82b83d30ad3
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/RepairbotResources.tsx
@@ -0,0 +1,106 @@
+import { useBackend } from '../backend';
+import {
+ Button,
+ DmIcon,
+ Flex,
+ ProgressBar,
+ Section,
+ Stack,
+} from '../components';
+import { Window } from '../layouts';
+
+type Data = {
+ stacks: Stacks[];
+ repairbot_icon: string;
+ repairbot_icon_state: string;
+};
+
+type Stacks = {
+ stack_name: string;
+ stack_amount: number;
+ stack_maximum_amount: number;
+ stack_icon: string;
+ stack_icon_state: string;
+ stack_reference: string;
+};
+export const RepairbotResources = (props) => {
+ const { act, data } = useBackend();
+ const { stacks, repairbot_icon, repairbot_icon_state } = data;
+ return (
+
+
+
+ }
+ >
+
+ {stacks.map((stack) => (
+
+
+
+
+
+
+
+
+
+
+ act('eject', {
+ item_reference: stack.stack_reference,
+ })
+ }
+ >
+ Eject
+
+
+
+
+
+
+ ))}
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Uplink/index.tsx b/tgui/packages/tgui/interfaces/Uplink/index.tsx
index 5bf52394f2cb0..0bfc05728f37f 100644
--- a/tgui/packages/tgui/interfaces/Uplink/index.tsx
+++ b/tgui/packages/tgui/interfaces/Uplink/index.tsx
@@ -1,4 +1,3 @@
-import { clamp } from 'common/math';
import { BooleanLike } from 'common/react';
import { Component, Fragment } from 'react';
@@ -98,19 +97,6 @@ type ItemExtraData = Item & {
};
};
-function real_cost(item: UplinkItem, uplink: UplinkData) {
- if (item.progression_minimum <= 0 || !uplink.has_progression) {
- return item.cost;
- }
- let percentage = clamp(
- uplink.progression_points / item.progression_minimum,
- 0,
- 1,
- );
- let mult = (1 - percentage) * 3 + percentage * 1;
- return Math.ceil(item.cost * mult);
-}
-
// Cache response so it's only sent once
let fetchServerData: Promise | undefined;
@@ -227,6 +213,8 @@ export class Uplink extends Component<{}, UplinkState> {
}
for (let i = 0; i < itemsToAdd.length; i++) {
const item = itemsToAdd[i];
+ const hasEnoughProgression =
+ progression_points >= item.progression_minimum;
let stock: number | null = current_stock[item.stock_key];
if (item.ref) {
@@ -235,8 +223,7 @@ export class Uplink extends Component<{}, UplinkState> {
if (!stock && stock !== 0) {
stock = null;
}
- const canBuy =
- telecrystals >= real_cost(item, data) && (stock === null || stock > 0);
+ const canBuy = telecrystals >= item.cost && (stock === null || stock > 0);
items.push({
id: item.id,
name: item.name,
@@ -258,7 +245,7 @@ export class Uplink extends Component<{}, UplinkState> {
),
cost: (
- {item.cost_override_string || `${real_cost(item, data)} TC`}
+ {item.cost_override_string || `${item.cost} TC`}
{has_progression ? (
<>
,
@@ -271,7 +258,10 @@ export class Uplink extends Component<{}, UplinkState> {
)}
),
- disabled: !canBuy || (item.lock_other_purchases && purchased_items > 0),
+ disabled:
+ !canBuy ||
+ (has_progression && !hasEnoughProgression) ||
+ (item.lock_other_purchases && purchased_items > 0),
extraData: {
ref: item.ref,
icon: item.icon,
@@ -308,9 +298,7 @@ export class Uplink extends Component<{}, UplinkState> {
{has_objectives
? ' the severity of secondary objectives you get and '
: ' '}
- the price of certain items, which will return to
- their normal price once you have enough
- reputation.
+ what items you can purchase.
{/* A minute in deciseconds */}
Threat passively increases by{' '}
@@ -353,7 +341,7 @@ export class Uplink extends Component<{}, UplinkState> {
)}
- {(primary_objectives || has_objectives) && (
+ {!!(primary_objectives || has_objectives) && (
{primary_objectives && (
diff --git a/tools/UpdatePaths/Scripts/86084_replace_floorbots.txt b/tools/UpdatePaths/Scripts/86084_replace_floorbots.txt
new file mode 100644
index 0000000000000..711e01207ea43
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/86084_replace_floorbots.txt
@@ -0,0 +1,2 @@
+/mob/living/simple_animal/bot/floorbot : /mob/living/basic/bot/repairbot {@OLD}
+/obj/item/bot_assembly/floorbot : /obj/item/bot_assembly/repairbot {@OLD}
\ No newline at end of file
diff --git a/tools/UpdatePaths/Scripts/87866_fish_tanks.txt b/tools/UpdatePaths/Scripts/87866_fish_tanks.txt
new file mode 100644
index 0000000000000..a0762acacf27a
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/87866_fish_tanks.txt
@@ -0,0 +1 @@
+/obj/structure/aquarium/lawyer : /obj/item/fish_tank/lawyer