diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
index 2e1ae924a1d8..2e7e1e63bf1c 100644
--- a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
+++ b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -939,26 +939,6 @@
/obj/effect/turf_decal/siding/wideplating/dark,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
-"oI" = (
-/obj/effect/turf_decal/corner/opaque/green{
- dir = 6
- },
-/obj/effect/turf_decal/corner/opaque/green{
- dir = 1
- },
-/obj/structure/window/reinforced/spawner{
- dir = 4
- },
-/obj/structure/table_frame,
-/obj/item/shard{
- icon_state = "small";
- pixel_x = -2;
- pixel_y = 11
- },
-/obj/effect/gibspawner/human,
-/obj/item/ammo_box/magazine/skm_46_30,
-/turf/open/floor/plasteel/tech,
-/area/ship/science)
"oJ" = (
/obj/effect/turf_decal/corner/opaque/blue{
dir = 4
@@ -1149,6 +1129,16 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/science)
+"rX" = (
+/obj/effect/turf_decal/corner/opaque/mauve{
+ dir = 10
+ },
+/obj/effect/turf_decal/corner/opaque/mauve{
+ dir = 1
+ },
+/obj/effect/spawner/random/vending/snack,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/office)
"sc" = (
/obj/effect/turf_decal/trimline/opaque/blue/filled/line{
dir = 6
@@ -1588,6 +1578,11 @@
},
/turf/open/floor/plasteel/white,
/area/ship/science/storage)
+"zU" = (
+/obj/structure/flora/ausbushes/sparsegrass,
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/floor/grass,
+/area/overmap_encounter/planetoid/jungle/explored)
"Av" = (
/obj/effect/turf_decal/corner/opaque/mauve{
dir = 5
@@ -2101,16 +2096,6 @@
},
/turf/open/floor/plasteel/white,
/area/ship/science)
-"Ib" = (
-/obj/effect/turf_decal/corner/opaque/mauve{
- dir = 10
- },
-/obj/effect/turf_decal/corner/opaque/mauve{
- dir = 1
- },
-/obj/effect/spawner/random/vending/snack,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/office)
"Ie" = (
/obj/structure/railing{
dir = 6
@@ -2438,12 +2423,6 @@
},
/turf/open/floor/plasteel/white,
/area/ship/science/storage)
-"MB" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/effect/decal/cleanable/blood/splatter,
-/obj/item/weldingtool/experimental,
-/turf/open/floor/grass,
-/area/overmap_encounter/planetoid/jungle/explored)
"MF" = (
/obj/effect/turf_decal/corner/opaque/green{
dir = 9
@@ -2755,6 +2734,26 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/dark,
/area/ship/crew/office)
+"QO" = (
+/obj/effect/turf_decal/corner/opaque/green{
+ dir = 6
+ },
+/obj/effect/turf_decal/corner/opaque/green{
+ dir = 1
+ },
+/obj/structure/window/reinforced/spawner{
+ dir = 4
+ },
+/obj/structure/table_frame,
+/obj/item/shard{
+ icon_state = "small";
+ pixel_x = -2;
+ pixel_y = 11
+ },
+/obj/effect/gibspawner/human,
+/obj/item/ammo_box/magazine/skm_46_30,
+/turf/open/floor/plasteel/tech,
+/area/ship/science)
"QY" = (
/turf/open/floor/plasteel/tech,
/area/ship/medical)
@@ -3647,7 +3646,7 @@ nr
Zq
NT
RV
-Ib
+rX
Zq
ar
kP
@@ -3940,7 +3939,7 @@ Sh
fC
SQ
Cv
-MB
+zU
jl
Wo
Av
@@ -4239,7 +4238,7 @@ Er
RG
nx
ve
-oI
+QO
Rm
wQ
Bc
diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
index c5acb2629e09..a0a7605441db 100644
--- a/_maps/RandomRuins/SpaceRuins/spacemall.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -315,15 +315,6 @@
/obj/structure/flora/junglebush/c,
/turf/open/floor/plating/grass,
/area/ruin/space/has_grav/spacemall)
-"bn" = (
-/obj/structure/table/glass,
-/obj/item/toy/talking/AI{
- pixel_x = 20
- },
-/obj/item/storage/box/ammo/foam_darts/riot,
-/obj/item/gun/ballistic/shotgun/toy,
-/turf/open/floor/light,
-/area/ruin/space/has_grav/spacemall/shop2)
"bo" = (
/obj/machinery/light/small/directional/north,
/obj/structure/spider/stickyweb,
@@ -706,11 +697,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/dorms)
-"cO" = (
-/obj/effect/turf_decal/box,
-/obj/effect/spawner/random/salvage_machine,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shuttle)
"cP" = (
/obj/effect/decal/cleanable/blood,
/obj/structure/window/reinforced{
@@ -1098,6 +1084,11 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
+"ej" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/maintenance/three,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/spacemall/maint)
"ek" = (
/obj/effect/turf_decal/corner/transparent/green/diagonal,
/obj/item/kirbyplants/random,
@@ -1293,22 +1284,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
-"eS" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shop)
-"eU" = (
-/obj/structure/mirror{
- pixel_y = -30
- },
-/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
-/turf/open/floor/wood,
-/area/ruin/space/has_grav/spacemall/dorms)
"eV" = (
/obj/item/trash/energybar,
/turf/open/floor/eighties,
@@ -1322,14 +1297,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
-"eX" = (
-/obj/effect/spawner/random/vending/cola,
-/obj/effect/turf_decal/corner/transparent/green/diagonal,
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/ruin/space/has_grav/spacemall/dorms)
"eY" = (
/obj/effect/turf_decal/trimline/opaque/black/arrow_ccw{
dir = 1;
@@ -1385,24 +1352,6 @@
/obj/machinery/firealarm/directional/north,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
-"fh" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/transparent/solgovgold/full,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/stack/cable_coil/random/five,
-/obj/effect/spawner/random/techstorage/engineering,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/maint)
-"fi" = (
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/spacemall/maint)
"fl" = (
/obj/machinery/door/airlock/maintenance_hatch,
/obj/structure/cable{
@@ -1565,6 +1514,15 @@
/obj/effect/turf_decal/corner/transparent/green/diagonal,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/spacemall)
+"fP" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/corner/transparent/solgovgold/full,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/stack/cable_coil/random/five,
+/obj/effect/spawner/random/techstorage/engineering,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/maint)
"fQ" = (
/obj/structure/window/reinforced{
dir = 1
@@ -1610,6 +1568,14 @@
/obj/effect/turf_decal/corner/opaque/black/diagonal,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
+"gh" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/corner/transparent/black/diagonal,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shop)
"gj" = (
/obj/machinery/light/dim/directional/east,
/turf/open/floor/plasteel/showroomfloor{
@@ -1653,12 +1619,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/dorms)
-"gu" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shop)
"gx" = (
/obj/effect/turf_decal/corner/transparent/red/diagonal,
/obj/structure/chair{
@@ -1754,6 +1714,15 @@
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
+"gP" = (
+/obj/effect/decal/cleanable/ash,
+/obj/effect/spawner/random/maintenance,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/structure/closet/crate,
+/obj/structure/railing,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/maint)
"gQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 5
@@ -1812,6 +1781,15 @@
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/dorms)
+"hb" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/secure,
+/obj/effect/turf_decal/box,
+/obj/structure/railing,
+/obj/effect/spawner/random/exotic/prison_contraband,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/maint)
"hc" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -2166,6 +2144,11 @@
/obj/structure/spider/stickyweb,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/spacemall)
+"iu" = (
+/obj/effect/turf_decal/box,
+/obj/effect/spawner/random/salvage_machine,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shuttle)
"iv" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 9
@@ -2248,6 +2231,11 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop2)
+"iK" = (
+/obj/structure/bed,
+/obj/effect/spawner/random/bedsheet,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/spacemall/dorms)
"iL" = (
/obj/structure/flora/grass/jungle/b,
/turf/open/floor/plating/grass,
@@ -2432,15 +2420,6 @@
/obj/effect/turf_decal/corner/transparent/green/diagonal,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/spacemall)
-"jm" = (
-/obj/structure/rack,
-/obj/item/storage/box/ammo/c9mm,
-/obj/item/ammo_box/magazine/co9mm{
- pixel_x = 5
- },
-/obj/item/ammo_box/magazine/co9mm,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/dorms)
"jn" = (
/obj/effect/turf_decal/siding/wood{
dir = 6
@@ -2513,14 +2492,6 @@
/obj/structure/flora/ausbushes/ywflowers,
/turf/open/floor/plating/grass,
/area/ruin/space/has_grav/spacemall)
-"jD" = (
-/obj/effect/turf_decal/box,
-/obj/structure/closet/crate/secure,
-/obj/effect/spawner/random/clothing/costume,
-/obj/effect/spawner/random/clothing/costume,
-/obj/effect/spawner/random/clothing/costume,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shuttle)
"jE" = (
/obj/structure/window/reinforced/spawner{
dir = 1
@@ -3106,14 +3077,6 @@
/obj/structure/flora/grass/jungle/b,
/turf/open/floor/plating/grass,
/area/ruin/space/has_grav/spacemall/dorms)
-"lQ" = (
-/obj/effect/decal/cleanable/glass,
-/obj/effect/decal/cleanable/cobweb,
-/obj/effect/turf_decal/box,
-/obj/structure/closet/crate/wooden,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/maint)
"lR" = (
/obj/structure/table/glass,
/obj/machinery/paystand,
@@ -3143,6 +3106,15 @@
},
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/spacemall/dorms)
+"lX" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/obj/structure/rack,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/spacemall/maint)
"mg" = (
/obj/structure/sign/departments/security{
pixel_x = -31
@@ -3225,6 +3197,17 @@
/obj/structure/spider/stickyweb,
/turf/open/floor/wood,
/area/ruin/space/has_grav/spacemall/maint)
+"mx" = (
+/obj/structure/rack,
+/obj/item/clothing/head/hardhat/weldhat/dblue,
+/obj/item/clothing/head/hardhat/weldhat/dblue{
+ pixel_y = 5
+ },
+/obj/effect/turf_decal/siding/wideplating/dark/end{
+ dir = 8
+ },
+/turf/open/floor/light,
+/area/ruin/space/has_grav/spacemall/shop)
"mA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
/obj/structure/cable{
@@ -3252,12 +3235,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/spacemall/shop2)
-"mJ" = (
-/obj/structure/rack,
-/obj/machinery/light/small/directional/north,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/spacemall/maint)
"mK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 6
@@ -3636,11 +3613,6 @@
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/dorms)
-"ob" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/three,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/spacemall/maint)
"od" = (
/obj/effect/decal/cleanable/blood,
/obj/structure/spider/cocoon,
@@ -4046,15 +4018,6 @@
/obj/effect/turf_decal/corner/transparent/green/diagonal,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/spacemall)
-"pB" = (
-/obj/effect/decal/cleanable/ash,
-/obj/effect/spawner/random/maintenance,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/structure/closet/crate,
-/obj/structure/railing,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/maint)
"pC" = (
/obj/structure/flora/ausbushes/palebush,
/turf/open/floor/plating/grass,
@@ -4104,6 +4067,15 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
+"pK" = (
+/obj/structure/rack,
+/obj/structure/window/reinforced/spawner,
+/obj/effect/spawner/random/medical/beaker,
+/obj/effect/spawner/random/medical/beaker,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/item/clothing/neck/stethoscope,
+/turf/open/floor/plasteel/white,
+/area/ruin/space/has_grav/spacemall/shop2)
"pL" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -4473,6 +4445,15 @@
/obj/effect/decal/cleanable/glass,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/shop)
+"qE" = (
+/obj/effect/spawner/random/vending/snack,
+/obj/effect/turf_decal/corner/transparent/green/diagonal,
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ruin/space/has_grav/spacemall/dorms)
"qF" = (
/obj/structure/railing{
dir = 4
@@ -4494,6 +4475,15 @@
/obj/structure/window/reinforced/fulltile,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/dorms)
+"qJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/wooden,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/obj/effect/spawner/random/maintenance/two,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/maint)
"qK" = (
/turf/closed/wall/r_wall,
/area/ruin/space/has_grav/spacemall/maint)
@@ -4601,6 +4591,12 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/shuttle)
+"rb" = (
+/obj/effect/spawner/random/decoration/glowstick,
+/obj/structure/rack,
+/obj/effect/spawner/random/maintenance/two,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/spacemall/maint)
"re" = (
/obj/item/kirbyplants/dead,
/turf/open/floor/plating,
@@ -4637,6 +4633,15 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
+"rp" = (
+/obj/structure/rack,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/ammo_box/magazine/co9mm{
+ pixel_x = 5
+ },
+/obj/item/ammo_box/magazine/co9mm,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/dorms)
"rq" = (
/obj/effect/turf_decal/siding/wideplating/dark{
dir = 1
@@ -5746,12 +5751,6 @@
/obj/effect/decal/cleanable/molten_object/large,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
-"vp" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shop)
"vs" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/simple{
dir = 10
@@ -5825,6 +5824,14 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
+"vH" = (
+/obj/effect/spawner/random/vending/cola,
+/obj/effect/turf_decal/corner/transparent/green/diagonal,
+/obj/effect/turf_decal/siding/wideplating/dark{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/ruin/space/has_grav/spacemall/dorms)
"vI" = (
/obj/effect/turf_decal/corner/transparent/blue/half{
dir = 1
@@ -5864,12 +5871,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop2)
-"vS" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/medical/beaker,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ruin/space/has_grav/spacemall/shop2)
"vT" = (
/obj/structure/cable{
icon_state = "0-8"
@@ -6261,6 +6262,12 @@
/obj/effect/decal/cleanable/glass,
/turf/open/floor/wood/walnut,
/area/ruin/space/has_grav/spacemall/shop)
+"xA" = (
+/obj/structure/rack,
+/obj/machinery/light/small/directional/north,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/spacemall/maint)
"xD" = (
/obj/effect/turf_decal/siding{
dir = 8
@@ -6446,15 +6453,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
-"yj" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/crate/secure,
-/obj/effect/turf_decal/box,
-/obj/structure/railing,
-/obj/effect/spawner/random/exotic/prison_contraband,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/maint)
"yk" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 4
@@ -6496,6 +6494,14 @@
},
/turf/open/floor/wood/birch,
/area/ruin/space/has_grav/spacemall/shop2)
+"yr" = (
+/obj/structure/mirror{
+ pixel_y = -30
+ },
+/obj/structure/bed,
+/obj/effect/spawner/random/bedsheet,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/spacemall/dorms)
"ys" = (
/obj/effect/turf_decal/corner/transparent/green/diagonal,
/obj/machinery/firealarm/directional/north,
@@ -6519,14 +6525,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
-"yC" = (
-/obj/effect/turf_decal/box,
-/obj/structure/closet/crate/trashcart,
-/obj/item/trash/popcorn,
-/obj/item/trash/candy,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shuttle)
"yF" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -6659,16 +6657,6 @@
/obj/item/stack/cable_coil/cut,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop2)
-"yX" = (
-/obj/effect/turf_decal/box,
-/obj/machinery/light/small/directional/south,
-/obj/structure/closet/crate/secure,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/effect/spawner/random/maintenance/two,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shuttle)
"yZ" = (
/obj/structure/disposalpipe/segment{
dir = 8
@@ -6705,6 +6693,15 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/dorms)
+"zd" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/corner/transparent/black/diagonal,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/circuit/computer/common,
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shop)
"ze" = (
/turf/open/floor/plating/grass,
/area/ruin/space/has_grav/spacemall)
@@ -6961,15 +6958,6 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/shop)
-"Ag" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/circuit/computer/common,
-/obj/item/research_notes/loot,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shop)
"Ah" = (
/obj/structure/table/wood/reinforced,
/obj/item/paper_bin/carbon,
@@ -7266,14 +7254,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop2)
-"Bq" = (
-/obj/effect/turf_decal/box,
-/obj/structure/closet/crate/secure,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/food_or_drink/donkpockets,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shuttle)
"Bu" = (
/obj/structure/railing/wood{
dir = 1
@@ -7441,6 +7421,14 @@
},
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
+"Cq" = (
+/obj/effect/decal/cleanable/glass,
+/obj/effect/decal/cleanable/cobweb,
+/obj/effect/turf_decal/box,
+/obj/structure/closet/crate/wooden,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/maint)
"Cs" = (
/obj/effect/turf_decal/corner/opaque/blue/half,
/obj/item/clothing/suit/hooded/wintercoat{
@@ -7462,16 +7450,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
-"Cu" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/closet/crate/wooden,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 10
- },
-/obj/structure/spider/stickyweb,
-/obj/effect/spawner/random/maintenance/three,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/maint)
"Cv" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -7629,16 +7607,6 @@
/obj/machinery/smartfridge/food,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
-"CR" = (
-/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
-/obj/effect/decal/cleanable/blood,
-/obj/item/reagent_containers/food/snacks/spiderling{
- pixel_y = 5;
- pixel_x = 6
- },
-/turf/open/floor/wood,
-/area/ruin/space/has_grav/spacemall/dorms)
"CW" = (
/obj/effect/turf_decal/corner/opaque/blue/diagonal,
/obj/structure/cable{
@@ -7894,21 +7862,6 @@
},
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/spacemall/dorms)
-"DH" = (
-/obj/structure/rack,
-/obj/item/clothing/head/hardhat/weldhat/dblue,
-/obj/item/clothing/head/hardhat/weldhat/dblue{
- pixel_y = 5
- },
-/obj/item/weldingtool/experimental{
- pixel_y = 5
- },
-/obj/item/weldingtool/experimental,
-/obj/effect/turf_decal/siding/wideplating/dark/end{
- dir = 8
- },
-/turf/open/floor/light,
-/area/ruin/space/has_grav/spacemall/shop)
"DL" = (
/obj/machinery/door/airlock,
/obj/structure/cable{
@@ -8229,12 +8182,6 @@
},
/turf/open/floor/eighties,
/area/ruin/space/has_grav/spacemall/shop2)
-"EI" = (
-/obj/effect/spawner/random/decoration/glowstick,
-/obj/structure/rack,
-/obj/effect/spawner/random/maintenance/two,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/spacemall/maint)
"EJ" = (
/obj/effect/turf_decal/corner/transparent/red/diagonal,
/obj/structure/chair{
@@ -8610,6 +8557,22 @@
/obj/structure/spider/stickyweb,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
+"Gm" = (
+/obj/effect/turf_decal/box,
+/obj/machinery/light/small/directional/south,
+/obj/structure/closet/crate/secure,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/spawner/random/maintenance/two,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shuttle)
+"Gn" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/turf_decal/corner/transparent/black/diagonal,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shop)
"Go" = (
/obj/structure/rack,
/obj/effect/turf_decal/siding/thinplating/dark{
@@ -8690,6 +8653,15 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/spacemall/shop2)
+"GD" = (
+/obj/structure/table/glass,
+/obj/item/toy/talking/AI{
+ pixel_x = 20
+ },
+/obj/item/storage/box/ammo/foam_darts/riot,
+/obj/item/gun/ballistic/shotgun/toy,
+/turf/open/floor/light,
+/area/ruin/space/has_grav/spacemall/shop2)
"GE" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/cable{
@@ -8699,6 +8671,14 @@
/obj/machinery/power/floodlight,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/shop2)
+"GG" = (
+/obj/effect/turf_decal/box,
+/obj/structure/closet/crate/secure,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/food_or_drink/donkpockets,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shuttle)
"GH" = (
/obj/effect/turf_decal/corner/opaque/red{
dir = 9
@@ -8992,6 +8972,12 @@
/obj/structure/spider/eggcluster,
/turf/open/floor/wood,
/area/ruin/space/has_grav/spacemall/maint)
+"HI" = (
+/obj/effect/decal/cleanable/robot_debris/old,
+/obj/structure/closet/crate/wooden,
+/obj/effect/spawner/random/maintenance/three,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/maint)
"HJ" = (
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold{
dir = 8
@@ -9436,11 +9422,6 @@
/obj/structure/flora/ausbushes/leafybush,
/turf/open/floor/plating/grass,
/area/ruin/space/has_grav/spacemall)
-"JE" = (
-/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
-/turf/open/floor/wood,
-/area/ruin/space/has_grav/spacemall/dorms)
"JF" = (
/obj/effect/turf_decal/corner/transparent/red/diagonal,
/obj/structure/table,
@@ -9566,12 +9547,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
-"Kl" = (
-/obj/effect/decal/cleanable/robot_debris/old,
-/obj/structure/closet/crate/wooden,
-/obj/effect/spawner/random/maintenance/three,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/maint)
"Kn" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -9616,6 +9591,15 @@
},
/turf/open/floor/wood/birch,
/area/ruin/space/has_grav/spacemall/shop2)
+"KA" = (
+/obj/effect/turf_decal/box,
+/obj/structure/closet/crate/engineering/electrical,
+/obj/effect/spawner/random/techstorage,
+/obj/effect/spawner/random/techstorage,
+/obj/effect/spawner/random/stockparts,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shuttle)
"KB" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -9670,6 +9654,15 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
+"KN" = (
+/obj/structure/disposalpipe/segment{
+ dir = 2
+ },
+/obj/structure/closet/crate,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/turf_decal/box,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/spacemall/maint)
"KO" = (
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/obj/structure/cable{
@@ -9996,15 +9989,6 @@
/obj/structure/table,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/spacemall/dorms)
-"LS" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/spawner/random/circuit/computer/common,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shop)
"LT" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -10054,17 +10038,6 @@
/obj/structure/table,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/dorms)
-"Mb" = (
-/obj/effect/decal/cleanable/greenglow,
-/obj/effect/spawner/random/medical/prosthetic,
-/obj/effect/spawner/random/medical/memeorgans,
-/obj/effect/spawner/random/medical/memeorgans,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 4
- },
-/obj/structure/closet/crate/secure,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/maint)
"Md" = (
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -10755,6 +10728,19 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/dorms)
+"Ol" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+ dir = 1
+ },
+/obj/structure/closet/crate,
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/spawner/random/maintenance/two,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav/spacemall/maint)
"On" = (
/obj/structure/spider/stickyweb,
/turf/open/floor/plasteel,
@@ -10853,6 +10839,22 @@
/obj/structure/table,
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/spacemall/dorms)
+"OM" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/medical/beaker,
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/turf/open/floor/plasteel/white,
+/area/ruin/space/has_grav/spacemall/shop2)
+"ON" = (
+/obj/structure/bed,
+/obj/effect/spawner/random/bedsheet,
+/obj/effect/decal/cleanable/blood,
+/obj/item/reagent_containers/food/snacks/spiderling{
+ pixel_y = 5;
+ pixel_x = 6
+ },
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/spacemall/dorms)
"OO" = (
/obj/machinery/light/small/directional/south,
/obj/structure/disposalpipe/segment{
@@ -11264,12 +11266,6 @@
name = "bathroom floor"
},
/area/ruin/space/has_grav/spacemall)
-"Qf" = (
-/obj/structure/rack,
-/obj/effect/spawner/random/engineering/tool/common,
-/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shop)
"Qh" = (
/obj/structure/bookcase/random,
/obj/structure/disposalpipe/segment{
@@ -11296,22 +11292,14 @@
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
-"Qn" = (
-/obj/effect/spawner/random/vending/snack,
-/obj/effect/turf_decal/corner/transparent/green/diagonal,
-/obj/effect/turf_decal/siding/wideplating/dark{
- dir = 8
- },
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ruin/space/has_grav/spacemall/dorms)
-"Qo" = (
-/obj/effect/decal/cleanable/dirt,
+"Qq" = (
+/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/crate/wooden,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+ dir = 10
},
-/obj/effect/spawner/random/maintenance/two,
+/obj/structure/spider/stickyweb,
+/obj/effect/spawner/random/maintenance/three,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/maint)
"Qu" = (
@@ -11682,6 +11670,15 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shuttle)
+"RO" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/corner/transparent/black/diagonal,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/circuit/computer/common,
+/obj/item/research_notes/loot,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shop)
"RQ" = (
/obj/effect/turf_decal/industrial/caution{
dir = 8;
@@ -11822,6 +11819,17 @@
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
+"Sr" = (
+/obj/effect/decal/cleanable/greenglow,
+/obj/effect/spawner/random/medical/prosthetic,
+/obj/effect/spawner/random/medical/memeorgans,
+/obj/effect/spawner/random/medical/memeorgans,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/closet/crate/secure,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/maint)
"Ss" = (
/obj/structure/chair/stool/bar,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -11863,15 +11871,6 @@
/obj/structure/catwalk/over/plated_catwalk,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
-"SD" = (
-/obj/structure/bed,
-/obj/effect/spawner/random/bedsheet,
-/obj/item/toy/plush/slimeplushie{
- pixel_y = -4;
- pixel_x = 4
- },
-/turf/open/floor/wood,
-/area/ruin/space/has_grav/spacemall/dorms)
"SF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 6
@@ -12135,6 +12134,14 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/ruin/space/has_grav/spacemall/maint)
+"TF" = (
+/obj/effect/turf_decal/box,
+/obj/structure/closet/crate/trashcart,
+/obj/item/trash/popcorn,
+/obj/item/trash/candy,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shuttle)
"TG" = (
/obj/effect/turf_decal/siding/wideplating/dark/corner{
dir = 1
@@ -12214,13 +12221,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
-"TX" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/machinery/light/directional/east,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shop)
"TZ" = (
/obj/structure/table/reinforced,
/obj/effect/turf_decal/corner/opaque/blue/half{
@@ -12276,6 +12276,12 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/dorms)
+"Ui" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/corner/transparent/black/diagonal,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shop)
"Uj" = (
/obj/structure/railing{
dir = 4
@@ -12287,15 +12293,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop)
-"Ul" = (
-/obj/effect/turf_decal/box,
-/obj/structure/closet/crate/engineering/electrical,
-/obj/effect/spawner/random/techstorage,
-/obj/effect/spawner/random/techstorage,
-/obj/effect/spawner/random/stockparts,
-/obj/effect/spawner/random/maintenance,
-/turf/open/floor/plasteel,
-/area/ruin/space/has_grav/spacemall/shuttle)
"Um" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -12457,6 +12454,13 @@
name = "bathroom floor"
},
/area/ruin/space/has_grav/spacemall/maint)
+"UN" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/corner/transparent/black/diagonal,
+/obj/machinery/light/directional/east,
+/obj/effect/spawner/random/maintenance,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shop)
"UP" = (
/obj/structure/flora/junglebush/b,
/turf/open/floor/plating/grass,
@@ -12547,6 +12551,21 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
+"Vi" = (
+/obj/structure/bed,
+/obj/effect/spawner/random/bedsheet,
+/obj/item/toy/plush/slimeplushie{
+ pixel_y = -4;
+ pixel_x = 4
+ },
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/spacemall/dorms)
+"Vj" = (
+/obj/structure/rack,
+/obj/effect/spawner/random/engineering/tool/common,
+/obj/effect/turf_decal/corner/transparent/black/diagonal,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shop)
"Vk" = (
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/obj/structure/cable{
@@ -12596,19 +12615,6 @@
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
-"Vq" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
- dir = 1
- },
-/obj/structure/closet/crate,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/effect/spawner/random/maintenance/two,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/spacemall/maint)
"Vr" = (
/obj/machinery/light/directional/east,
/obj/structure/lattice,
@@ -12652,15 +12658,6 @@
/obj/machinery/power/port_gen/pacman/super,
/turf/open/floor/plating,
/area/ruin/space/has_grav/spacemall/maint)
-"VA" = (
-/obj/structure/rack,
-/obj/structure/window/reinforced/spawner,
-/obj/effect/spawner/random/medical/beaker,
-/obj/effect/spawner/random/medical/beaker,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/obj/item/clothing/neck/stethoscope,
-/turf/open/floor/plasteel/white,
-/area/ruin/space/has_grav/spacemall/shop2)
"VD" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -12898,6 +12895,14 @@
},
/turf/open/floor/plasteel/white,
/area/ruin/space/has_grav/spacemall/shop2)
+"Wv" = (
+/obj/effect/turf_decal/box,
+/obj/structure/closet/crate/secure,
+/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/random/clothing/costume,
+/obj/effect/spawner/random/clothing/costume,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav/spacemall/shuttle)
"Ww" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -13454,15 +13459,6 @@
/obj/item/toy/plush/spider,
/turf/open/floor/carpet/green,
/area/ruin/space/has_grav/spacemall/maint)
-"YP" = (
-/obj/structure/disposalpipe/segment{
- dir = 2
- },
-/obj/structure/closet/crate,
-/obj/effect/spawner/random/maintenance,
-/obj/effect/turf_decal/box,
-/turf/open/floor/plating,
-/area/ruin/space/has_grav/spacemall/maint)
"YQ" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -13899,22 +13895,22 @@ kb
QZ
yt
BN
-JE
+iK
yt
BN
-JE
+iK
yt
BN
-JE
+iK
yt
BN
-JE
+iK
yt
BN
-JE
+iK
yt
wC
-CR
+ON
bw
Kh
Kh
@@ -14156,8 +14152,8 @@ xI
xI
Wn
yt
-eX
-Qn
+vH
+qE
uu
qB
lk
@@ -14257,17 +14253,17 @@ yt
yt
yt
BF
-eU
+yr
yt
Nk
hV
eK
yt
BN
-SD
+Vi
yt
BN
-JE
+iK
bw
Kh
Kh
@@ -14407,7 +14403,7 @@ Vf
zN
yt
BF
-eU
+yr
yt
Nk
hV
@@ -14765,7 +14761,7 @@ EF
pW
qM
OY
-jm
+rp
MM
Wj
FC
@@ -15668,7 +15664,7 @@ sr
pX
Yy
xy
-bn
+GD
Yo
gm
sy
@@ -15945,8 +15941,8 @@ No
NY
zY
QS
-fi
-YP
+lX
+KN
zY
tj
zY
@@ -16093,7 +16089,7 @@ nX
Sh
gC
Yo
-EI
+rb
dj
pe
wi
@@ -16143,7 +16139,7 @@ Pq
ki
gC
Yo
-ob
+ej
zX
uM
qS
@@ -16193,7 +16189,7 @@ ts
XY
YA
Yo
-mJ
+xA
dK
pe
ry
@@ -16264,7 +16260,7 @@ UW
Jx
Od
tQ
-VA
+pK
TZ
sw
LG
@@ -16312,7 +16308,7 @@ zZ
nd
UW
Jx
-vS
+OM
Wr
xp
TZ
@@ -16389,7 +16385,7 @@ NX
NX
PM
og
-Vq
+Ol
ep
NX
eo
@@ -16788,7 +16784,7 @@ xN
vT
tu
ID
-Bq
+GG
VM
TE
LJ
@@ -16837,8 +16833,8 @@ Kh
xN
wF
sb
-jD
-Ul
+Wv
+KA
ra
TE
LJ
@@ -16938,7 +16934,7 @@ xN
kO
WH
FL
-yX
+Gm
uU
Nj
AM
@@ -16950,7 +16946,7 @@ Ca
eb
jE
DU
-DH
+mx
RG
dO
YG
@@ -16987,8 +16983,8 @@ Kh
fZ
aL
IS
-yC
-cO
+TF
+iu
fZ
FM
kj
@@ -17234,9 +17230,9 @@ Kh
Kh
qK
qK
-lQ
+Cq
ba
-yj
+hb
ZQ
hy
Yo
@@ -17285,8 +17281,8 @@ Kh
qK
mh
DF
-Qo
-Kl
+qJ
+HI
TT
On
BV
@@ -17384,7 +17380,7 @@ Kh
Kh
qK
hE
-Mb
+Sr
EN
nK
eH
@@ -17397,10 +17393,10 @@ Hq
vG
cs
pe
-Qf
+Vj
qj
tD
-gu
+Gn
RH
dO
YG
@@ -17433,10 +17429,10 @@ Kh
Kh
Kh
qK
-fh
-Cu
+fP
+Qq
Zf
-pB
+gP
dW
Tc
Yo
@@ -17447,10 +17443,10 @@ yQ
CJ
ZT
pe
-eS
+gh
qj
bY
-Ag
+RO
RH
UW
YG
@@ -17497,10 +17493,10 @@ dZ
Mk
JW
pe
-vp
+Ui
tD
qj
-vp
+Ui
RH
UW
kN
@@ -17598,9 +17594,9 @@ ps
Wd
pe
Im
-TX
-LS
-Qf
+UN
+zd
+Vj
pe
PO
Df
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index a9bc0c4c3b52..d8a562fe99e5 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -1133,13 +1133,6 @@
},
/turf/open/space,
/area/centcom/ferry)
-"apD" = (
-/obj/machinery/door/airlock/grunge{
- req_access = "109";
- dir = 8
- },
-/turf/open/floor/plasteel/dark,
-/area/centcom)
"apF" = (
/obj/machinery/door/airlock/centcom{
name = "Auxillary Dock";
@@ -2647,19 +2640,6 @@
"aAN" = (
/turf/open/floor/circuit/green,
/area/centcom/ferry)
-"aAP" = (
-/obj/structure/rack,
-/obj/item/clothing/under/color/red,
-/obj/item/clothing/shoes/sneakers/brown,
-/obj/item/clothing/suit/armor/tdome/red,
-/obj/item/clothing/head/helmet/thunderdome,
-/obj/item/melee/baton/loaded,
-/obj/item/melee/energy/sword/saber/red,
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/tdome/arena)
"aAT" = (
/obj/structure/sign/departments/medbay/alt,
/turf/closed/indestructible/riveted,
@@ -3948,19 +3928,6 @@
/obj/item/paper_bin,
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
-"aLT" = (
-/obj/structure/rack,
-/obj/item/clothing/under/color/green,
-/obj/item/clothing/shoes/sneakers/brown,
-/obj/item/clothing/suit/armor/tdome/green,
-/obj/item/clothing/head/helmet/thunderdome,
-/obj/item/melee/baton/loaded,
-/obj/item/melee/energy/sword/saber/green,
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/tdome/arena)
"aLU" = (
/obj/structure/chair{
dir = 1
@@ -3969,47 +3936,6 @@
/obj/machinery/light/directional/south,
/turf/open/floor/plasteel,
/area/centcom/evac)
-"aLV" = (
-/turf/closed/indestructible/riveted,
-/area/errorroom)
-"aLW" = (
-/turf/closed/mineral/ash_rock,
-/area/errorroom)
-"aLX" = (
-/obj/structure/speaking_tile,
-/turf/closed/mineral/ash_rock,
-/area/errorroom)
-"aLY" = (
-/obj/item/rupee,
-/turf/open/floor/plating/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
- planetary_atmos = 0
- },
-/area/errorroom)
-"aLZ" = (
-/turf/open/floor/plating/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
- planetary_atmos = 0
- },
-/area/errorroom)
-"aMa" = (
-/obj/effect/landmark/error,
-/turf/open/floor/plating/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
- planetary_atmos = 0
- },
-/area/errorroom)
-"aMb" = (
-/obj/structure/signpost/salvation{
- icon = 'icons/obj/structures.dmi';
- icon_state = "ladder10";
- invisibility = 100
- },
-/turf/open/floor/plating/ashplanet/wateryrock{
- initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
- planetary_atmos = 0
- },
-/area/errorroom)
"aMc" = (
/obj/structure/lattice,
/turf/open/space,
@@ -4844,27 +4770,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/supplypod)
-"aRr" = (
-/obj/structure/closet/secure_closet/personal/cabinet,
-/obj/item/clothing/under/rank/civilian/curator/treasure_hunter,
-/obj/item/clothing/under/dress/skirt/color,
-/obj/item/clothing/under/shorts/black,
-/obj/item/clothing/under/pants/track,
-/obj/item/clothing/accessory/armband/deputy,
-/obj/item/clothing/accessory/waistcoat,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/laceup,
-/obj/item/clothing/neck/stripedredscarf,
-/obj/item/clothing/neck/tie/red,
-/obj/item/clothing/head/helmet/space/beret,
-/obj/item/clothing/suit/armor/curator,
-/obj/item/clothing/suit/space/officer,
-/obj/item/clothing/gloves/fingerless,
-/obj/item/clothing/gloves/color/black,
-/obj/item/clothing/glasses/eyepatch,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/plasteel/grimy,
-/area/centcom/ferry)
"aRs" = (
/obj/structure/table/reinforced,
/obj/item/storage/box/emps,
@@ -5511,11 +5416,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
-"aVT" = (
-/obj/effect/turf_decal/corner/opaque/lime/half,
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/centcom)
"aVU" = (
/obj/machinery/door/poddoor/shutters{
id = "XCCcustoms2";
@@ -6441,6 +6341,13 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/supply)
+"bEQ" = (
+/obj/item/rupee,
+/turf/open/floor/plating/ashplanet/wateryrock{
+ initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ planetary_atmos = 0
+ },
+/area/errorroom)
"bFc" = (
/obj/structure/table/reinforced,
/obj/item/radio/intercom/wideband/table{
@@ -6909,20 +6816,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
-"cDD" = (
-/obj/effect/turf_decal/corner/opaque/blue{
- dir = 1
- },
-/obj/effect/turf_decal/corner/opaque/blue,
-/obj/effect/turf_decal/corner/opaque/blue{
- dir = 4
- },
-/obj/effect/turf_decal/corner/opaque/blue{
- dir = 8
- },
-/obj/item/melee/energy/ctf,
-/turf/open/floor/plasteel/dark,
-/area/ctf)
"cEn" = (
/obj/structure/chair/comfy/orange/directional/north,
/obj/effect/turf_decal/corner/transparent/neutral{
@@ -6963,12 +6856,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/evac)
-"cIk" = (
-/obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/centcom)
"cIS" = (
/obj/structure/rack,
/obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq,
@@ -7215,6 +7102,14 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
+"dsD" = (
+/obj/structure/railing,
+/obj/structure/sign/flag/gezena{
+ dir = 4;
+ pixel_x = -30
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/centcom)
"dtx" = (
/obj/structure/table/wood,
/obj/item/phone{
@@ -7262,10 +7157,25 @@
},
/turf/open/floor/plasteel/patterned/grid,
/area/centcom)
+"dva" = (
+/obj/structure/table/reinforced,
+/obj/item/desk_flag/gezena{
+ pixel_x = 11;
+ pixel_y = 13
+ },
+/obj/item/clothing/head/gezena/captain{
+ pixel_x = -9;
+ pixel_y = 6
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/centcom)
"dvo" = (
/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/plasteel/dark,
/area/ctf)
+"dvE" = (
+/turf/closed/mineral/ash_rock,
+/area/errorroom)
"dAW" = (
/obj/item/storage/box/handcuffs,
/obj/item/crowbar/red,
@@ -7282,14 +7192,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
-"dBb" = (
-/obj/structure/table/reinforced,
-/obj/item/radio/intercom/wideband/table{
- dir = 1
- },
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/centcom)
"dER" = (
/turf/open/floor/carpet/royalblue,
/area/centcom)
@@ -7586,6 +7488,13 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/supply)
+"edR" = (
+/obj/effect/turf_decal/spline/fancy/opaque/lime{
+ dir = 1
+ },
+/obj/structure/closet/crate/bin,
+/turf/open/floor/plasteel/dark,
+/area/centcom)
"efL" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -7732,6 +7641,12 @@
},
/turf/open/floor/wood/walnut,
/area/centcom)
+"ers" = (
+/obj/structure/table/reinforced,
+/obj/machinery/fax/admin/pgf,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/centcom)
"etl" = (
/obj/effect/turf_decal/siding/wood{
dir = 4
@@ -7851,20 +7766,6 @@
"eAJ" = (
/turf/closed/indestructible/wood,
/area/centcom)
-"eCK" = (
-/obj/effect/turf_decal/corner/opaque/red{
- dir = 1
- },
-/obj/effect/turf_decal/corner/opaque/red,
-/obj/effect/turf_decal/corner/opaque/red{
- dir = 4
- },
-/obj/effect/turf_decal/corner/opaque/red{
- dir = 8
- },
-/obj/item/melee/energy/ctf,
-/turf/open/floor/plasteel/dark,
-/area/ctf)
"eDS" = (
/obj/machinery/airalarm/directional/east,
/obj/structure/filingcabinet/filingcabinet,
@@ -8177,24 +8078,6 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/plasteel/dark,
/area/centcom/control)
-"feC" = (
-/obj/effect/turf_decal/spline/fancy/opaque/lime{
- dir = 1
- },
-/obj/structure/table/reinforced,
-/obj/item/folder/yellow{
- pixel_y = 5;
- pixel_x = 7
- },
-/obj/item/folder/blue{
- pixel_x = 3
- },
-/obj/item/folder/red{
- pixel_x = -6;
- pixel_y = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/centcom)
"ffT" = (
/obj/structure/table/wood,
/obj/structure/mirror{
@@ -8229,6 +8112,20 @@
},
/turf/open/floor/plasteel/dark,
/area/ctf)
+"fjG" = (
+/obj/effect/turf_decal/corner/opaque/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/red,
+/obj/effect/turf_decal/corner/opaque/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/red{
+ dir = 8
+ },
+/obj/item/melee/energy/ctf,
+/turf/open/floor/plasteel/dark,
+/area/ctf)
"fkO" = (
/obj/structure/closet/crate/bin,
/obj/effect/turf_decal/corner/opaque/green{
@@ -8328,13 +8225,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
-"fuf" = (
-/obj/effect/turf_decal/spline/fancy/opaque/lime{
- dir = 1
- },
-/obj/structure/reagent_dispensers/water_cooler,
-/turf/open/floor/plasteel/dark,
-/area/centcom)
"fvB" = (
/obj/effect/turf_decal/industrial/warning{
dir = 8
@@ -8431,19 +8321,6 @@
/obj/effect/turf_decal/industrial/outline/yellow,
/turf/open/floor/plasteel,
/area/centcom/supply)
-"fMV" = (
-/obj/structure/rack,
-/obj/item/clothing/under/color/green,
-/obj/item/clothing/shoes/sneakers/brown,
-/obj/item/clothing/suit/armor/tdome/green,
-/obj/item/clothing/head/helmet/thunderdome,
-/obj/item/melee/baton/loaded,
-/obj/item/melee/energy/sword/saber/green,
-/obj/effect/turf_decal/industrial/warning{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/tdome/arena_source)
"fNh" = (
/obj/item/storage/firstaid/regular,
/obj/structure/table,
@@ -8678,13 +8555,6 @@
},
/turf/open/floor/carpet/royalblue,
/area/centcom)
-"gga" = (
-/obj/machinery/telecomms/relay/preset/pgf,
-/obj/effect/turf_decal/spline/fancy/opaque/lime{
- dir = 1
- },
-/turf/open/floor/plasteel/dark,
-/area/centcom)
"ggX" = (
/obj/machinery/pdapainter,
/obj/effect/turf_decal/corner/transparent/neutral{
@@ -8806,6 +8676,13 @@
/obj/structure/closet/crate/bin,
/turf/open/floor/wood/walnut,
/area/centcom)
+"guF" = (
+/obj/effect/landmark/error,
+/turf/open/floor/plating/ashplanet/wateryrock{
+ initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ planetary_atmos = 0
+ },
+/area/errorroom)
"gwE" = (
/obj/effect/turf_decal/corner/opaque/blue{
dir = 1
@@ -9006,6 +8883,9 @@
},
/turf/open/floor/plasteel,
/area/centcom/supply)
+"gRm" = (
+/turf/closed/indestructible/titanium/nodiagnonal,
+/area/centcom)
"gTh" = (
/obj/structure/table/wood,
/obj/item/storage/photo_album,
@@ -9133,6 +9013,13 @@
},
/turf/open/floor/plasteel,
/area/centcom/ferry)
+"hmi" = (
+/obj/machinery/door/airlock/grunge{
+ req_access = "109";
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/centcom)
"hob" = (
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/corner/opaque/green{
@@ -9332,6 +9219,11 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
+"hKv" = (
+/obj/effect/turf_decal/corner/opaque/lime/half,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/centcom)
"hLw" = (
/obj/effect/turf_decal/corner/opaque/green{
dir = 1
@@ -9368,12 +9260,6 @@
},
/turf/open/floor/plasteel,
/area/syndicate_mothership/control)
-"hRd" = (
-/obj/effect/turf_decal/corner_steel_grid{
- dir = 10
- },
-/turf/open/floor/plasteel/telecomms_floor,
-/area/centcom)
"hRK" = (
/obj/effect/turf_decal/corner/opaque/red{
dir = 1
@@ -9400,10 +9286,6 @@
},
/turf/open/floor/circuit/red,
/area/ctf)
-"hUN" = (
-/obj/effect/turf_decal/corner/opaque/lime/half,
-/turf/open/floor/plasteel/dark,
-/area/centcom)
"hVO" = (
/obj/machinery/computer/security/telescreen,
/obj/structure/table/reinforced,
@@ -10350,6 +10232,19 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/supply)
+"jLZ" = (
+/obj/structure/rack,
+/obj/item/clothing/under/color/green,
+/obj/item/clothing/shoes/sneakers/brown,
+/obj/item/clothing/suit/armor/tdome/green,
+/obj/item/clothing/head/helmet/thunderdome,
+/obj/item/melee/baton/loaded,
+/obj/item/melee/energy/sword/saber/green,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/tdome/arena_source)
"jPn" = (
/obj/effect/turf_decal/syndicateemblem/middle/middle,
/turf/open/floor/mineral/plastitanium/red,
@@ -10605,6 +10500,19 @@
},
/turf/open/floor/mineral/plastitanium,
/area/centcom)
+"kjd" = (
+/obj/structure/rack,
+/obj/item/clothing/under/color/red,
+/obj/item/clothing/shoes/sneakers/brown,
+/obj/item/clothing/suit/armor/tdome/red,
+/obj/item/clothing/head/helmet/thunderdome,
+/obj/item/melee/baton/loaded,
+/obj/item/melee/energy/sword/saber/red,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/tdome/arena_source)
"kjt" = (
/obj/machinery/computer/communications{
dir = 8
@@ -10658,13 +10566,6 @@
},
/turf/open/floor/plasteel,
/area/tdome/arena_source)
-"kkW" = (
-/obj/effect/turf_decal/spline/fancy/opaque/lime{
- dir = 1
- },
-/obj/structure/closet/crate/bin,
-/turf/open/floor/plasteel/dark,
-/area/centcom)
"kmQ" = (
/obj/effect/turf_decal/syndicateemblem/middle/right,
/obj/structure/chair/office/dark{
@@ -10672,12 +10573,6 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/centcom)
-"knM" = (
-/obj/structure/table/reinforced,
-/obj/machinery/fax/admin/pgf,
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/centcom)
"kqM" = (
/obj/machinery/shower{
dir = 4
@@ -10770,6 +10665,13 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
+"kDv" = (
+/obj/machinery/telecomms/relay/preset/pgf,
+/obj/effect/turf_decal/spline/fancy/opaque/lime{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/centcom)
"kEm" = (
/obj/effect/turf_decal/industrial/warning,
/obj/machinery/light/directional/south,
@@ -11207,6 +11109,19 @@
},
/turf/open/floor/plasteel,
/area/centcom/supply)
+"lAh" = (
+/obj/structure/rack,
+/obj/item/clothing/under/color/red,
+/obj/item/clothing/shoes/sneakers/brown,
+/obj/item/clothing/suit/armor/tdome/red,
+/obj/item/clothing/head/helmet/thunderdome,
+/obj/item/melee/baton/loaded,
+/obj/item/melee/energy/sword/saber/red,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/tdome/arena)
"lAs" = (
/obj/machinery/door/airlock/centcom{
name = "Shuttle Control Office";
@@ -11275,6 +11190,10 @@
/obj/machinery/firealarm/directional/east,
/turf/open/floor/plasteel/dark,
/area/tdome/tdomeadmin)
+"lEw" = (
+/obj/structure/speaking_tile,
+/turf/closed/mineral/ash_rock,
+/area/errorroom)
"lEZ" = (
/obj/effect/turf_decal/corner/opaque/brown,
/obj/effect/turf_decal/corner/opaque/brown{
@@ -11461,6 +11380,10 @@
},
/turf/open/floor/plasteel,
/area/tdome/arena_source)
+"lWX" = (
+/obj/machinery/computer/secure_data,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/centcom)
"lXt" = (
/obj/item/kirbyplants{
icon_state = "plant-21"
@@ -11658,6 +11581,16 @@
},
/turf/open/floor/plasteel/dark,
/area/ctf)
+"mmz" = (
+/obj/effect/turf_decal/corner_steel_grid{
+ dir = 10
+ },
+/obj/effect/turf_decal/floordetail/tiled,
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/centcom)
"moE" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/secure_data/laptop{
@@ -11705,6 +11638,13 @@
/obj/machinery/light/directional/west,
/turf/open/floor/plasteel,
/area/centcom/control)
+"msb" = (
+/obj/effect/turf_decal/spline/fancy/opaque/lime{
+ dir = 1
+ },
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/plasteel/dark,
+/area/centcom)
"msQ" = (
/obj/structure/table/reinforced,
/obj/structure/sign/poster/contraband/cybersun{
@@ -11782,14 +11722,6 @@
},
/turf/open/floor/mineral/plastitanium/red,
/area/centcom)
-"mzB" = (
-/obj/structure/railing,
-/obj/structure/sign/flag/gezena{
- dir = 4;
- pixel_x = -30
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/centcom)
"mzM" = (
/obj/structure/fans/tiny,
/obj/effect/turf_decal/corner/transparent/neutral{
@@ -12121,6 +12053,9 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
+"ngI" = (
+/turf/closed/indestructible/riveted,
+/area/errorroom)
"ngV" = (
/obj/structure/table/reinforced,
/obj/item/flashlight/seclite,
@@ -13013,6 +12948,28 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
+"oXW" = (
+/obj/structure/railing,
+/turf/open/floor/plasteel/mono/dark,
+/area/centcom)
+"oYg" = (
+/obj/effect/turf_decal/spline/fancy/opaque/lime{
+ dir = 1
+ },
+/obj/structure/table/reinforced,
+/obj/item/folder/yellow{
+ pixel_y = 5;
+ pixel_x = 7
+ },
+/obj/item/folder/blue{
+ pixel_x = 3
+ },
+/obj/item/folder/red{
+ pixel_x = -6;
+ pixel_y = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/centcom)
"oYE" = (
/obj/effect/turf_decal/corner/opaque/green{
dir = 8
@@ -13141,6 +13098,18 @@
},
/turf/open/floor/plasteel,
/area/centcom/ferry)
+"pqm" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/open/floor/plasteel/stairs{
+ icon = 'icons/obj/stairs.dmi';
+ dir = 1
+ },
+/area/centcom)
"psm" = (
/obj/effect/turf_decal/siding/wood{
dir = 10;
@@ -13255,16 +13224,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
-"pwQ" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/fueltank,
-/obj/item/weldingtool/experimental,
-/obj/machinery/power/terminal{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/centcom/ferry)
"pxL" = (
/obj/effect/turf_decal/corner/opaque/blue,
/obj/effect/turf_decal/corner/opaque/blue{
@@ -13424,6 +13383,27 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
+"pIe" = (
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/item/clothing/under/rank/civilian/curator/treasure_hunter,
+/obj/item/clothing/under/dress/skirt/color,
+/obj/item/clothing/under/shorts/black,
+/obj/item/clothing/under/pants/track,
+/obj/item/clothing/accessory/armband/deputy,
+/obj/item/clothing/accessory/waistcoat,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/neck/stripedredscarf,
+/obj/item/clothing/neck/tie/red,
+/obj/item/clothing/head/helmet/space/beret,
+/obj/item/clothing/suit/armor/curator,
+/obj/item/clothing/suit/space/officer,
+/obj/item/clothing/gloves/fingerless,
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/glasses/eyepatch,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plasteel/grimy,
+/area/centcom/ferry)
"pIW" = (
/obj/machinery/computer/cargo{
dir = 4
@@ -13630,6 +13610,12 @@
},
/turf/open/floor/plasteel,
/area/tdome/arena_source)
+"qfB" = (
+/obj/effect/turf_decal/corner_steel_grid{
+ dir = 10
+ },
+/turf/open/floor/plasteel/telecomms_floor,
+/area/centcom)
"qfV" = (
/obj/effect/turf_decal/industrial/warning{
dir = 9
@@ -13765,6 +13751,17 @@
},
/turf/open/floor/plasteel/white,
/area/tdome/tdomeobserve)
+"qCO" = (
+/obj/structure/signpost/salvation{
+ icon = 'icons/obj/structures.dmi';
+ icon_state = "ladder10";
+ invisibility = 100
+ },
+/turf/open/floor/plating/ashplanet/wateryrock{
+ initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ planetary_atmos = 0
+ },
+/area/errorroom)
"qFm" = (
/obj/machinery/computer/crew{
dir = 1
@@ -13926,18 +13923,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
-"qXV" = (
-/obj/structure/railing{
- dir = 8
- },
-/obj/structure/railing{
- dir = 4
- },
-/turf/open/floor/plasteel/stairs{
- icon = 'icons/obj/stairs.dmi';
- dir = 1
- },
-/area/centcom)
"qYE" = (
/obj/structure/table/wood,
/obj/item/phone{
@@ -13988,6 +13973,15 @@
/obj/structure/cable,
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
+"rby" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/power/terminal{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/centcom/ferry)
"rcL" = (
/obj/machinery/icecream_vat,
/obj/effect/turf_decal/corner/transparent/neutral{
@@ -14358,6 +14352,10 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
+"rDI" = (
+/obj/effect/turf_decal/corner/opaque/lime/half,
+/turf/open/floor/plasteel/dark,
+/area/centcom)
"rFv" = (
/obj/structure/table/wood,
/obj/item/storage/box/drinkingglasses,
@@ -14496,19 +14494,6 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/control)
-"rPK" = (
-/obj/structure/rack,
-/obj/item/clothing/under/color/red,
-/obj/item/clothing/shoes/sneakers/brown,
-/obj/item/clothing/suit/armor/tdome/red,
-/obj/item/clothing/head/helmet/thunderdome,
-/obj/item/melee/baton/loaded,
-/obj/item/melee/energy/sword/saber/red,
-/obj/effect/turf_decal/industrial/warning{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/tdome/arena_source)
"rQy" = (
/obj/machinery/button/door/indestructible{
id = "thunderdomehea";
@@ -14599,6 +14584,12 @@
},
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
+"scZ" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/centcom)
"sdr" = (
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
@@ -14693,16 +14684,6 @@
},
/turf/open/floor/plasteel,
/area/tdome/arena_source)
-"sqO" = (
-/obj/effect/turf_decal/corner_steel_grid{
- dir = 10
- },
-/obj/effect/turf_decal/floordetail/tiled,
-/obj/structure/chair/comfy/shuttle{
- dir = 1
- },
-/turf/open/floor/plasteel/telecomms_floor,
-/area/centcom)
"ssv" = (
/obj/effect/turf_decal/industrial/warning{
dir = 9
@@ -15026,9 +15007,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ctf)
-"tcl" = (
-/turf/closed/indestructible/titanium/nodiagnonal,
-/area/centcom)
"tdN" = (
/obj/structure/chair{
dir = 8
@@ -15153,18 +15131,6 @@
},
/turf/open/floor/plasteel/white,
/area/tdome/tdomeobserve)
-"tmB" = (
-/obj/structure/table/reinforced,
-/obj/item/desk_flag/gezena{
- pixel_x = 11;
- pixel_y = 13
- },
-/obj/item/clothing/head/gezena/captain{
- pixel_x = -9;
- pixel_y = 6
- },
-/turf/open/floor/plasteel/telecomms_floor,
-/area/centcom)
"tos" = (
/obj/structure/table/wood,
/obj/item/folder/red,
@@ -15233,10 +15199,6 @@
color = "#808080"
},
/area/centcom)
-"tus" = (
-/obj/machinery/computer/secure_data,
-/turf/open/floor/plasteel/telecomms_floor,
-/area/centcom)
"tuw" = (
/obj/effect/turf_decal/industrial/loading{
dir = 8
@@ -15495,6 +15457,19 @@
/obj/structure/catwalk/over,
/turf/open/floor/plating,
/area/centcom)
+"tVU" = (
+/obj/structure/rack,
+/obj/item/clothing/under/color/green,
+/obj/item/clothing/shoes/sneakers/brown,
+/obj/item/clothing/suit/armor/tdome/green,
+/obj/item/clothing/head/helmet/thunderdome,
+/obj/item/melee/baton/loaded,
+/obj/item/melee/energy/sword/saber/green,
+/obj/effect/turf_decal/industrial/warning{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/tdome/arena)
"tWM" = (
/obj/structure/table/reinforced,
/obj/item/radio{
@@ -15628,10 +15603,6 @@
},
/turf/open/floor/plasteel,
/area/centcom/control)
-"uuR" = (
-/obj/structure/railing,
-/turf/open/floor/plasteel/mono/dark,
-/area/centcom)
"uuY" = (
/obj/effect/turf_decal/syndicateemblem/bottom/right,
/turf/open/floor/mineral/plastitanium/red,
@@ -15778,6 +15749,13 @@
},
/turf/open/floor/plasteel/white,
/area/centcom/control)
+"uMM" = (
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/decal/cleanable/oil,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel,
+/area/centcom/ferry)
"uNn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -15897,13 +15875,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ctf)
-"vac" = (
-/obj/structure/railing/corner{
- dir = 8
- },
-/obj/structure/railing/corner,
-/turf/open/floor/plasteel/mono/dark,
-/area/centcom)
"vcL" = (
/obj/machinery/computer,
/obj/effect/turf_decal/corner/transparent/bar,
@@ -16004,6 +15975,20 @@
},
/turf/open/floor/plasteel/dark,
/area/ctf)
+"vln" = (
+/obj/effect/turf_decal/corner/opaque/blue{
+ dir = 1
+ },
+/obj/effect/turf_decal/corner/opaque/blue,
+/obj/effect/turf_decal/corner/opaque/blue{
+ dir = 4
+ },
+/obj/effect/turf_decal/corner/opaque/blue{
+ dir = 8
+ },
+/obj/item/melee/energy/ctf,
+/turf/open/floor/plasteel/dark,
+/area/ctf)
"vlC" = (
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
@@ -16234,6 +16219,14 @@
},
/turf/open/floor/plasteel/white,
/area/centcom/holding)
+"vMz" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/wideband/table{
+ dir = 1
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/centcom)
"vNl" = (
/obj/machinery/vending/boozeomat,
/obj/machinery/light/directional/east,
@@ -16311,14 +16304,6 @@
},
/turf/open/floor/plasteel,
/area/centcom)
-"wbx" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/item/weldingtool/experimental,
-/obj/effect/decal/cleanable/oil,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel,
-/area/centcom/ferry)
"wbz" = (
/obj/machinery/computer/security,
/obj/effect/turf_decal/industrial/warning,
@@ -16393,6 +16378,12 @@
},
/turf/open/floor/plasteel,
/area/centcom/supply)
+"wiK" = (
+/turf/open/floor/plating/ashplanet/wateryrock{
+ initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
+ planetary_atmos = 0
+ },
+/area/errorroom)
"wjj" = (
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
@@ -16824,15 +16815,6 @@
/obj/effect/turf_decal/syndicateemblem/top/middle,
/turf/open/floor/mineral/plastitanium/red,
/area/centcom)
-"xAA" = (
-/obj/structure/railing,
-/obj/structure/sign/flag/gezena{
- dir = 8;
- pixel_y = 0;
- pixel_x = 30
- },
-/turf/open/floor/plasteel/mono/dark,
-/area/centcom)
"xEx" = (
/obj/structure/chair,
/obj/effect/turf_decal/industrial/warning{
@@ -16856,6 +16838,22 @@
/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/plasteel,
/area/centcom/ferry)
+"xHM" = (
+/obj/structure/railing,
+/obj/structure/sign/flag/gezena{
+ dir = 8;
+ pixel_y = 0;
+ pixel_x = 30
+ },
+/turf/open/floor/plasteel/mono/dark,
+/area/centcom)
+"xJB" = (
+/obj/structure/railing/corner{
+ dir = 8
+ },
+/obj/structure/railing/corner,
+/turf/open/floor/plasteel/mono/dark,
+/area/centcom)
"xKt" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/shovel/spade,
@@ -17507,17 +17505,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
aaa
"}
(3,1,1) = {"
@@ -17764,17 +17762,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLW
-aLW
-aLW
-aLW
-aLW
-aLW
-aLW
-aLW
-aLV
+ngI
+dvE
+dvE
+dvE
+dvE
+dvE
+dvE
+dvE
+dvE
+dvE
+ngI
aaa
"}
(4,1,1) = {"
@@ -18021,17 +18019,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLY
-aLY
-aLY
-aLZ
-aLY
-aLY
-aLY
-aLW
-aLV
+ngI
+dvE
+bEQ
+bEQ
+bEQ
+wiK
+bEQ
+bEQ
+bEQ
+dvE
+ngI
aaa
"}
(5,1,1) = {"
@@ -18278,17 +18276,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLY
-aLY
-aLY
-aLZ
-aLY
-aLY
-aLY
-aLW
-aLV
+ngI
+dvE
+bEQ
+bEQ
+bEQ
+wiK
+bEQ
+bEQ
+bEQ
+dvE
+ngI
aaa
"}
(6,1,1) = {"
@@ -18535,17 +18533,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLY
-aLY
-aLY
-aLZ
-aLY
-aLY
-aLY
-aLW
-aLV
+ngI
+dvE
+bEQ
+bEQ
+bEQ
+wiK
+bEQ
+bEQ
+bEQ
+dvE
+ngI
aaa
"}
(7,1,1) = {"
@@ -18792,17 +18790,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLZ
-aLZ
-aLZ
-aLZ
-aLZ
-aLZ
-aLZ
-aLW
-aLV
+ngI
+dvE
+wiK
+wiK
+wiK
+wiK
+wiK
+wiK
+wiK
+dvE
+ngI
aaa
"}
(8,1,1) = {"
@@ -19049,17 +19047,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLY
-aLY
-aLY
-aLZ
-aLZ
-aLZ
-aLZ
-aLW
-aLV
+ngI
+dvE
+bEQ
+bEQ
+bEQ
+wiK
+wiK
+wiK
+wiK
+dvE
+ngI
aaa
"}
(9,1,1) = {"
@@ -19306,17 +19304,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLX
-aLY
-aLY
-aLY
-aLZ
-aLZ
-aMa
-aMb
-aLW
-aLV
+ngI
+lEw
+bEQ
+bEQ
+bEQ
+wiK
+wiK
+guF
+qCO
+dvE
+ngI
aaa
"}
(10,1,1) = {"
@@ -19563,17 +19561,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLY
-aLY
-aLY
-aLZ
-aLZ
-aLZ
-aLZ
-aLW
-aLV
+ngI
+dvE
+bEQ
+bEQ
+bEQ
+wiK
+wiK
+wiK
+wiK
+dvE
+ngI
aaa
"}
(11,1,1) = {"
@@ -19820,17 +19818,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLZ
-aLZ
-aLZ
-aLZ
-aLZ
-aLZ
-aLZ
-aLW
-aLV
+ngI
+dvE
+wiK
+wiK
+wiK
+wiK
+wiK
+wiK
+wiK
+dvE
+ngI
aaa
"}
(12,1,1) = {"
@@ -20077,17 +20075,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLY
-aLY
-aLY
-aLZ
-aLY
-aLY
-aLY
-aLW
-aLV
+ngI
+dvE
+bEQ
+bEQ
+bEQ
+wiK
+bEQ
+bEQ
+bEQ
+dvE
+ngI
aaa
"}
(13,1,1) = {"
@@ -20334,17 +20332,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLY
-aLY
-aLY
-aLZ
-aLY
-aLY
-aLY
-aLW
-aLV
+ngI
+dvE
+bEQ
+bEQ
+bEQ
+wiK
+bEQ
+bEQ
+bEQ
+dvE
+ngI
aaa
"}
(14,1,1) = {"
@@ -20591,17 +20589,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLY
-aLY
-aLY
-aLZ
-aLY
-aLY
-aLY
-aLW
-aLV
+ngI
+dvE
+bEQ
+bEQ
+bEQ
+wiK
+bEQ
+bEQ
+bEQ
+dvE
+ngI
aaa
"}
(15,1,1) = {"
@@ -20848,17 +20846,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLW
-aLW
-aLW
-aLW
-aLW
-aLW
-aLW
-aLW
-aLW
-aLV
+ngI
+dvE
+dvE
+dvE
+dvE
+dvE
+dvE
+dvE
+dvE
+dvE
+ngI
aaa
"}
(16,1,1) = {"
@@ -21105,17 +21103,17 @@ aaa
aaa
aaa
aaa
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
-aLV
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
+ngI
aaa
"}
(17,1,1) = {"
@@ -30579,13 +30577,13 @@ aaa
aaa
aaa
aaa
-tcl
-tcl
-tcl
-tcl
-tcl
-apD
-tcl
+gRm
+gRm
+gRm
+gRm
+gRm
+hmi
+gRm
aaa
aPu
aPu
@@ -30836,13 +30834,13 @@ aaa
aaa
aaa
aaa
-tcl
-knM
-hRd
-mzB
-gga
-aVT
-tcl
+gRm
+ers
+qfB
+dsD
+kDv
+hKv
+gRm
aaa
aPu
nYZ
@@ -31093,13 +31091,13 @@ aaa
aaa
aaa
aaa
-tcl
-tmB
-sqO
-uuR
-kkW
-hUN
-tcl
+gRm
+dva
+mmz
+oXW
+edR
+rDI
+gRm
aaa
aPu
qLN
@@ -31350,13 +31348,13 @@ aaa
aaa
aaa
aaa
-tcl
-cIk
-hRd
-vac
-qXV
-hUN
-tcl
+gRm
+scZ
+qfB
+xJB
+pqm
+rDI
+gRm
aaa
aPu
wAh
@@ -31607,13 +31605,13 @@ aaa
aaa
aaa
aaa
-tcl
-tus
-sqO
-uuR
-feC
-hUN
-tcl
+gRm
+lWX
+mmz
+oXW
+oYg
+rDI
+gRm
aaa
aPu
sZJ
@@ -31864,13 +31862,13 @@ aaa
aaa
aaa
aaa
-tcl
-dBb
-hRd
-xAA
-fuf
-aVT
-tcl
+gRm
+vMz
+qfB
+xHM
+msb
+hKv
+gRm
aaa
aPu
lKP
@@ -32121,13 +32119,13 @@ aaa
aaa
aaa
aaa
-tcl
-tcl
-tcl
-tcl
-tcl
-apD
-tcl
+gRm
+gRm
+gRm
+gRm
+gRm
+hmi
+gRm
aaa
aPu
aPu
@@ -53410,7 +53408,7 @@ amD
aoe
aoe
amD
-wbx
+uMM
vkq
vkq
vkq
@@ -56234,7 +56232,7 @@ amD
uRu
aoI
aXW
-aRr
+pIe
oJB
anU
inF
@@ -56531,12 +56529,12 @@ aEp
qVj
sdr
aEp
-aAP
-aAP
-aAP
-aAP
-aAP
-aAP
+lAh
+lAh
+lAh
+lAh
+lAh
+lAh
aIv
tzt
sJU
@@ -56751,7 +56749,7 @@ ipU
hYc
lmp
anT
-pwQ
+rby
sSM
avc
amD
@@ -64241,12 +64239,12 @@ aEp
ric
sdr
aEp
-aLT
-aLT
-aLT
-aLT
-aLT
-aLT
+tVU
+tVU
+tVU
+tVU
+tVU
+tVU
aIv
tzt
ldM
@@ -64913,7 +64911,7 @@ agh
pJt
iku
pJt
-cDD
+vln
pJt
iku
pJt
@@ -72109,7 +72107,7 @@ agh
eSF
fhP
eSF
-eCK
+fjG
eSF
fhP
eSF
@@ -74320,12 +74318,12 @@ aaa
(224,1,1) = {"
aab
aab
-rPK
-rPK
-rPK
-rPK
-rPK
-rPK
+kjd
+kjd
+kjd
+kjd
+kjd
+kjd
aab
aaa
aaa
@@ -82030,12 +82028,12 @@ aaa
(254,1,1) = {"
aab
aab
-fMV
-fMV
-fMV
-fMV
-fMV
-fMV
+jLZ
+jLZ
+jLZ
+jLZ
+jLZ
+jLZ
aab
aaa
aaa
diff --git a/code/__DEFINES/cells.dm b/code/__DEFINES/cells.dm
new file mode 100644
index 000000000000..376910741b2b
--- /dev/null
+++ b/code/__DEFINES/cells.dm
@@ -0,0 +1,13 @@
+//General defines for items that use power and the cell component.
+/// The minimal amount of power an item can use.
+#define POWER_CELL_USE_MINIMUM 1
+/// For items that barely use any power at all.
+#define POWER_CELL_USE_VERY_LOW 10
+/// For items that generally wouldn't use very much power.
+#define POWER_CELL_USE_LOW 30
+/// For items that use a average amount of power.
+#define POWER_CELL_USE_NORMAL 50
+/// For items that use a high amount of power.
+#define POWER_CELL_USE_HIGH 70
+/// For items that use A LOT OF POWER.
+#define POWER_CELL_USE_INSANE 100
diff --git a/code/__DEFINES/dcs/signals/signals.dm b/code/__DEFINES/dcs/signals/signals.dm
index ad4c2d32e071..28beea516c5f 100644
--- a/code/__DEFINES/dcs/signals/signals.dm
+++ b/code/__DEFINES/dcs/signals/signals.dm
@@ -730,3 +730,11 @@
#define COMSIG_ADDED_POINT_OF_INTEREST "added_point_of_interest"
/// Sent from base of /datum/controller/subsystem/points_of_interest/proc/on_poi_element_removed : (atom/old_poi)
#define COMSIG_REMOVED_POINT_OF_INTEREST "removed_point_of_interest"
+
+// Power signals
+/// Sent when an obj/item calls item_use_power: (use_amount, user, check_only)
+#define COMSIG_ITEM_POWER_USE "item_use_power"
+ #define NO_COMPONENT NONE
+ #define COMPONENT_POWER_SUCCESS (1<<0)
+ #define COMPONENT_NO_CELL (1<<1)
+ #define COMPONENT_NO_CHARGE (1<<2)
diff --git a/code/datums/components/cell_component.dm b/code/datums/components/cell_component.dm
new file mode 100644
index 000000000000..6855e667f431
--- /dev/null
+++ b/code/datums/components/cell_component.dm
@@ -0,0 +1,195 @@
+/*
+CELL COMPONENT
+
+What we aim to achieve with cell components is a universal framework for all items that would logically use batteries,
+Be it a flashlight, T-ray scanner or multitool. All of them would logically require batteries right? Well, welcome,
+to the cell component.
+
+General logic:
+Component attaches to parent(flashlight etc)
+Registers onhit signal to check if it's being slapped by a battery
+Component moves battery to equipment loc, keeps a record, and then communicates with
+the equipment and controls the behaviour of said equipment.
+
+If you are adding this to an item that is active for a period of time, register signal to COMSIG_CELL_START_USE when it would start using the cell
+and COMSIG_CELL_STOP_USE when it should stop. To handle the turning off of said item once the cell is depleted, add your code into the
+component_cell_out_of_charge/component_cell_removed proc using loc where necessary, processing is done in the component!
+
+The cells are removed from objects with the component through alt-click.
+*/
+
+/datum/component/cell
+ /// Our reference to the inserted cell, which will be stored in the parent.
+ var/obj/item/stock_parts/cell/inserted_cell
+ /// The item reference to parent.
+ var/obj/item/equipment
+ /// How much power do we use each process?
+ var/power_use_amount = POWER_CELL_USE_NORMAL
+ /// Callback interaction for when the cell is removed.
+ var/datum/callback/on_cell_removed = null
+ ///Can this cell be removed from the parent?
+ var/cell_can_be_removed = TRUE
+ ///Our reference to the cell overlay
+ var/mutable_appearance/cell_overlay = null
+ ///Do we have cell overlays to be applied?
+ var/has_cell_overlays
+
+/datum/component/cell/Initialize(cell_override, _on_cell_removed, _power_use_amount, start_with_cell = TRUE, _cell_can_be_removed, _has_cell_overlays = TRUE)
+ if(QDELETED(parent))
+ qdel(src)
+ return
+
+ if(!isitem(parent)) //Currently only compatable with items.
+ return COMPONENT_INCOMPATIBLE
+
+ equipment = parent //We'd like a simple reference to the atom this component is attached to instead of having to declare it every time we use it.
+
+ if(_on_cell_removed)
+ src.on_cell_removed = _on_cell_removed
+
+ has_cell_overlays = _has_cell_overlays
+
+ if(_power_use_amount)
+ power_use_amount = _power_use_amount
+ else
+ power_use_amount = equipment.power_use_amount
+
+ if(_cell_can_be_removed)
+ cell_can_be_removed = _cell_can_be_removed
+
+ if(start_with_cell)
+ var/obj/item/stock_parts/cell/new_cell
+ if(!cell_override)
+ new_cell = new /obj/item/stock_parts/cell/upgraded()
+ else
+ new_cell = new cell_override()
+ inserted_cell = new_cell
+ new_cell.forceMove(parent) //We use the parents location so things like EMP's can interact with the cell.
+
+ handle_cell_overlays()
+ return ..()
+
+/datum/component/cell/RegisterWithParent()
+ //Component to Parent signal registries
+ RegisterSignal(parent, COMSIG_ITEM_POWER_USE, PROC_REF(simple_power_use))
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(insert_cell))
+ RegisterSignal(parent, COMSIG_CLICK_ALT , PROC_REF(remove_cell))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine_cell))
+
+/datum/component/cell/UnregisterFromParent()
+ UnregisterSignal(parent, COMSIG_ITEM_POWER_USE)
+ UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY)
+ UnregisterSignal(parent, COMSIG_CLICK_ALT)
+ UnregisterSignal(parent, COMSIG_PARENT_EXAMINE)
+
+/datum/component/cell/Destroy(force)
+
+ if(on_cell_removed)
+ on_cell_removed = null
+
+ if(inserted_cell)
+ QDEL_NULL(inserted_cell)
+ inserted_cell = null
+ return ..()
+
+/**
+ * The basic way of processing the cell, with included feedback.
+ *
+ * This proc is the basic way of processing the cell, with included feedback.
+ * It will return a bitflag if it failed to use the power, or COMPONENT_POWER_SUCCESS if it succeeds.
+ * Arguments:
+ * * use_amount - an override
+ * * check_only - will only return if it can use the cell and feedback relating to that including any relevant detail
+ */
+/datum/component/cell/proc/simple_power_use(datum/source, use_amount, mob/user, check_only)
+ SIGNAL_HANDLER
+
+ if(!use_amount)
+ use_amount = power_use_amount
+
+ if(!inserted_cell)
+ if(user)
+ to_chat(user, span_danger("There is no cell inside [equipment]"))
+ return COMPONENT_NO_CELL
+
+ if(check_only && inserted_cell.charge < use_amount)
+ if(user)
+ to_chat(user, span_danger("The cell inside [equipment] does not have enough charge to perform this action!"))
+ return COMPONENT_NO_CHARGE
+
+ if(!inserted_cell.use(use_amount))
+ inserted_cell.update_appearance() //Updates the attached cell sprite - Why does this not happen in cell.use?
+ if(user)
+ to_chat(user, span_danger("The cell inside [equipment] does not have enough charge to perform this action!"))
+ return COMPONENT_NO_CHARGE
+
+ inserted_cell.update_appearance()
+
+ return COMPONENT_POWER_SUCCESS
+
+/datum/component/cell/proc/examine_cell(atom/A, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+ if(!inserted_cell)
+ examine_list += span_danger("It does not have a cell inserted!")
+ else
+ examine_list += span_notice("It has a [inserted_cell] inserted. \
+ The cell has [inserted_cell.percent()]% charge remaining. \
+ Alt-click to remove the cell.")
+
+/// Handling of cell removal.
+/datum/component/cell/proc/remove_cell(datum/source, mob/user)
+ SIGNAL_HANDLER
+ if(!equipment.can_interact(user))
+ return
+
+ if(!cell_can_be_removed)
+ return
+
+ if(!isliving(user))
+ return
+
+ if(inserted_cell)
+ to_chat(user, span_notice("You remove [inserted_cell] from [equipment]."))
+ playsound(equipment, 'sound/weapons/magout.ogg', 40, TRUE)
+ inserted_cell.forceMove(get_turf(equipment))
+ INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living, put_in_hands), inserted_cell)
+ inserted_cell = null
+ if(on_cell_removed)
+ on_cell_removed.Invoke()
+ handle_cell_overlays(TRUE)
+ else
+ to_chat(user, span_danger("There is no cell in [equipment]!"))
+
+/// Handling of cell insertion.
+/datum/component/cell/proc/insert_cell(datum/source, obj/item/inserting_item, mob/living/user, params)
+ SIGNAL_HANDLER
+ if(!equipment.can_interact(user))
+ return
+
+ if(!istype(inserting_item, /obj/item/stock_parts/cell))
+ return
+
+ if(inserted_cell) //No quickswap compatibility
+ to_chat(user, span_danger("There is already a cell in [equipment]!"))
+ return
+
+ to_chat(user, span_notice("You connect [inserting_item] onto [equipment]."))
+ playsound(equipment, 'sound/weapons/magin.ogg', 40, TRUE)
+ inserted_cell = inserting_item
+ inserting_item.forceMove(parent)
+ handle_cell_overlays(FALSE)
+
+/datum/component/cell/proc/handle_cell_overlays(update_overlays)
+ if(!has_cell_overlays)
+ return
+
+ if(inserted_cell)
+ cell_overlay = mutable_appearance(equipment.icon, "[initial(equipment.icon_state)]_cell")
+ equipment.add_overlay(cell_overlay)
+ else
+ QDEL_NULL(cell_overlay)
+ cell_overlay = null
+ if(update_overlays)
+ equipment.overlays.Cut()
+ equipment.update_overlays()
diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm
index 69679c95079f..9021d6e783d1 100644
--- a/code/game/gamemodes/sandbox/h_sandbox.dm
+++ b/code/game/gamemodes/sandbox/h_sandbox.dm
@@ -38,7 +38,6 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE)
"Standard Tools",
"Spawn Flashlight" = "hsbspawn&path=[/obj/item/flashlight]",
"Spawn Toolbox" = "hsbspawn&path=[/obj/item/storage/toolbox/mechanical]",
- "Spawn Experimental Welding tool" = "hsbspawn&path=[/obj/item/weldingtool/experimental]",
"Spawn Light Replacer" = "hsbspawn&path=[/obj/item/lightreplacer]",
"Spawn Medical Kit" = "hsbspawn&path=[/obj/item/storage/firstaid/regular]",
"Spawn All-Access ID" = "hsbaaid",
diff --git a/code/game/objects/effects/spawners/random.dm/ai_module.dm b/code/game/objects/effects/spawners/random/ai_module.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/ai_module.dm
rename to code/game/objects/effects/spawners/random/ai_module.dm
diff --git a/code/game/objects/effects/spawners/random.dm/anomaly.dm b/code/game/objects/effects/spawners/random/anomaly.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/anomaly.dm
rename to code/game/objects/effects/spawners/random/anomaly.dm
diff --git a/code/game/objects/effects/spawners/random.dm/bedsheet.dm b/code/game/objects/effects/spawners/random/bedsheet.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/bedsheet.dm
rename to code/game/objects/effects/spawners/random/bedsheet.dm
diff --git a/code/game/objects/effects/spawners/random.dm/boards.dm b/code/game/objects/effects/spawners/random/boards.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/boards.dm
rename to code/game/objects/effects/spawners/random/boards.dm
diff --git a/code/game/objects/effects/spawners/random.dm/bureaucracy.dm b/code/game/objects/effects/spawners/random/bureaucracy.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/bureaucracy.dm
rename to code/game/objects/effects/spawners/random/bureaucracy.dm
diff --git a/code/game/objects/effects/spawners/random.dm/clothing.dm b/code/game/objects/effects/spawners/random/clothing.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/clothing.dm
rename to code/game/objects/effects/spawners/random/clothing.dm
diff --git a/code/game/objects/effects/spawners/random.dm/decoration.dm b/code/game/objects/effects/spawners/random/decoration.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/decoration.dm
rename to code/game/objects/effects/spawners/random/decoration.dm
diff --git a/code/game/objects/effects/spawners/random.dm/engineering.dm b/code/game/objects/effects/spawners/random/engineering.dm
similarity index 99%
rename from code/game/objects/effects/spawners/random.dm/engineering.dm
rename to code/game/objects/effects/spawners/random/engineering.dm
index 81f264039feb..b5c9636380f6 100644
--- a/code/game/objects/effects/spawners/random.dm/engineering.dm
+++ b/code/game/objects/effects/spawners/random/engineering.dm
@@ -33,7 +33,7 @@
/obj/effect/spawner/random/engineering/tool/adv
loot = list(
/obj/item/screwdriver/power = 1,
- /obj/item/weldingtool/experimental = 1,
+ /obj/item/weldingtool/electric = 1,
/obj/item/crowbar/power = 1,
)
diff --git a/code/game/objects/effects/spawners/random.dm/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/entertainment.dm
rename to code/game/objects/effects/spawners/random/entertainment.dm
diff --git a/code/game/objects/effects/spawners/random.dm/exotic.dm b/code/game/objects/effects/spawners/random/exotic.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/exotic.dm
rename to code/game/objects/effects/spawners/random/exotic.dm
diff --git a/code/game/objects/effects/spawners/random.dm/food_or_drink.dm b/code/game/objects/effects/spawners/random/food_or_drink.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/food_or_drink.dm
rename to code/game/objects/effects/spawners/random/food_or_drink.dm
diff --git a/code/game/objects/effects/spawners/random.dm/maintenance.dm b/code/game/objects/effects/spawners/random/maintenance.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/maintenance.dm
rename to code/game/objects/effects/spawners/random/maintenance.dm
diff --git a/code/game/objects/effects/spawners/random.dm/medical.dm b/code/game/objects/effects/spawners/random/medical.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/medical.dm
rename to code/game/objects/effects/spawners/random/medical.dm
diff --git a/code/game/objects/effects/spawners/random.dm/random.dm b/code/game/objects/effects/spawners/random/random.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/random.dm
rename to code/game/objects/effects/spawners/random/random.dm
diff --git a/code/game/objects/effects/spawners/random.dm/readme.md b/code/game/objects/effects/spawners/random/readme.md
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/readme.md
rename to code/game/objects/effects/spawners/random/readme.md
diff --git a/code/game/objects/effects/spawners/random.dm/salvaging.dm b/code/game/objects/effects/spawners/random/salvaging.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/salvaging.dm
rename to code/game/objects/effects/spawners/random/salvaging.dm
diff --git a/code/game/objects/effects/spawners/random.dm/structure.dm b/code/game/objects/effects/spawners/random/structure.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/structure.dm
rename to code/game/objects/effects/spawners/random/structure.dm
diff --git a/code/game/objects/effects/spawners/random.dm/trash.dm b/code/game/objects/effects/spawners/random/trash.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/trash.dm
rename to code/game/objects/effects/spawners/random/trash.dm
diff --git a/code/game/objects/effects/spawners/random.dm/vending.dm b/code/game/objects/effects/spawners/random/vending.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/vending.dm
rename to code/game/objects/effects/spawners/random/vending.dm
diff --git a/code/game/objects/effects/spawners/random.dm/waste_planet.dm b/code/game/objects/effects/spawners/random/waste_planet.dm
similarity index 100%
rename from code/game/objects/effects/spawners/random.dm/waste_planet.dm
rename to code/game/objects/effects/spawners/random/waste_planet.dm
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 46d2634bbe8d..58cbaabc5e86 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -146,6 +146,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/strip_delay = 40
///How long it takes to resist out of the item (cuffs and such)
var/breakouttime = 0
+ ///How much power would this item use?
+ var/power_use_amount = POWER_CELL_USE_NORMAL
/// Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
var/list/attack_verb
@@ -965,6 +967,11 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
/obj/item/proc/remove_outline()
remove_filter(HOVER_OUTLINE_FILTER)
+/// Use the power of an attached component that posesses power handling, will return the signal bitflag.
+/obj/item/proc/item_use_power(use_amount, mob/user, check_only)
+ SHOULD_CALL_PARENT(TRUE)
+ return SEND_SIGNAL(src, COMSIG_ITEM_POWER_USE, use_amount, user, check_only)
+
/// Called when a mob tries to use the item as a tool.Handles most checks.
/obj/item/proc/use_tool(atom/target, mob/living/user, delay, amount=0, volume=0, datum/callback/extra_checks)
// we have no target, why are we even doing this?
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 7bb42ef321b4..09f92eb311ec 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -87,7 +87,6 @@
/obj/item/storage/belt/utility/chief/full/PopulateContents()
new /obj/item/screwdriver/power(src)
new /obj/item/crowbar/power(src)
- new /obj/item/weldingtool/experimental(src)//This can be changed if this is too much
new /obj/item/multitool(src)
new /obj/item/stack/cable_coil(src,MAXCOIL,pick("red","yellow","orange"))
new /obj/item/extinguisher/mini(src)
@@ -143,7 +142,6 @@
/obj/item/storage/belt/utility/full/ert/PopulateContents()
new /obj/item/screwdriver/power(src)
new /obj/item/crowbar/power(src)
- new /obj/item/weldingtool/experimental(src)
new /obj/item/multitool(src)
new /obj/item/construction/rcd/combat(src)
new /obj/item/extinguisher/mini(src)
diff --git a/code/game/objects/items/tools/electric_weldingtool.dm b/code/game/objects/items/tools/electric_weldingtool.dm
new file mode 100644
index 000000000000..3611d8ffcd9f
--- /dev/null
+++ b/code/game/objects/items/tools/electric_weldingtool.dm
@@ -0,0 +1,84 @@
+/obj/item/weldingtool/electric
+ name = "electrical welding tool"
+ desc = "A welding tool capable of welding functionality through the use of electricity."
+ icon_state = "elwelder"
+ light_power = 1
+ light_color = LIGHT_COLOR_HALOGEN
+ tool_behaviour = NONE
+ toolspeed = 0.5 //twice as fast, but doesn't require welding fuel
+ power_use_amount = POWER_CELL_USE_LOW
+ change_icons = FALSE //we don't use fuel
+ var/cell_override = /obj/item/stock_parts/cell/high
+ var/powered = FALSE
+ max_fuel = 20 //uses fuel anyways like a boss
+
+/obj/item/weldingtool/electric/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/cell, cell_override, CALLBACK(src, PROC_REF(switched_off)))
+
+/obj/item/weldingtool/electric/attack_self(mob/user, modifiers)
+ . = ..()
+ if(!powered)
+ if(!(item_use_power(power_use_amount, user, TRUE) & COMPONENT_POWER_SUCCESS))
+ return
+ powered = !powered
+ playsound(src, 'sound/effects/sparks4.ogg', 100, TRUE)
+
+ if(powered)
+ to_chat(user, span_notice("You turn [src] on."))
+ switched_on()
+ return
+
+ to_chat(user, span_notice("You turn [src] off."))
+ switched_off()
+
+/obj/item/weldingtool/electric/switched_on(mob/user)
+ welding = TRUE
+ tool_behaviour = TOOL_WELDER
+ light_on = TRUE
+ force = 15
+ damtype = BURN
+ hitsound = 'sound/items/welder.ogg'
+ set_light_on(powered)
+ update_appearance()
+ START_PROCESSING(SSobj, src)
+
+/obj/item/weldingtool/electric/switched_off(mob/user)
+ powered = FALSE
+ welding = FALSE
+ light_on = FALSE
+ force = initial(force)
+ damtype = BRUTE
+ set_light_on(powered)
+ tool_behaviour = NONE
+ update_appearance()
+ STOP_PROCESSING(SSobj, src)
+
+/obj/item/weldingtool/electric/process(seconds_per_tick)
+ if(!powered)
+ switched_off()
+ return
+
+ if(!(item_use_power(power_use_amount) & COMPONENT_POWER_SUCCESS))
+ switched_off()
+ return
+
+/obj/item/weldingtool/electric/examine(mob/user)
+ . = ..()
+ //Overwrite the last entry, which normally shows welder fuel usage
+ .[length(.)] = "[src] is currently [powered ? "powered" : "unpowered"]."
+
+// This is what uses fuel in the parent. We override it here to not use fuel
+/obj/item/weldingtool/electric/use(used = 0)
+ return isOn()
+
+/obj/item/weldingtool/electric/examine()
+ . = ..()
+ . += "[src] is currently [powered ? "powered" : "unpowered"]."
+
+/obj/item/weldingtool/electric/update_icon_state()
+ if(powered)
+ mob_overlay_icon = "[initial(mob_overlay_icon)]1"
+ else
+ mob_overlay_icon = "[initial(mob_overlay_icon)]"
+ return ..()
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index f953a3604367..fcccb13b4b27 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -351,29 +351,6 @@
/obj/item/weldingtool/hugetank/empty
start_full = FALSE
-/obj/item/weldingtool/experimental
- name = "experimental welding tool"
- desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
- icon_state = "exwelder"
- item_state = "exwelder"
- max_fuel = 40
- custom_materials = list(/datum/material/iron=70, /datum/material/glass=120)
- /*WS Begin - Better Tool sprites
- change_icons = 0
- WS End */
- can_off_process = 1
- light_range = 1
- toolspeed = 0.5
- wall_decon_damage = 100
- var/last_gen = 0
- var/nextrefueltick = 0
-
-/obj/item/weldingtool/experimental/process()
- ..()
- if(get_fuel() < max_fuel && nextrefueltick < world.time)
- nextrefueltick = world.time + 10
- reagents.add_reagent(/datum/reagent/fuel, 1)
-
/obj/item/weldingtool/old
desc = "A standard edition welder provided by Nanotrasen. This one seems to leak a little bit."
icon = 'icons/obj/tools.dmi'
diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm
index 0849efb6ede4..18fc501da945 100644
--- a/code/modules/cargo/bounties/science.dm
+++ b/code/modules/cargo/bounties/science.dm
@@ -28,13 +28,6 @@
reward = 10000
wanted_types = list(/obj/item/clothing/glasses/night, /obj/item/clothing/glasses/meson/night, /obj/item/clothing/glasses/hud/health/night, /obj/item/clothing/glasses/hud/security/night, /obj/item/clothing/glasses/hud/diagnostic/night)
-/datum/bounty/item/science/experimental_welding_tool
- name = "Experimental Welding Tool"
- description = "A recent accident has left most of CentCom's welding tools exploded. Ship replacements to be rewarded."
- reward = 10000
- required_count = 3
- wanted_types = list(/obj/item/weldingtool/experimental)
-
/datum/bounty/item/science/cryostasis_beaker
name = "Cryostasis Beaker"
description = "Chemists at Central Command have discovered a new chemical that can only be held in cryostasis beakers. The only problem is they don't have any! Rectify this to receive payment."
diff --git a/code/modules/cargo/exports/tools.dm b/code/modules/cargo/exports/tools.dm
index 287fba69aaa0..efb0cfdb4a57 100644
--- a/code/modules/cargo/exports/tools.dm
+++ b/code/modules/cargo/exports/tools.dm
@@ -96,10 +96,6 @@
exclude_types = list(/obj/item/radio/mech)
//Advanced/Power Tools.
-/datum/export/weldingtool/experimental
- cost = 90
- unit_name = "experimental welding tool"
- export_types = list(/obj/item/weldingtool/experimental)
/datum/export/jawsoflife
cost = 100
diff --git a/code/modules/cargo/packs/tools.dm b/code/modules/cargo/packs/tools.dm
index e4996761976a..857477bcf922 100644
--- a/code/modules/cargo/packs/tools.dm
+++ b/code/modules/cargo/packs/tools.dm
@@ -49,10 +49,9 @@
/datum/supply_pack/tools/cellcharger
name = "Cell Charger Crate"
desc = "Contains a cell charger, able to charge all sorts of power cells."
- cost = 2000
+ cost = 1000
contains = list(/obj/machinery/cell_charger)
-
/datum/supply_pack/tools/rped
name = "RPED crate"
desc = "Tired of deconstructing all of your machines just to replace the power cells? This device has you covered. Actual parts not included."
@@ -117,7 +116,14 @@
/obj/item/gear_pack/anglegrinder,
/obj/item/radio/headset/alt
)
- crate_name = "Angle Grinder"
+ crate_name = "angle grinder crate"
+
+/datum/supply_pack/tools/electric_welder
+ name = "Electric Welder"
+ desc = "Contains a single electric welder, useful for many applications. No fuel required!"
+ cost = 850
+ contains = list(/obj/item/weldingtool/electric)
+ crate_name = "electric welder crate"
/datum/supply_pack/tools/plasmacutter
name = "Plasmacutter Crate"
diff --git a/code/modules/clothing/factions/clip.dm b/code/modules/clothing/factions/clip.dm
index 43fb9c39179d..cdb3dcfce757 100644
--- a/code/modules/clothing/factions/clip.dm
+++ b/code/modules/clothing/factions/clip.dm
@@ -464,7 +464,7 @@
/obj/item/storage/belt/military/clip/engi/PopulateContents()
new /obj/item/screwdriver/power(src)
new /obj/item/crowbar/power(src)
- new /obj/item/weldingtool/experimental(src)
+ new /obj/item/weldingtool/electric(src)
new /obj/item/multitool(src)
new /obj/item/construction/rcd/combat(src)
new /obj/item/extinguisher/mini(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
index 34a8cb32c1ac..c142ffddc106 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord_outfits.dm
@@ -376,7 +376,7 @@
/obj/item/stock_parts/micro_laser/high = 2,
/obj/item/stock_parts/matter_bin/adv = 2,
/obj/item/survey_handheld = 1,
- /obj/item/weldingtool/experimental = 1,
+ /obj/item/weldingtool/electric = 1,
/obj/item/mmi/posibrain = 1,
/obj/item/reagent_containers/glass/beaker/plastic = 1,
/obj/item/organ/eyes/robotic/shield = 1,
diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm
index 86a8b542712b..b57dca9d785b 100644
--- a/code/modules/research/designs/tool_designs.dm
+++ b/code/modules/research/designs/tool_designs.dm
@@ -32,16 +32,6 @@
category = list("Tool Designs")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_ENGINEERING
-/datum/design/exwelder
- name = "Experimental Welding Tool"
- desc = "An experimental welder capable of self-fuel generation."
- id = "exwelder"
- build_type = PROTOLATHE
- materials = list(/datum/material/iron = 1000, /datum/material/glass = 500, /datum/material/plasma = 1500, /datum/material/uranium = 200)
- build_path = /obj/item/weldingtool/experimental
- category = list("Tool Designs")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
-
/datum/design/rpd
name = "Rapid Pipe Dispenser (RPD)"
id = "rpd_loaded"
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 78b7846bb929..32dd43603b26 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -594,7 +594,7 @@
id = "exp_tools"
display_name = "Experimental Tools"
description = "Highly advanced tools."
- design_ids = list("exwelder", "jawsoflife", "handdrill", "laserscalpel", "mechanicalpinches", "searingtool")
+ design_ids = list("jawsoflife", "handdrill", "laserscalpel", "mechanicalpinches", "searingtool")
prereq_ids = list("adv_engi")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 731cd15fcfb8..b265239b2c7f 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/shiptest.dme b/shiptest.dme
index 572b7f7885b6..ad7e5f53f2ae 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -41,6 +41,7 @@
#include "code\__DEFINES\botany.dm"
#include "code\__DEFINES\callbacks.dm"
#include "code\__DEFINES\cargo.dm"
+#include "code\__DEFINES\cells.dm"
#include "code\__DEFINES\chat.dm"
#include "code\__DEFINES\cinematics.dm"
#include "code\__DEFINES\cleaning.dm"
@@ -491,6 +492,7 @@
#include "code\datums\components\bloodysoles.dm"
#include "code\datums\components\butchering.dm"
#include "code\datums\components\caltrop.dm"
+#include "code\datums\components\cell_component.dm"
#include "code\datums\components\chasm.dm"
#include "code\datums\components\connect_containers.dm"
#include "code\datums\components\connect_loc_behalf.dm"
@@ -1143,25 +1145,25 @@
#include "code\game\objects\effects\spawners\mobspawner.dm"
#include "code\game\objects\effects\spawners\spawner.dm"
#include "code\game\objects\effects\spawners\structure.dm"
-#include "code\game\objects\effects\spawners\random.dm\ai_module.dm"
-#include "code\game\objects\effects\spawners\random.dm\anomaly.dm"
-#include "code\game\objects\effects\spawners\random.dm\bedsheet.dm"
-#include "code\game\objects\effects\spawners\random.dm\boards.dm"
-#include "code\game\objects\effects\spawners\random.dm\bureaucracy.dm"
-#include "code\game\objects\effects\spawners\random.dm\clothing.dm"
-#include "code\game\objects\effects\spawners\random.dm\decoration.dm"
-#include "code\game\objects\effects\spawners\random.dm\engineering.dm"
-#include "code\game\objects\effects\spawners\random.dm\entertainment.dm"
-#include "code\game\objects\effects\spawners\random.dm\exotic.dm"
-#include "code\game\objects\effects\spawners\random.dm\food_or_drink.dm"
-#include "code\game\objects\effects\spawners\random.dm\maintenance.dm"
-#include "code\game\objects\effects\spawners\random.dm\medical.dm"
-#include "code\game\objects\effects\spawners\random.dm\random.dm"
-#include "code\game\objects\effects\spawners\random.dm\salvaging.dm"
-#include "code\game\objects\effects\spawners\random.dm\structure.dm"
-#include "code\game\objects\effects\spawners\random.dm\trash.dm"
-#include "code\game\objects\effects\spawners\random.dm\vending.dm"
-#include "code\game\objects\effects\spawners\random.dm\waste_planet.dm"
+#include "code\game\objects\effects\spawners\random\ai_module.dm"
+#include "code\game\objects\effects\spawners\random\anomaly.dm"
+#include "code\game\objects\effects\spawners\random\bedsheet.dm"
+#include "code\game\objects\effects\spawners\random\boards.dm"
+#include "code\game\objects\effects\spawners\random\bureaucracy.dm"
+#include "code\game\objects\effects\spawners\random\clothing.dm"
+#include "code\game\objects\effects\spawners\random\decoration.dm"
+#include "code\game\objects\effects\spawners\random\engineering.dm"
+#include "code\game\objects\effects\spawners\random\entertainment.dm"
+#include "code\game\objects\effects\spawners\random\exotic.dm"
+#include "code\game\objects\effects\spawners\random\food_or_drink.dm"
+#include "code\game\objects\effects\spawners\random\maintenance.dm"
+#include "code\game\objects\effects\spawners\random\medical.dm"
+#include "code\game\objects\effects\spawners\random\random.dm"
+#include "code\game\objects\effects\spawners\random\salvaging.dm"
+#include "code\game\objects\effects\spawners\random\structure.dm"
+#include "code\game\objects\effects\spawners\random\trash.dm"
+#include "code\game\objects\effects\spawners\random\vending.dm"
+#include "code\game\objects\effects\spawners\random\waste_planet.dm"
#include "code\game\objects\effects\temporary_visuals\cult.dm"
#include "code\game\objects\effects\temporary_visuals\miscellaneous.dm"
#include "code\game\objects\effects\temporary_visuals\temporary_visual.dm"
@@ -1405,6 +1407,7 @@
#include "code\game\objects\items\tanks\watertank.dm"
#include "code\game\objects\items\tools\chisel.dm"
#include "code\game\objects\items\tools\crowbar.dm"
+#include "code\game\objects\items\tools\electric_weldingtool.dm"
#include "code\game\objects\items\tools\screwdriver.dm"
#include "code\game\objects\items\tools\weldingtool.dm"
#include "code\game\objects\items\tools\wirecutters.dm"