diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm
index 290578bb581..cbbe9fada0d 100644
--- a/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm
+++ b/_maps/RandomRuins/SpaceRuins/spacehotel_skyrat.dmm
@@ -243,6 +243,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 1
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/bar)
"bb" = (
@@ -324,7 +327,6 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment,
/obj/machinery/door/airlock/maintenance{
name = "Hotel Maintenance"
},
@@ -397,6 +399,14 @@
/obj/effect/turf_decal/siding/dark,
/turf/open/floor/carpet/black,
/area/ruin/space/has_grav/hotel)
+"cC" = (
+/obj/structure/mirror{
+ pixel_y = 32
+ },
+/obj/structure/sink/directional/south,
+/obj/structure/cable,
+/turf/open/floor/iron/showroomfloor,
+/area/ruin/space/has_grav/hotel/pool)
"cE" = (
/obj/effect/turf_decal/tile/green,
/turf/open/floor/carpet/black,
@@ -515,6 +525,7 @@
"dv" = (
/obj/item/reagent_containers/cup/rag,
/obj/structure/table/reinforced/plastitaniumglass,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/bar)
"dx" = (
@@ -537,6 +548,19 @@
},
/turf/open/floor/carpet/black,
/area/ruin/space/has_grav/hotel)
+"dF" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 10
+ },
+/turf/open/floor/iron/white,
+/area/ruin/space/has_grav/hotel)
"dH" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/carpet/royalblack,
@@ -701,6 +725,14 @@
/obj/effect/turf_decal/tile/dark/diagonal_edge,
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/hotel)
+"ev" = (
+/obj/structure/chair/stool/bar,
+/obj/effect/turf_decal/siding/wood{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/black,
+/area/ruin/space/has_grav/hotel/bar)
"ex" = (
/obj/item/kirbyplants/random,
/turf/open/floor/carpet/green,
@@ -719,14 +751,10 @@
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/hotel)
"ez" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/light{
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/siding/green{
- dir = 4
- },
-/turf/open/floor/iron,
+/turf/open/floor/carpet/black,
/area/ruin/space/has_grav/hotel/bar)
"eA" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -1411,13 +1439,9 @@
/turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/bar)
"hv" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/coffeemaker,
/obj/structure/table/wood,
/obj/item/reagent_containers/cup/glass/mug/nanotrasen{
@@ -1444,9 +1468,6 @@
/obj/machinery/light_switch{
pixel_y = -24
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/turf/open/floor/carpet/royalblack,
/area/ruin/space/has_grav/hotel/guestroom/room_6)
"hy" = (
@@ -1644,6 +1665,12 @@
dir = 4
},
/obj/effect/mapping_helpers/airlock/access/all/twin_nexus_staff,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel/bar)
"il" = (
@@ -1681,9 +1708,6 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -1735,14 +1759,12 @@
/turf/open/floor/carpet/royalblack,
/area/ruin/space/has_grav/hotel/guestroom/room_6)
"iz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/turf/open/indestructible/hoteltile,
-/area/ruin/space/has_grav/hotel/guestroom)
+/turf/open/floor/iron/cafeteria,
+/area/ruin/space/has_grav/hotel/bar)
"iA" = (
/turf/open/floor/carpet/black,
/area/ruin/space/has_grav/hotel/bar)
@@ -1759,9 +1781,6 @@
/obj/machinery/door/airlock/engineering{
name = "Power Storage"
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/obj/effect/mapping_helpers/airlock/access/all/twin_nexus_staff,
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel/power)
@@ -1770,9 +1789,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/decal/cleanable/dirt,
-/obj/structure/disposalpipe/junction/flip{
- dir = 1
- },
+/obj/structure/disposalpipe/segment,
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel)
"iM" = (
@@ -1900,7 +1917,6 @@
/area/ruin/space/has_grav/hotel/bar)
"jm" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet/neon/simple/black/nodots,
/area/ruin/space/has_grav/hotel/guestroom/room_1)
"jo" = (
@@ -1951,12 +1967,12 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 1
},
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel)
"jE" = (
@@ -2009,10 +2025,10 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/disposalpipe/junction/flip{
- dir = 4
- },
/obj/effect/turf_decal/siding/wood,
+/obj/structure/disposalpipe/junction{
+ dir = 8
+ },
/turf/open/floor/carpet/orange,
/area/ruin/space/has_grav/hotel)
"jL" = (
@@ -2067,19 +2083,17 @@
"kb" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel/workroom)
"kc" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/turf_decal/siding/wood{
dir = 1
},
-/turf/open/floor/carpet/green,
-/area/ruin/space/has_grav/hotel/guestroom/room_4)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hotel)
"ke" = (
/obj/machinery/gibber,
/obj/effect/decal/cleanable/blood/old,
@@ -2164,7 +2178,7 @@
/area/ruin/space/has_grav/hotel/power)
"kw" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 1
+ dir = 4
},
/turf/open/floor/carpet/green,
/area/ruin/space/has_grav/hotel/guestroom/room_4)
@@ -2285,6 +2299,9 @@
/obj/machinery/airalarm/directional/north{
pixel_y = 24
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel)
"kR" = (
@@ -2363,6 +2380,9 @@
dir = 4
},
/obj/effect/turf_decal/siding/dark_green/corner,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"lc" = (
@@ -2618,6 +2638,12 @@
},
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/hotel/dock)
+"mq" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron,
+/area/ruin/space/has_grav/hotel/bar)
"mr" = (
/obj/machinery/airalarm/directional/west,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -2711,13 +2737,13 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 6
},
-/obj/structure/disposalpipe/segment{
- dir = 6
- },
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
/turf/open/floor/carpet/orange,
/area/ruin/space/has_grav/hotel)
"mI" = (
@@ -2844,6 +2870,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"nj" = (
@@ -3053,6 +3082,13 @@
},
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel)
+"os" = (
+/obj/structure/chair/sofa/corp/left{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/carpet/black,
+/area/ruin/space/has_grav/hotel/bar)
"ov" = (
/turf/open/floor/iron/dark/diagonal,
/area/ruin/space/has_grav/hotel/dock)
@@ -3074,6 +3110,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/bar)
"oI" = (
@@ -3108,14 +3147,11 @@
/turf/open/floor/iron/kitchen_coldroom/freezerfloor,
/area/ruin/space/has_grav/hotel/bar)
"oV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/turf/open/indestructible/hoteltile,
-/area/ruin/space/has_grav/hotel/guestroom)
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/catwalk_floor,
+/area/ruin/space/has_grav/hotel)
"oW" = (
/obj/structure/table/reinforced/plastitaniumglass,
/obj/item/flashlight/lamp/green,
@@ -3494,12 +3530,12 @@
/turf/open/floor/carpet/orange,
/area/ruin/space/has_grav/hotel)
"rp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 9
- },
/obj/effect/turf_decal/siding/green{
dir = 4
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/bar)
"rr" = (
@@ -3609,7 +3645,6 @@
/obj/machinery/door/airlock/grunge{
name = "Hotel Medical Storage"
},
-/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
@@ -3713,15 +3748,9 @@
/turf/open/floor/carpet/executive,
/area/ruin/space/has_grav/hotel/workroom)
"sh" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
- },
-/turf/open/floor/iron/white,
-/area/ruin/space/has_grav/hotel)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/hotel/bar)
"sj" = (
/obj/effect/turf_decal/siding/wood{
dir = 1
@@ -3758,6 +3787,12 @@
},
/turf/open/floor/carpet/neon/simple/teal/nodots,
/area/ruin/space/has_grav/hotel/guestroom/room_3)
+"sA" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
+/turf/open/floor/carpet/neon/simple/pink/nodots,
+/area/ruin/space/has_grav/hotel/guestroom/room_2)
"sC" = (
/obj/machinery/light{
dir = 1
@@ -3823,6 +3858,9 @@
/obj/effect/turf_decal/siding/dark_green{
dir = 4
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"td" = (
@@ -4107,6 +4145,10 @@
},
/turf/open/floor/wood/large,
/area/ruin/space/has_grav/hotel/guestroom/room_4)
+"ve" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/carpet/royalblack,
+/area/ruin/space/has_grav/hotel/guestroom/room_6)
"vn" = (
/obj/structure/table/glass,
/obj/item/flashlight/flare/candle/infinite{
@@ -4156,6 +4198,9 @@
/obj/effect/turf_decal/siding/green{
dir = 6
},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/bar)
"vu" = (
@@ -4172,9 +4217,6 @@
/turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/bar)
"vB" = (
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -4183,6 +4225,9 @@
dir = 8
},
/obj/effect/turf_decal/siding/wood,
+/obj/structure/disposalpipe/junction{
+ dir = 8
+ },
/turf/open/floor/carpet/orange,
/area/ruin/space/has_grav/hotel)
"vG" = (
@@ -4285,7 +4330,7 @@
/area/ruin/space/has_grav/hotel/custodial)
"wB" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 1
+ dir = 8
},
/turf/open/floor/carpet/green,
/area/ruin/space/has_grav/hotel/guestroom/room_4)
@@ -4432,9 +4477,6 @@
dir = 8
},
/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 5
- },
/obj/effect/turf_decal/siding/dark{
dir = 4
},
@@ -4542,6 +4584,16 @@
},
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/power)
+"yi" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 5
+ },
+/turf/open/floor/catwalk_floor,
+/area/ruin/space/has_grav/hotel)
"yk" = (
/obj/machinery/door/airlock{
name = "Unisex Changing"
@@ -4688,6 +4740,9 @@
/area/ruin/space/has_grav/hotel/pool)
"zo" = (
/obj/structure/decorative/shelf/alcohol_assortment,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/bar)
"zp" = (
@@ -4745,6 +4800,9 @@
},
/obj/structure/cable,
/obj/effect/mapping_helpers/airlock/access/all/twin_nexus_staff,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel)
"zP" = (
@@ -4830,7 +4888,6 @@
/area/ruin/space/has_grav/hotel/guestroom)
"Ao" = (
/obj/structure/table/wood,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/item/flashlight/lamp/green{
pixel_x = 1;
pixel_y = 5
@@ -5097,6 +5154,9 @@
/obj/effect/turf_decal/siding/green{
dir = 8
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron,
/area/ruin/space/has_grav/hotel/bar)
"Cb" = (
@@ -5345,7 +5405,6 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel/workroom)
"DH" = (
@@ -5666,6 +5725,9 @@
},
/obj/machinery/light,
/obj/effect/turf_decal/siding/dark_green,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"Ga" = (
@@ -5815,12 +5877,10 @@
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"GN" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 4
- },
/obj/machinery/light{
dir = 1
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/indestructible/hoteltile,
/area/ruin/space/has_grav/hotel/guestroom)
"GO" = (
@@ -5883,11 +5943,12 @@
/turf/open/floor/carpet/royalblack,
/area/ruin/space/has_grav/hotel/guestroom/room_6)
"Hp" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
- dir = 8
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
},
-/turf/open/indestructible/hoteltile,
-/area/ruin/space/has_grav/hotel/guestroom)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hotel)
"Hq" = (
/obj/effect/turf_decal/siding/wood/corner{
dir = 4
@@ -5902,9 +5963,6 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel)
"HA" = (
@@ -5936,6 +5994,9 @@
dir = 4
},
/obj/effect/turf_decal/siding/dark_green,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"HG" = (
@@ -5968,10 +6029,9 @@
pixel_x = 6;
pixel_y = 5
},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
- dir = 8
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet/black,
/area/ruin/space/has_grav/hotel/bar)
"HS" = (
@@ -6067,8 +6127,8 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/structure/disposalpipe/junction/flip{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel)
@@ -6383,6 +6443,9 @@
},
/obj/machinery/power/apc/auto_name/directional/south,
/obj/effect/turf_decal/siding/dark_green,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"KY" = (
@@ -6416,6 +6479,9 @@
/obj/effect/turf_decal/siding/dark_green{
dir = 10
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"Lh" = (
@@ -6441,6 +6507,14 @@
},
/turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/bar)
+"Lk" = (
+/obj/machinery/light,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hotel)
"Lm" = (
/obj/structure/chair/pew/right{
dir = 8;
@@ -6458,8 +6532,6 @@
pixel_y = -24
},
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/guestroom/room_5)
"Lp" = (
@@ -6570,6 +6642,9 @@
/obj/effect/turf_decal/siding/dark{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 5
+ },
/turf/open/floor/carpet/black,
/area/ruin/space/has_grav/hotel)
"Mb" = (
@@ -6696,9 +6771,6 @@
/turf/open/floor/carpet/orange,
/area/ruin/space/has_grav/hotel)
"MV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 4
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -6735,6 +6807,9 @@
/obj/effect/turf_decal/siding/dark_green{
dir = 6
},
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"Nc" = (
@@ -6825,9 +6900,6 @@
/turf/open/floor/carpet/neon/simple/pink/nodots,
/area/ruin/space/has_grav/hotel/guestroom/room_2)
"NV" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 6
- },
/obj/structure/cable,
/obj/machinery/light{
dir = 8
@@ -6882,6 +6954,9 @@
},
/obj/structure/sign/poster/contraband/random/directional/north,
/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel)
"Om" = (
@@ -6938,6 +7013,9 @@
dir = 8
},
/obj/effect/turf_decal/siding/wood/corner,
+/obj/structure/disposalpipe/segment{
+ dir = 6
+ },
/turf/open/floor/carpet/orange,
/area/ruin/space/has_grav/hotel)
"OB" = (
@@ -7139,9 +7217,6 @@
/turf/open/floor/carpet/orange,
/area/ruin/space/has_grav/hotel)
"PN" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 6
- },
/obj/structure/cable,
/obj/structure/extinguisher_cabinet{
pixel_x = -30
@@ -7300,9 +7375,6 @@
"QR" = (
/obj/machinery/airalarm/directional/west,
/obj/structure/cable,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
- dir = 6
- },
/obj/machinery/light_switch{
pixel_y = -24
},
@@ -7346,14 +7418,19 @@
/turf/closed/wall,
/area/ruin/space/has_grav/hotel/workroom)
"Rm" = (
+/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
},
-/obj/effect/turf_decal/siding/wood{
- dir = 1
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
},
-/turf/open/floor/carpet/green,
-/area/ruin/space/has_grav/hotel/guestroom/room_4)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/disposalpipe/junction/flip{
+ dir = 8
+ },
+/turf/open/floor/catwalk_floor,
+/area/ruin/space/has_grav/hotel)
"Rn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
dir = 4
@@ -7363,9 +7440,6 @@
},
/obj/item/kirbyplants/random,
/obj/structure/cable,
-/obj/structure/disposalpipe/segment{
- dir = 10
- },
/turf/open/floor/iron/white,
/area/ruin/space/has_grav/hotel)
"Rq" = (
@@ -7381,6 +7455,9 @@
dir = 4
},
/obj/effect/turf_decal/siding/dark_green,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"Rv" = (
@@ -7484,6 +7561,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
+/obj/structure/disposalpipe/segment,
/turf/open/floor/carpet/orange,
/area/ruin/space/has_grav/hotel)
"RS" = (
@@ -7505,11 +7583,17 @@
/turf/open/floor/carpet/royalblack,
/area/ruin/space/has_grav/hotel/guestroom/room_6)
"RX" = (
+/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
-/turf/open/floor/carpet/neon/simple/black/nodots,
-/area/ruin/space/has_grav/hotel/guestroom/room_1)
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/wood{
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hotel)
"RY" = (
/obj/item/kirbyplants/random,
/turf/open/floor/wood,
@@ -7585,7 +7669,7 @@
/area/ruin/space/has_grav/hotel/sauna)
"SH" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
- dir = 4
+ dir = 1
},
/turf/open/indestructible/hoteltile,
/area/ruin/space/has_grav/hotel/guestroom)
@@ -7611,6 +7695,9 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel)
"SU" = (
@@ -7655,6 +7742,9 @@
dir = 8
},
/obj/structure/cable,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel)
"Tj" = (
@@ -7703,18 +7793,18 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
dir = 1
},
-/obj/structure/disposalpipe/junction/flip{
- dir = 8
+/obj/structure/disposalpipe/segment{
+ dir = 4
},
/turf/open/floor/catwalk_floor,
/area/ruin/space/has_grav/hotel)
"Tz" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/obj/effect/turf_decal/siding/wood{
- dir = 1
+/obj/effect/turf_decal/siding/wood,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 8
},
-/turf/open/floor/carpet/green,
-/area/ruin/space/has_grav/hotel/guestroom/room_4)
+/turf/open/floor/carpet/orange,
+/area/ruin/space/has_grav/hotel)
"TA" = (
/obj/machinery/door/airlock/grunge{
name = "Disposals Access"
@@ -7879,6 +7969,9 @@
pixel_y = -24
},
/obj/effect/turf_decal/siding/dark_green,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{
+ dir = 8
+ },
/turf/open/floor/iron/cafeteria,
/area/ruin/space/has_grav/hotel/bar)
"UW" = (
@@ -7934,8 +8027,6 @@
/turf/open/floor/engine/n2,
/area/ruin/space/has_grav/hotel/power)
"Vn" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/obj/structure/extinguisher_cabinet{
pixel_x = -30
@@ -8030,8 +8121,10 @@
/turf/open/floor/carpet/neon/simple/black/nodots,
/area/ruin/space/has_grav/hotel/guestroom/room_1)
"VX" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{
+ dir = 6
+ },
/turf/open/floor/carpet/royalblack,
/area/ruin/space/has_grav/hotel/guestroom/room_6)
"VY" = (
@@ -8260,7 +8353,6 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/hotel/power)
"XB" = (
-/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/chair/sofa/corp/left{
dir = 8
},
@@ -8839,12 +8931,12 @@ OA
RO
mH
cd
-ed
-ed
-ed
-ed
-ed
-or
+oV
+oV
+oV
+oV
+oV
+yi
am
aa
aa
@@ -8902,7 +8994,7 @@ YK
xe
ww
Qv
-Zc
+sA
aw
kL
vB
@@ -9261,7 +9353,7 @@ Ba
cl
DR
bq
-RX
+bV
mT
cl
Oh
@@ -9327,7 +9419,7 @@ Qe
bN
dl
yE
-uN
+RX
cl
YP
Bn
@@ -9483,7 +9575,7 @@ ZI
wc
RH
ni
-RH
+iz
HF
VI
hw
@@ -9491,7 +9583,7 @@ hw
Lj
hw
hw
-hw
+sh
rD
fi
bE
@@ -9561,7 +9653,7 @@ hw
Lj
hw
hw
-hw
+sh
hw
HV
hS
@@ -9701,7 +9793,7 @@ AA
sT
AA
AA
-AA
+ev
AA
AI
fo
@@ -9902,7 +9994,7 @@ qA
qA
qA
qA
-oH
+mq
oD
fi
iA
@@ -9971,7 +10063,7 @@ IZ
AG
IZ
IZ
-ez
+AG
rp
vt
fi
@@ -10198,7 +10290,7 @@ Wo
Wo
ye
fi
-RL
+Rm
jO
jO
gM
@@ -10229,7 +10321,7 @@ aa
xH
qd
xD
-Tz
+sj
kw
ql
rr
@@ -10258,7 +10350,7 @@ fi
iA
gd
gb
-ZM
+ez
ud
pe
qU
@@ -10299,7 +10391,7 @@ aa
xH
gV
xD
-kc
+sj
sm
FQ
vK
@@ -10328,7 +10420,7 @@ fi
iA
Mh
ur
-ZM
+ez
bb
ya
qU
@@ -10369,7 +10461,7 @@ aa
xH
rG
UI
-Rm
+sj
wB
av
YI
@@ -10455,7 +10547,7 @@ tC
lL
am
Rn
-LN
+dF
LN
LN
LN
@@ -10467,8 +10559,8 @@ iC
fi
iA
gd
-gb
-iA
+os
+ez
ud
pe
qU
@@ -10524,7 +10616,7 @@ Fc
bW
bW
SU
-lO
+nh
nh
lO
nh
@@ -10602,7 +10694,7 @@ am
am
DL
ey
-so
+UX
qq
fi
fi
@@ -10791,13 +10883,13 @@ OL
OL
OL
hE
-OL
-OL
+zQ
+zQ
kO
YO
fE
yE
-MU
+Hp
di
JZ
fC
@@ -10830,7 +10922,7 @@ vo
am
iZ
jQ
-jU
+cC
Xs
Jy
qr
@@ -10862,12 +10954,12 @@ OL
OL
em
zQ
-zQ
+OL
hv
aC
xR
yE
-MU
+Hp
di
UW
fY
@@ -10937,7 +11029,7 @@ rP
aC
xR
yE
-MU
+Hp
di
WH
fC
@@ -10952,7 +11044,7 @@ Nq
am
IK
ey
-UX
+so
ET
am
Ln
@@ -11007,7 +11099,7 @@ cf
cf
xR
yE
-MU
+Hp
di
di
fC
@@ -11077,7 +11169,7 @@ OZ
cf
xR
yE
-MU
+Hp
di
cc
lh
@@ -11147,7 +11239,7 @@ DN
cf
xR
yE
-MU
+Hp
di
cb
xX
@@ -11162,7 +11254,7 @@ bP
am
fq
ey
-so
+UX
Xu
am
Ln
@@ -11217,7 +11309,7 @@ HM
cf
xR
yE
-MU
+Hp
di
Sf
bZ
@@ -11287,7 +11379,7 @@ cf
cf
xR
yE
-MU
+Hp
di
di
di
@@ -11300,7 +11392,7 @@ Tj
sE
Pq
rU
-sh
+sE
ey
eA
Xu
@@ -11357,7 +11449,7 @@ hx
cf
iQ
yE
-JW
+Lk
am
ac
di
@@ -11421,13 +11513,13 @@ uR
uR
uR
uR
-uR
+ve
VX
kA
lF
UQ
yE
-MU
+Hp
qI
ac
Ml
@@ -11497,7 +11589,7 @@ MV
cf
xR
yE
-MU
+Hp
qI
ac
Ml
@@ -11567,7 +11659,7 @@ UF
cf
xR
yE
-MU
+Hp
qI
ac
Ml
@@ -11637,7 +11729,7 @@ cf
cf
xR
yE
-MU
+Hp
am
ac
di
@@ -11707,7 +11799,7 @@ Cw
dN
GF
yE
-MU
+Hp
di
di
di
@@ -11777,7 +11869,7 @@ Hd
Al
EP
yE
-MU
+Hp
di
LQ
xd
@@ -11845,9 +11937,9 @@ Cj
Cj
KY
dN
-Dt
+Tz
yE
-MU
+kc
di
GC
xN
@@ -12191,9 +12283,9 @@ dN
dN
dN
dN
-oV
-iz
-Hp
+vH
+vH
+vH
dN
sD
sD
diff --git a/_maps/virtual_domains/skyrat_ancientmilsim.dmm b/_maps/virtual_domains/skyrat_ancientmilsim.dmm
index 86a71a32584..6267a336445 100644
--- a/_maps/virtual_domains/skyrat_ancientmilsim.dmm
+++ b/_maps/virtual_domains/skyrat_ancientmilsim.dmm
@@ -2,110 +2,125 @@
"al" = (
/obj/machinery/vending/cigarette,
/turf/open/floor/iron/smooth_half,
-/area/virtual_domain)
-"aB" = (
-/obj/structure/flora/bush/ferny/style_random,
-/obj/structure/railing,
-/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
+"aE" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/janitor)
"aG" = (
/obj/machinery/door/poddoor/preopen{
id = "cin_place"
},
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
+"aO" = (
+/turf/open/floor/plating,
+/area/virtual_domain/ancient_milsim/janitor)
"aP" = (
/obj/structure/trash_pile,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"aR" = (
/obj/structure/closet/crate/secure,
/obj/item/keycard/blue,
/obj/machinery/light/small/dim/directional/north,
/obj/item/construction/rld/mini,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"ba" = (
/obj/machinery/light/directional/east,
/obj/effect/spawner/random/vending/snackvend,
/turf/open/floor/iron/smooth_corner{
dir = 8
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"bd" = (
/obj/machinery/power/shuttle_engine/propulsion,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/safehouse)
"bm" = (
/obj/machinery/light/floor,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"bw" = (
/obj/item/storage/box/utensils,
/obj/structure/sign/poster/random/directional/south,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"bB" = (
/obj/structure/inflatable{
color = "#556B2F";
opacity = 1
},
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"bM" = (
/obj/item/stack/rods,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"bN" = (
/obj/structure/railing/corner/end/flip,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"cb" = (
/obj/structure/railing/corner{
dir = 1
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"co" = (
/obj/item/pen/fourcolor,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"cp" = (
/obj/structure/decorative/shelf/soda_milk{
density = 1
},
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
+"cx" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/snpc_cave)
"cF" = (
-/obj/item/gun/ballistic/shotgun/automatic/combat/compact,
+/obj/structure/sign/poster/random/directional/west,
+/obj/structure/rack/gunrack,
+/obj/item/gun/ballistic/automatic/wylom,
+/obj/item/gun/ballistic/automatic/miecz,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
"cV" = (
/obj/machinery/light/small/directional/east,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"dd" = (
/turf/closed/wall/r_wall,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
"dh" = (
/obj/machinery/light/small/dim/directional/south,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cave)
"dC" = (
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
"dH" = (
/obj/effect/landmark/bitrunning/mob_segment,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
"ea" = (
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"ec" = (
/obj/effect/spawner/random/trash/mopbucket,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
+"ed" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/obj/machinery/door/poddoor/ancient_milsim{
+ id = "engagement_control"
+ },
+/turf/open/misc/grass/planet/ancient_milsim,
+/area/virtual_domain/ancient_milsim/snpc_ground)
"eh" = (
/obj/structure/flippedtable{
dir = 8
@@ -113,97 +128,110 @@
/obj/structure/flippedtable,
/obj/structure/barricade/sandbags,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"ek" = (
/obj/item/grenade/smokebomb,
/turf/open/floor/iron/smooth_large,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"er" = (
/turf/closed/indestructible/rock,
/area/virtual_domain)
"et" = (
/obj/structure/chair/stool/bar/directional/south,
/obj/effect/mob_spawn/ghost_role/human/ancient_milsim,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"eC" = (
/obj/effect/landmark/bitrunning/mob_segment,
/obj/structure/chair/stool/directional/south,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"eE" = (
/obj/effect/spawner/random/trash/box,
/obj/machinery/light/directional/west,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
+"eF" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/snpc_garage)
"eQ" = (
/obj/structure/flora/bush/flowers_br/style_random,
/obj/machinery/door/poddoor/ancient_milsim{
id = "engagement_control"
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"eR" = (
/obj/machinery/light/small/directional/west,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"fk" = (
/obj/machinery/light/floor,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
"ft" = (
/obj/machinery/door/airlock/multi_tile/glass,
/turf/open/floor/iron/smooth_large,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
"fu" = (
/obj/machinery/door/airlock/multi_tile/metal{
dir = 8
},
/turf/open/floor/iron,
-/area/virtual_domain)
-"fF" = (
-/obj/structure/railing,
-/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
+"fJ" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/indestructible/reinforced,
+/area/virtual_domain/ancient_milsim/snpc_reward)
"gb" = (
/obj/item/keycard/yellow,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"go" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/janitor)
+"gE" = (
+/turf/open/floor/iron,
+/area/virtual_domain/ancient_milsim/snpc_garage)
"gL" = (
/obj/structure/table,
/obj/item/grenade/chem_grenade/clf3,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
+"gP" = (
+/obj/item/storage/medkit/civil_defense/stocked,
+/turf/open/floor/plating,
+/area/virtual_domain/ancient_milsim/maintenance)
"hj" = (
/obj/structure/flora/bush/flowers_br/style_random,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"ho" = (
/obj/structure/railing{
dir = 4
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"hp" = (
/turf/open/floor/iron/smooth_corner{
dir = 8
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"hy" = (
/obj/machinery/door/poddoor/ancient_milsim{
id = "engagement_control"
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"hH" = (
/obj/structure/table,
/obj/item/storage/box/utensils,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"hJ" = (
/obj/structure/table_frame,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"hO" = (
/obj/machinery/conveyor/auto{
dir = 4;
@@ -212,177 +240,206 @@
/obj/machinery/door/window,
/obj/structure/window/reinforced/spawner/directional/east,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
+"hZ" = (
+/turf/open/misc/grass/planet/ancient_milsim,
+/area/virtual_domain/ancient_milsim/entrance)
"ie" = (
/obj/item/paper/crumpled,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"im" = (
/obj/item/grown/log,
/obj/item/grown/log,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"iq" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/medbay)
"ir" = (
/obj/structure/barricade/sandbags,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
"iw" = (
/obj/item/paper,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"iz" = (
/obj/structure/table,
/obj/item/storage/medkit/tactical/premium,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
"iI" = (
/obj/machinery/dryer{
pixel_y = -26
},
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_toilet)
+"iO" = (
+/obj/machinery/door/airlock/multi_tile/glass,
+/turf/open/floor/iron/smooth_large,
+/area/virtual_domain/ancient_milsim/atrium)
"iU" = (
/obj/item/paper_bin,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"iW" = (
/obj/structure/chair{
dir = 1
},
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
+"iZ" = (
+/turf/open/misc/dirt/planet,
+/area/virtual_domain/ancient_milsim/snpc_garage)
"jc" = (
/obj/structure/table,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
+"jn" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/loot_camp)
"jS" = (
/obj/structure/chair/sofa/corp/left{
dir = 4
},
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
"jV" = (
/obj/effect/landmark/bitrunning/mob_segment,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"ka" = (
/obj/machinery/door/airlock/public,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_toilet)
"ke" = (
/obj/item/storage/toolbox/syndicate,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"kh" = (
/obj/effect/landmark/bitrunning/mob_segment,
/turf/open/floor/iron/smooth_half,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"ki" = (
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"kv" = (
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"kC" = (
/obj/effect/spawner/random/trash/food_packaging,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"kJ" = (
/obj/structure/chair/stool/directional/west,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"kL" = (
/obj/structure/table,
/obj/item/reagent_containers/cup/glass/bottle/champagne,
/turf/open/floor/iron/smooth_large,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_reward)
"kS" = (
/obj/structure/sign/flag/terragov/directional/south,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/entrance)
"kT" = (
/obj/structure/reagent_dispensers/water_cooler,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
"kX" = (
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cave)
"lc" = (
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"lf" = (
/obj/machinery/door/airlock/maintenance_hatch,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"lr" = (
/obj/structure/chair{
dir = 4
},
-/turf/open/floor/iron,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
+"ls" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/snpc_cave)
"lt" = (
/obj/structure/sign/poster/random/directional/south,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
+"lu" = (
+/obj/machinery/door/poddoor/ancient_milsim{
+ id = "engagement_control"
+ },
+/turf/open/misc/dirt/planet,
+/area/virtual_domain/ancient_milsim/entrance)
"ly" = (
/obj/machinery/light/directional/south,
/obj/structure/barricade/sandbags,
/turf/open/floor/iron/smooth_corner{
dir = 4
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"lz" = (
/obj/machinery/door/airlock/multi_tile/glass,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"lE" = (
/turf/template_noop,
/area/virtual_domain/safehouse)
"lG" = (
/obj/effect/landmark/bitrunning/mob_segment,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"lX" = (
/obj/structure/table/optable,
/obj/item/surgical_processor,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"mi" = (
/obj/effect/mob_spawn/corpse/human/cin_soldier,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"mu" = (
-/obj/item/knife/combat/survival,
-/obj/structure/table,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/obj/item/knife/combat,
+/obj/structure/table/wood,
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"mZ" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"ne" = (
/obj/structure/toilet,
/obj/machinery/light/small/dim/directional/north,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_toilet)
"no" = (
/obj/effect/spawner/structure/window/survival_pod,
/obj/machinery/door/poddoor/shutters/preopen,
/obj/effect/mapping_helpers/damaged_window,
/turf/open/floor/iron/dark/smooth_large,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"nu" = (
-/obj/machinery/door/poddoor/ancient_milsim{
- id = "engagement_control"
- },
-/turf/closed/mineral/ash_rock,
-/area/virtual_domain)
+/turf/template_noop,
+/area/template_noop)
"nw" = (
/obj/effect/spawner/random/trash/box,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
+"nA" = (
+/obj/machinery/door/poddoor/ancient_milsim{
+ id = "engagement_control"
+ },
+/turf/open/misc/grass/planet/ancient_milsim,
+/area/virtual_domain/ancient_milsim/entrance)
"nH" = (
/obj/item/storage/barricade,
/obj/structure/closet/crate/cardboard,
@@ -392,16 +449,16 @@
id = "cin_place"
},
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"nM" = (
/obj/item/storage/box/utensils,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"nQ" = (
/obj/machinery/light/floor,
/obj/effect/landmark/bitrunning/mob_segment,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"nZ" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
@@ -409,25 +466,38 @@
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/storage/toolbox/ammobox/full/mosin,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"ob" = (
/obj/effect/spawner/random/vending/snackvend,
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
"oe" = (
/obj/machinery/light/directional/west,
/obj/effect/spawner/random/vending/colavend,
/turf/open/floor/iron/smooth_corner,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
+"oj" = (
+/turf/open/floor/plating,
+/area/virtual_domain/ancient_milsim/maintenance)
+"ol" = (
+/turf/open/floor/iron/dark,
+/area/virtual_domain/ancient_milsim/carrier)
+"or" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"ot" = (
/obj/item/paper,
/turf/open/floor/iron/smooth_half,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"oz" = (
/obj/machinery/light/directional/east,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
+"oJ" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/snpc_toilet)
"oU" = (
/obj/structure/chair/comfy/shuttle,
/obj/machinery/computer{
@@ -441,106 +511,132 @@
pixel_y = -32
},
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"pn" = (
/obj/structure/fluff/fokoff_sign,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"pN" = (
/obj/machinery/iv_drip/health_station/directional/south,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
"pY" = (
/obj/item/ammo_box/c35sol,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"qn" = (
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"qp" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/virtual_domain)
+/area/virtual_domain/safehouse)
+"qr" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/atrium)
"qs" = (
/obj/machinery/light/directional/south,
/obj/structure/barricade/sandbags,
/turf/open/floor/iron/smooth_corner{
dir = 1
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"qA" = (
/obj/structure/fence{
dir = 4
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"qB" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/maintenance)
+"qC" = (
+/obj/structure/flora/bush/ferny/style_random,
+/turf/open/misc/grass/planet/ancient_milsim,
+/area/virtual_domain/ancient_milsim/loot_camp)
"qV" = (
/obj/machinery/vending/medical,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
"rb" = (
/obj/effect/spawner/random/trash/janitor_supplies,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"rl" = (
/obj/structure/table,
/obj/machinery/light/cold/directional/south,
/obj/item/tape/ruins/ancient_milsim/devlog_two,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
"rx" = (
/obj/machinery/iv_drip,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"rB" = (
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/obj/machinery/door/poddoor/preopen{
id = "cin_place"
},
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
+"rO" = (
+/obj/structure/rack/shelf,
+/obj/item/gun/ballistic/revolver/shotgun_revolver,
+/turf/open/floor/iron,
+/area/virtual_domain/ancient_milsim/snpc_hallway)
"rT" = (
/obj/effect/spawner/structure/window/reinforced/no_firelock,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"sa" = (
/obj/machinery/door/puzzle/keycard/blue_required,
/turf/open/floor/iron/smooth_large,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_exit)
"ss" = (
/obj/machinery/light/floor,
/obj/structure/table,
-/obj/item/ammo_box/c40sol/pierce,
-/obj/item/ammo_box/c40sol/pierce,
+/obj/item/ammo_box/c310_cargo_box/piercing,
+/obj/item/ammo_box/c310_cargo_box/piercing,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
-"sD" = (
-/obj/item/pickaxe/drill/compact,
-/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"sG" = (
+/turf/open/floor/iron/smooth_large,
+/area/virtual_domain/ancient_milsim/snpc_reward)
"sS" = (
/obj/item/grown/log,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"sV" = (
/obj/item/stack/sheet/mineral/sandbags/fifty,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
+"sX" = (
+/turf/open/floor/iron,
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"td" = (
/obj/item/storage/box/utensils,
-/obj/structure/table,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/obj/structure/table/wood,
+/obj/item/ammo_box/c310_cargo_box/piercing{
+ pixel_x = 6;
+ pixel_y = 9
+ },
+/obj/item/ammo_box/c27_54cesarzowa/rubber{
+ pixel_x = 12
+ },
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"te" = (
/obj/structure/chair{
dir = 1
},
/obj/structure/sign/flag/nri/directional/east,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"tg" = (
/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
"th" = (
/obj/machinery/recycler/deathtrap{
dir = 8
@@ -550,45 +646,56 @@
id = "sol_invasion"
},
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"tA" = (
/obj/item/surgery_tray/full/deployed,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
"tH" = (
/obj/item/ammo_box/c35sol,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
"tI" = (
/obj/effect/spawner/random/trash/garbage,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"tU" = (
+/obj/structure/fluff/fokoff_sign,
+/turf/open/misc/grass/planet/ancient_milsim,
+/area/virtual_domain/ancient_milsim/loot_camp)
"ue" = (
/obj/machinery/biogenerator/food_replicator{
biomass = 1500
},
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"uf" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"uq" = (
/obj/structure/chair/stool/directional/north,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"uy" = (
/obj/structure/sign/departments/science/alt/directional/north,
/obj/structure/sign/flag/nri/directional/north,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/entrance)
+"uz" = (
+/turf/closed/indestructible/reinforced,
+/area/virtual_domain/ancient_milsim/snpc_exit)
+"uC" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/snpc_garage)
"uE" = (
/obj/effect/spawner/random/trash/caution_sign,
/obj/machinery/light/broken/directional/south,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"uM" = (
/obj/item/minespawner/ancient_milsim,
/obj/item/minespawner/ancient_milsim,
@@ -602,45 +709,43 @@
/obj/item/minespawner/ancient_milsim,
/obj/item/minespawner/ancient_milsim,
/turf/open/floor/iron,
-/area/virtual_domain)
-"uQ" = (
-/obj/structure/flora/bush/flowers_br/style_random,
-/obj/structure/railing,
-/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"uY" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
"uZ" = (
/obj/effect/spawner/random/vending/colavend,
/obj/machinery/light/directional/west,
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
+"va" = (
+/turf/open/floor/iron/smooth_large,
+/area/virtual_domain/ancient_milsim/hallway)
"vd" = (
/obj/structure/chair/office,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"vf" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/iv_drip/health_station/directional/west,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"vr" = (
/obj/item/storage/backpack/duffelbag/syndie/c4,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
"vs" = (
/obj/machinery/light/small/dim/directional/west,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cave)
"vu" = (
/obj/item/storage/backpack/duffelbag/syndie/c4,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"vz" = (
/obj/structure/flippedtable{
dir = 4
@@ -648,158 +753,196 @@
/obj/structure/flippedtable,
/obj/structure/barricade/sandbags,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"vA" = (
/obj/structure/closet/crate/trashcart/filled,
/obj/item/flamethrower/full/tank,
+/obj/item/storage/medkit/civil_defense/stocked,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"vL" = (
/obj/structure/fence,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"wh" = (
/obj/structure/table,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"wr" = (
-/obj/item/deployable_turret_folded,
+/obj/structure/rack/shelf,
+/obj/item/ammo_box/magazine/wylom{
+ pixel_y = 4;
+ pixel_x = -8
+ },
+/obj/item/ammo_box/magazine/wylom{
+ pixel_y = 4;
+ pixel_x = 4
+ },
+/obj/item/ammo_box/magazine/miecz{
+ pixel_x = -5;
+ pixel_y = -9
+ },
+/obj/item/ammo_box/magazine/miecz{
+ pixel_y = -9
+ },
+/obj/item/ammo_box/magazine/miecz{
+ pixel_x = 5;
+ pixel_y = -9
+ },
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
+"ws" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/template_noop,
+/area/virtual_domain/safehouse)
"wv" = (
/obj/item/tape/ruins/ancient_milsim/devlog_three,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"wx" = (
/turf/open/floor/iron/smooth_corner{
dir = 1
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"wy" = (
-/obj/item/ammo_box/c980grenade/shrapnel,
-/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/obj/structure/table/wood,
+/obj/item/ammo_box/magazine/lanca,
+/obj/item/gun/ballistic/automatic/lanca{
+ pixel_y = 6;
+ pixel_x = 7
+ },
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"wz" = (
/obj/structure/flora/tree/stump,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"wQ" = (
/obj/effect/spawner/random/trash/mess,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"wZ" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
"xa" = (
/obj/structure/closet/crate/freezer/blood,
+/obj/item/storage/medkit/civil_defense/stocked,
+/obj/item/storage/medkit/frontier/stocked,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
"xe" = (
/obj/effect/spawner/random/trash/mopbucket,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"xB" = (
/obj/effect/spawner/random/trash/garbage,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
-"xI" = (
-/obj/structure/railing{
- dir = 6
- },
-/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"xS" = (
/obj/structure/railing{
dir = 1
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"yd" = (
/obj/item/inflatable/torn,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"yh" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/maintenance)
"yl" = (
/obj/structure/decorative/shelf/alcohol_assortment{
density = 1
},
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
"yn" = (
/obj/effect/spawner/random/trash/bin,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"yt" = (
/obj/item/chair,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"yI" = (
/obj/structure/fence/cut/large{
dir = 4;
density = 0
},
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"yV" = (
/obj/machinery/vending/cigarette,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"zf" = (
/obj/effect/spawner/random/trash/bucket,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"zp" = (
/obj/machinery/door/puzzle/keycard/yellow_required,
/turf/open/floor/iron/smooth_large,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_reward)
"zx" = (
/obj/machinery/light/small/dim/directional/north,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cave)
"zE" = (
/obj/machinery/vending/drugs,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
"zL" = (
/obj/machinery/light/small/dim/directional/south,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cave)
"Ab" = (
/obj/structure/table,
/obj/item/folder/documents,
+/obj/item/binoculars,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"Aw" = (
+/obj/machinery/door/poddoor/ancient_milsim{
+ id = "engagement_control"
+ },
+/turf/open/water/jungle,
+/area/virtual_domain/ancient_milsim/snpc_ground)
"AB" = (
/obj/structure/chair{
dir = 8
},
/obj/machinery/light/directional/north,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"AC" = (
/obj/structure/closet/crate/trashcart/filled,
/obj/item/ammo_box/c35sol,
/obj/item/ammo_box/c35sol,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"AE" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
+"AH" = (
+/turf/open/floor/iron,
+/area/virtual_domain/ancient_milsim/snpc_toilet)
"AN" = (
/obj/structure/bedsheetbin,
-/obj/structure/table,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/obj/structure/table/wood,
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"AR" = (
/obj/machinery/vending/wardrobe/jani_wardrobe,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"AW" = (
/turf/open/floor/iron/smooth_large,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_exit)
"AY" = (
/obj/machinery/conveyor/auto{
dir = 4;
@@ -807,45 +950,55 @@
},
/obj/machinery/door/window,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"Bd" = (
/obj/structure/chair/stool/bar/directional/south,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"Bg" = (
/obj/effect/landmark/bitrunning/mob_segment,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
+"Bs" = (
+/turf/open/misc/dirt/planet,
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"BO" = (
/obj/effect/spawner/random/trash/hobo_squat,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"Cd" = (
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"Cf" = (
/obj/machinery/door/airlock/multi_tile/metal{
dir = 4
},
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
+"Cg" = (
+/obj/item/storage/medkit/frontier/stocked,
+/turf/open/floor/iron/white,
+/area/virtual_domain/ancient_milsim/medbay)
"Cr" = (
/obj/structure/chair/office/light{
dir = 4
},
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"Cs" = (
/obj/structure/railing{
dir = 9
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
+"CC" = (
+/turf/open/floor/iron/smooth,
+/area/virtual_domain/ancient_milsim/atrium)
"CH" = (
/obj/structure/flippedtable,
/obj/structure/closet/crate/freezer/blood,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"CJ" = (
/obj/structure/chair/sofa/corp/right{
dir = 8
@@ -853,91 +1006,104 @@
/turf/open/floor/iron/smooth_half{
dir = 1
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"CR" = (
-/obj/item/ammo_box/advanced/s12gauge/flechette,
-/obj/item/ammo_box/advanced/s12gauge/flechette,
+/obj/structure/rack/shelf,
+/obj/item/ammo_box/advanced/s12gauge/incendiary{
+ pixel_x = -4;
+ pixel_y = -9
+ },
+/obj/item/ammo_box/advanced/s12gauge/flechette{
+ pixel_x = -4;
+ pixel_y = 9
+ },
+/obj/item/ammo_box/advanced/s12gauge{
+ pixel_x = 6
+ },
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
"CT" = (
/obj/structure/table,
/obj/machinery/iv_drip/health_station/directional/north,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"CV" = (
/obj/structure/flippedtable,
/obj/structure/barricade/sandbags,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"Dd" = (
/obj/structure/closet/crate/trashcart/filled,
/obj/item/ammo_box/c35sol,
/obj/item/ammo_box/c35sol,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"De" = (
/obj/effect/spawner/random/trash/bin,
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
"Dk" = (
/obj/machinery/biogenerator/food_replicator{
biomass = 1500
},
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"Do" = (
-/obj/structure/table,
-/obj/item/reagent_containers/cup/glass/trophy/gold_cup,
+/obj/machinery/light/small/dim/directional/north,
/turf/open/floor/iron/smooth_large,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_exit)
"Dt" = (
-/obj/item/gun/ballistic/automatic/sol_grenade_launcher/evil/no_mag,
+/obj/item/gun/ballistic/automatic/wylom,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"Dy" = (
/obj/structure/sink/directional/north,
/obj/structure/mirror/directional/south,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_toilet)
+"DE" = (
+/turf/open/misc/dirt/planet,
+/area/virtual_domain/safehouse)
"DL" = (
-/obj/item/ammo_box/c980grenade/smoke,
-/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/obj/effect/landmark/bitrunning/cache_spawn,
+/obj/machinery/light/small/dim/directional/south,
+/turf/open/floor/iron/smooth_large,
+/area/virtual_domain/ancient_milsim/snpc_reward)
"DN" = (
/obj/structure/table,
/obj/item/stack/medical/mesh/bloody,
/obj/item/stack/medical/mesh/bloody,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
"DO" = (
/turf/open/floor/iron/smooth_corner,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"DT" = (
/obj/structure/flora/tree/jungle/style_random,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"DW" = (
/obj/item/storage/box/nri_flares,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"Ee" = (
/obj/structure/railing/corner{
dir = 1
},
/turf/open/water/jungle,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"Eg" = (
/turf/closed/indestructible/reinforced,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_reward)
"Eh" = (
/obj/machinery/door/poddoor/shutters/preopen,
/turf/open/floor/iron/dark/side,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"Ei" = (
/obj/effect/landmark/bitrunning/mob_segment,
/turf/open/floor/iron/smooth_corner,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"Ek" = (
/obj/structure/chair/sofa/corp/left{
dir = 4
@@ -945,159 +1111,170 @@
/turf/open/floor/iron/smooth_half{
dir = 1
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"El" = (
/obj/item/keycard/yellow,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"Ey" = (
-/obj/item/ammo_box/advanced/s12gauge,
-/obj/item/ammo_box/advanced/s12gauge,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/obj/structure/closet/crate/freezer/blood,
+/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked,
+/obj/item/storage/medkit/frontier/stocked,
+/turf/open/floor/iron/white,
+/area/virtual_domain/ancient_milsim/medbay)
"EB" = (
/obj/machinery/door/airlock/survival_pod/glass,
/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"ED" = (
/obj/structure/closet/crate/secure,
/obj/item/keycard/blue,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cave)
"EE" = (
/obj/structure/table,
/obj/item/food/cake/birthday,
/turf/open/floor/iron/smooth_large,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_reward)
"EW" = (
/obj/structure/reagent_dispensers/fueltank/large,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
"Fb" = (
/obj/structure/reagent_dispensers/fueltank/large,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"Fc" = (
/obj/machinery/light/directional/east,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
"Ff" = (
/obj/effect/spawner/random/trash/bin,
/obj/machinery/light/directional/north,
/obj/structure/sign/poster/random/directional/north,
/turf/open/floor/iron,
-/area/virtual_domain)
-"Fk" = (
-/obj/structure/flora/bush/flowers_br/style_random,
-/obj/structure/railing{
- dir = 6
+/area/virtual_domain/ancient_milsim/snpc_cafe)
+"Fn" = (
+/obj/effect/spawner/structure/window/reinforced/no_firelock,
+/obj/machinery/door/poddoor/preopen{
+ id = "cin_place"
},
-/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/open/floor/plating,
+/area/virtual_domain/ancient_milsim/snpc_hallway)
"Fq" = (
/obj/structure/chair{
dir = 1
},
/obj/effect/mob_spawn/ghost_role/human/ancient_milsim,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"Fv" = (
/turf/open/floor/iron/smooth_half,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"FN" = (
-/obj/item/ammo_box/c980grenade/shrapnel/phosphor,
-/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/obj/item/binoculars,
+/turf/open/floor/iron,
+/area/virtual_domain/ancient_milsim/snpc_garage)
"FT" = (
/obj/structure/chair/comfy/shuttle{
dir = 8
},
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"FX" = (
/obj/effect/gibspawner/human,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
+"Gd" = (
+/turf/open/floor/plating,
+/area/virtual_domain/ancient_milsim/snpc_garage)
"Gl" = (
/obj/structure/barricade/sandbags,
/turf/open/floor/iron/smooth_half,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"Go" = (
/obj/effect/spawner/random/vending/snackvend,
/turf/open/floor/iron/smooth_half,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"GJ" = (
/obj/structure/railing{
dir = 8
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"GR" = (
/obj/structure/sign/departments/custodian/directional/north,
/obj/item/grenade/smokebomb,
/turf/open/floor/iron/smooth_half,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"GS" = (
/obj/machinery/conveyor_switch/oneway{
id = "sol_invasion"
},
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"Hn" = (
/obj/machinery/camera/directional/north{
status = 0
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"Hq" = (
/obj/structure/flora/tree/jungle/small/style_random,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"HG" = (
/obj/machinery/iv_drip,
/obj/structure/extinguisher_cabinet/directional/north,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
"HM" = (
/obj/machinery/vending/wardrobe/bar_wardrobe,
/obj/machinery/light/directional/south,
-/turf/open/floor/iron,
-/area/virtual_domain)
-"HR" = (
-/obj/structure/railing/corner,
-/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
+"HT" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/virtual_domain/ancient_milsim/atrium)
"Ib" = (
/obj/structure/toilet,
/obj/machinery/light/small/dim/directional/north,
/obj/effect/mob_spawn/ghost_role/human/ancient_milsim,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_toilet)
"Ir" = (
/obj/machinery/door/airlock/multi_tile/glass,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
"Is" = (
/obj/item/grenade/mirage,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
"Iw" = (
/obj/structure/railing{
dir = 5
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"Iy" = (
/obj/effect/spawner/random/trash/caution_sign,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"Iz" = (
+/turf/open/floor/iron/smooth_large,
+/area/virtual_domain/ancient_milsim/atrium)
"IH" = (
/obj/structure/extinguisher_cabinet/directional/south,
/turf/open/floor/iron/smooth_corner{
dir = 4
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
+"IS" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"Jj" = (
/obj/structure/chair/sofa/corp/right{
dir = 4
@@ -1105,15 +1282,23 @@
/turf/open/floor/iron/smooth_half{
dir = 1
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
+"Jn" = (
+/obj/structure/barricade/sandbags,
+/turf/open/floor/iron/smooth,
+/area/virtual_domain/ancient_milsim/atrium)
+"Jq" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/snpc_toilet)
"JG" = (
/turf/open/water/jungle,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"JM" = (
/obj/item/chair,
/obj/structure/sign/poster/random/directional/north,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"JU" = (
/obj/modular_map_root/safehouse{
key = "ancient_milsim"
@@ -1123,66 +1308,100 @@
"Kf" = (
/obj/effect/spawner/random/trash/bin,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"Kl" = (
/obj/structure/sign/departments/medbay/directional/west,
/turf/open/floor/iron/smooth,
+/area/virtual_domain/ancient_milsim/hallway)
+"Ku" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/atrium)
+"Kw" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/indestructible/binary,
/area/virtual_domain)
+"Kx" = (
+/obj/item/storage/box/nri_flares,
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"KA" = (
/obj/structure/table/optable,
/obj/item/surgical_processor,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
"KN" = (
/obj/effect/spawner/random/vending/snackvend,
/turf/open/floor/iron/smooth_corner{
dir = 4
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"Lr" = (
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
+"LD" = (
+/obj/structure/flora/tree/jungle/small/style_random,
+/obj/machinery/door/poddoor/ancient_milsim{
+ id = "engagement_control"
+ },
+/turf/open/misc/grass/planet/ancient_milsim,
+/area/virtual_domain/ancient_milsim/snpc_ground)
"LI" = (
/obj/item/paper/crumpled,
/turf/open/floor/iron/smooth_large,
-/area/virtual_domain)
-"Mg" = (
-/turf/closed/mineral/ash_rock,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
+"LP" = (
+/obj/structure/extinguisher_cabinet/directional/west,
+/turf/open/floor/iron,
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"Mi" = (
/obj/item/storage/toolbox/ammobox/full/mosin,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
"Mo" = (
/obj/machinery/light/floor,
/obj/structure/table,
/obj/item/megaphone,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"Mq" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/wall/mineral/titanium/survival,
+/area/virtual_domain/ancient_milsim/carrier)
"Mv" = (
/turf/closed/wall/mineral/titanium/survival,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"My" = (
/obj/structure/table,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"Mz" = (
/obj/structure/barricade/sandbags,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"MN" = (
+/turf/open/misc/dirt/planet,
+/area/virtual_domain/ancient_milsim/snpc_cave)
"MQ" = (
/obj/item/keycard/yellow,
/turf/open/floor/plating,
-/area/virtual_domain)
-"MW" = (
-/obj/item/gun/ballistic/rifle/boltaction/sporterized,
-/obj/structure/table,
+/area/virtual_domain/ancient_milsim/janitor)
+"MU" = (
+/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
+"MW" = (
+/obj/structure/table/wood,
+/obj/item/ammo_box/magazine/lanca,
+/obj/item/ammo_box/magazine/lanca{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"MY" = (
/obj/effect/landmark/bitrunning/cache_spawn,
/turf/open/floor/iron/smooth_large,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_reward)
"Nl" = (
/obj/item/minespawner/ancient_milsim,
/obj/item/minespawner/ancient_milsim,
@@ -1191,22 +1410,43 @@
/obj/item/minespawner/ancient_milsim,
/obj/structure/closet/crate/cardboard,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"NA" = (
/obj/structure/sign/poster/random/directional/west,
/obj/item/storage/toolbox/maint_kit,
+/obj/structure/table/wood,
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
+"NJ" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/open/misc/grass/planet/ancient_milsim,
+/area/virtual_domain/ancient_milsim/loot_camp)
+"On" = (
/obj/structure/table,
+/obj/item/reagent_containers/cup/glass/trophy/gold_cup,
+/obj/machinery/light/small/dim/directional/north,
+/turf/open/floor/iron/smooth_large,
+/area/virtual_domain/ancient_milsim/snpc_reward)
+"Ow" = (
+/obj/item/storage/box/nri_flares,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
+"Ox" = (
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"OA" = (
/obj/machinery/sleeper/self_control,
/obj/machinery/light/cold/directional/north,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
+"OG" = (
+/obj/machinery/light/small/dim/directional/south,
+/turf/open/floor/iron/smooth_large,
+/area/virtual_domain/ancient_milsim/snpc_exit)
"OS" = (
/obj/machinery/vending/boozeomat,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"OV" = (
/obj/machinery/conveyor/auto{
dir = 4;
@@ -1214,7 +1454,7 @@
},
/obj/structure/window/reinforced/spawner/directional/south,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"OZ" = (
/obj/structure/chair/sofa/corp/left{
dir = 8
@@ -1222,70 +1462,105 @@
/turf/open/floor/iron/smooth_half{
dir = 1
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"Pi" = (
/obj/machinery/photocopier,
/turf/open/floor/iron/smooth_corner{
dir = 8
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"Pj" = (
/obj/structure/filingcabinet/chestdrawer/wheeled,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"Pw" = (
/obj/effect/spawner/random/vending/snackvend,
/obj/machinery/light/directional/west,
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
+"PE" = (
+/obj/machinery/door/puzzle/keycard/yellow_required,
+/turf/open/floor/iron/smooth_large,
+/area/virtual_domain/ancient_milsim/snpc_exit)
"PJ" = (
/obj/structure/flippedtable,
+/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"PM" = (
/obj/effect/spawner/random/trash/bin,
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_toilet)
+"PO" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/open/floor/plating,
+/area/virtual_domain/ancient_milsim/snpc_cave)
"PT" = (
/obj/machinery/power/shuttle_engine/huge,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
-"Qn" = (
-/obj/item/ammo_box/advanced/s12gauge/pt20,
-/obj/item/ammo_box/advanced/s12gauge/pt20,
-/turf/open/floor/iron,
-/area/virtual_domain)
-"Qv" = (
-/obj/structure/flora/bush/ferny/style_random,
-/obj/structure/railing{
- dir = 6
+/area/virtual_domain/ancient_milsim/entrance)
+"Qb" = (
+/obj/structure/railing/corner{
+ dir = 1
+ },
+/obj/machinery/door/poddoor/ancient_milsim{
+ id = "engagement_control"
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
-"QF" = (
-/obj/item/ammo_box/c40sol,
-/turf/open/floor/plating,
-/area/virtual_domain)
-"Rk" = (
-/obj/item/surgery_tray/full/deployed,
+/area/virtual_domain/ancient_milsim/snpc_ground)
+"Qn" = (
+/obj/structure/table,
+/obj/item/storage/medkit/civil_defense/stocked{
+ pixel_x = 8
+ },
+/obj/item/storage/medkit/civil_defense/stocked{
+ pixel_x = -8
+ },
+/obj/item/storage/medkit/civil_defense/stocked{
+ pixel_y = 4
+ },
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
+"QF" = (
+/obj/item/ammo_box/magazine/lanca,
+/turf/open/floor/plating,
+/area/virtual_domain/ancient_milsim/maintenance)
+"QP" = (
+/turf/open/misc/dirt/planet,
+/area/virtual_domain/ancient_milsim/loot_camp)
+"Rk" = (
+/obj/structure/table,
+/obj/item/storage/medkit/combat_surgeon/stocked,
+/turf/open/floor/iron,
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"Rl" = (
-/obj/effect/baseturf_helper/virtual_domain,
-/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/obj/item/gun/ballistic/automatic/pistol/plasma_thrower,
+/obj/item/ammo_box/magazine/recharge/plasma_battery{
+ pixel_x = -3;
+ pixel_y = -14
+ },
+/obj/item/ammo_box/magazine/recharge/plasma_battery{
+ pixel_x = 8;
+ pixel_y = -12
+ },
+/turf/open/floor/iron/dark,
+/area/virtual_domain/ancient_milsim/carrier)
"Rn" = (
/obj/structure/curtain/cloth{
color = "#556B2F"
},
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"Rq" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
+"Rv" = (
+/obj/effect/landmark/bitrunning/mob_segment,
+/turf/open/floor/plating,
+/area/virtual_domain/ancient_milsim/maintenance)
"RA" = (
/obj/structure/closet/crate/secure/weapon,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
@@ -1294,237 +1569,300 @@
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"RC" = (
/obj/structure/chair/office/light{
dir = 4
},
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
+"RG" = (
+/obj/structure/table/wood,
+/obj/item/knife/combat,
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"RP" = (
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"RU" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/obj/machinery/light/small/dim/directional/west,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"RY" = (
/obj/machinery/door/airlock/multi_tile/glass{
dir = 8
},
-/turf/open/floor/iron,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"RZ" = (
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/light/small/broken/directional/north,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/carrier)
"Sh" = (
/obj/structure/urinal{
pixel_x = 32
},
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_toilet)
+"Sl" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/indestructible/reinforced,
+/area/virtual_domain/ancient_milsim/snpc_exit)
+"Sv" = (
+/obj/structure/flora/bush/flowers_br/style_random,
+/turf/open/misc/grass/planet/ancient_milsim,
+/area/virtual_domain/ancient_milsim/snpc_ground)
"SB" = (
/obj/structure/shipping_container/kosmologistika,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"SG" = (
/obj/structure/table,
/obj/item/folder/blue,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"Tx" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/medbay)
"TB" = (
/obj/structure/fence/door{
dir = 4
},
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
-"TE" = (
-/obj/item/storage/toolbox/ammobox/full/mosin,
+/area/virtual_domain/ancient_milsim/loot_camp)
+"TD" = (
+/obj/structure/table,
+/obj/machinery/recharger,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
+"TE" = (
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"TG" = (
/obj/item/grown/log,
/obj/item/grown/log,
/obj/item/grown/log,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"TP" = (
/obj/machinery/door/airlock/maintenance_hatch,
/obj/effect/mapping_helpers/airlock/locked,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
"TQ" = (
/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
"TY" = (
/obj/structure/railing{
dir = 10
},
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"Ue" = (
/obj/structure/closet/crate/cardboard,
/obj/item/stack/sheet/mineral/sandbags/fifty,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
"Ug" = (
/obj/machinery/light/small/broken/directional/west,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cave)
"Ux" = (
/obj/structure/closet/crate/trashcart/filled,
-/obj/item/ammo_box/c40sol,
+/obj/item/ammo_box/magazine/lanca,
/obj/item/ammo_box/c35sol,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/janitor)
"Uz" = (
/turf/closed/indestructible/binary,
/area/virtual_domain)
"UD" = (
/obj/structure/table,
-/obj/item/knife/combat/survival,
+/obj/item/knife/combat,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"UQ" = (
/obj/effect/spawner/random/vending/colavend,
/obj/structure/sign/poster/random/directional/west,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
"Vi" = (
/obj/structure/chair/stool/directional/east,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"Vj" = (
/obj/item/reagent_containers/cup/bottle/thermite,
/turf/open/floor/plating,
-/area/virtual_domain)
-"Vr" = (
-/obj/item/ammo_box/magazine/c980_grenade/starts_empty,
+/area/virtual_domain/ancient_milsim/maintenance)
+"Vl" = (
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
+"Vp" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/open/floor/iron,
+/area/virtual_domain/ancient_milsim/snpc_cafe)
+"Vr" = (
+/obj/item/ammo_box/magazine/lanca,
+/turf/open/misc/grass/planet/ancient_milsim,
+/area/virtual_domain/ancient_milsim/loot_camp)
"VA" = (
/turf/open/floor/iron/smooth_corner{
dir = 4
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"VC" = (
/obj/structure/table,
/obj/item/stack/medical/suture/bloody,
/obj/item/stack/medical/suture/bloody,
/turf/open/floor/iron/white,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/medbay)
"VO" = (
/obj/machinery/vending/cigarette,
/turf/open/floor/iron/smooth_corner{
dir = 1
},
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"VX" = (
/obj/structure/extinguisher_cabinet/directional/west,
/obj/item/storage/backpack/duffelbag/syndie/c4,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
"VZ" = (
-/obj/effect/baseturf_helper/virtual_domain,
-/turf/template_noop,
-/area/virtual_domain/safehouse)
+/turf/open/misc/dirt/planet,
+/area/virtual_domain/ancient_milsim/entrance)
"Wh" = (
/obj/machinery/light/directional/south,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"Wq" = (
/obj/machinery/door/morgue,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_toilet)
"Wr" = (
/obj/structure/flora/bush/ferny/style_random,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_ground)
"Wv" = (
/obj/machinery/button/door/indestructible/ancient_milsim{
pixel_y = 24
},
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"Ww" = (
/obj/structure/inflatable,
/turf/open/floor/iron/dark,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"WG" = (
/obj/machinery/light/directional/west,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
+"WR" = (
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
+/turf/closed/wall/r_wall,
+/area/virtual_domain/ancient_milsim/hallway)
"WY" = (
-/obj/item/gun/ballistic/rifle/boltaction/sporterized,
+/obj/item/gun/ballistic/automatic/lanca,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/maintenance)
"Xh" = (
-/obj/item/storage/medkit/expeditionary,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/obj/item/ammo_box/c310_cargo_box/piercing,
+/turf/open/floor/plating,
+/area/virtual_domain/ancient_milsim/maintenance)
"XK" = (
/obj/effect/spawner/random/trash/bin,
/obj/structure/sign/poster/random/directional/north,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"XS" = (
/obj/effect/spawner/random/vending/colavend,
/turf/open/floor/iron/smooth_half,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/atrium)
"XU" = (
/obj/structure/extinguisher_cabinet/directional/east,
/turf/open/floor/iron/smooth,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/hallway)
+"XV" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron,
+/area/virtual_domain/ancient_milsim/snpc_garage)
"XZ" = (
/obj/machinery/light/small/broken/directional/south,
/turf/open/floor/plating,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cave)
"Yd" = (
/obj/structure/chair{
dir = 1
},
/obj/structure/sign/poster/random/directional/south,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"Yx" = (
/obj/structure/sign/departments/science/directional/north,
/obj/structure/sign/flag/nri/directional/north,
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim,
/turf/open/misc/grass/planet/ancient_milsim,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/entrance)
+"YE" = (
+/turf/open/floor/plating,
+/area/virtual_domain/ancient_milsim/snpc_cafe)
"YY" = (
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
"Zd" = (
/obj/structure/chair/sofa/corp/right{
dir = 4
},
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_hallway)
"Zg" = (
/obj/structure/sign/poster/random/directional/west,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"ZA" = (
/obj/effect/landmark/bitrunning/mob_segment,
/turf/open/misc/dirt/planet,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/loot_camp)
"ZQ" = (
/obj/structure/sign/flag/nri/directional/east,
-/turf/open/floor/iron,
-/area/virtual_domain)
+/turf/open/floor/carpet/red,
+/area/virtual_domain/ancient_milsim/snpc_bar)
"ZY" = (
/obj/structure/reagent_dispensers/fueltank/large,
/turf/open/floor/iron,
-/area/virtual_domain)
+/area/virtual_domain/ancient_milsim/snpc_garage)
(1,1,1) = {"
+nu
+nu
+nu
+nu
+nu
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+nu
+nu
+nu
+nu
Uz
Uz
Uz
@@ -1545,50 +1883,26 @@ Uz
Uz
Uz
Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
"}
(2,1,1) = {"
+nu
+nu
+nu
+nu
+nu
Uz
-JG
-JG
-JG
-JG
-fF
qn
qn
qn
@@ -1602,24 +1916,12 @@ er
er
er
er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
er
er
er
@@ -1639,14 +1941,26 @@ er
er
er
Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
"}
(3,1,1) = {"
+nu
+nu
+nu
+nu
+nu
Uz
-JG
-JG
-JG
-JG
-aB
qn
JG
qn
@@ -1670,41 +1984,41 @@ er
Cd
Cd
Cd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
+eF
er
Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
"}
(4,1,1) = {"
+nu
+nu
+nu
+nu
+nu
Uz
-JG
-JG
-JG
-Cd
-uQ
qn
qn
qn
@@ -1728,7 +2042,7 @@ Cd
Cd
Hq
Cd
-dd
+eF
ZY
nw
eE
@@ -1738,31 +2052,31 @@ mZ
mZ
AE
ea
-YY
+gE
AE
-dd
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+eF
er
Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
"}
(5,1,1) = {"
+nu
+nu
+nu
+nu
+nu
Uz
-JG
-JG
-Cd
-DT
-fF
qn
qn
JG
@@ -1786,41 +2100,41 @@ Cd
Cd
Cd
Cd
-dd
+eF
kv
-YY
-YY
-YY
-YY
-YY
-YY
-YY
-YY
-YY
+gE
+gE
+gE
+gE
+gE
+gE
+gE
+gE
+gE
zf
-dd
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+eF
er
Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
"}
(6,1,1) = {"
+nu
+nu
+nu
+nu
+nu
Uz
-JG
-JG
-Wr
-Cd
-fF
qn
qn
JG
@@ -1845,40 +2159,40 @@ qn
qn
qn
aG
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-YY
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+gE
ec
-dd
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+eF
er
Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+nu
+nu
+nu
+nu
"}
(7,1,1) = {"
+nu
+nu
+nu
+nu
+nu
Uz
-JG
-JG
-hj
-Cd
-fF
qn
qn
qn
@@ -1903,40 +2217,40 @@ qn
qn
qn
aG
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-YY
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+gE
uE
-dd
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+eF
er
Uz
+er
+er
+er
+er
+er
+er
+er
+Uz
+nu
+nu
+nu
+nu
"}
(8,1,1) = {"
+nu
+nu
+nu
+nu
+nu
Uz
-JG
-Cd
-Cd
-Hq
-fF
qn
qn
qn
@@ -1961,40 +2275,40 @@ JG
Cd
Cd
aG
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-YY
-YY
-dd
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+gE
+gE
+eF
+er
+er
+er
+Eg
+Eg
+Eg
+Eg
+Eg
er
Uz
+nu
+nu
+nu
+nu
"}
(9,1,1) = {"
+nu
+nu
+nu
+nu
+nu
Uz
-Cd
-Cd
-hj
-Cd
-uQ
qn
JG
qn
@@ -2004,12 +2318,12 @@ qn
Cd
Cd
Eh
-ki
+Rl
RP
RP
EB
RP
-ki
+ol
no
Cd
Cd
@@ -2019,40 +2333,40 @@ JG
JG
Cd
aG
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-YY
-kX
-kX
-dd
-qn
-qn
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+gE
+Gd
+Gd
+cx
+MN
+MN
+Eg
+kL
+sG
+MY
+Eg
er
Uz
+nu
+nu
+nu
+nu
"}
(10,1,1) = {"
+nu
+nu
+nu
+nu
+nu
Uz
-Wr
-Cd
-Cd
-Wr
-fF
qn
qn
qn
@@ -2077,40 +2391,40 @@ Cd
Cd
Cd
aG
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+gE
+iZ
+Gd
kX
kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-YY
-qn
-kX
-kX
-kX
-sD
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+MN
+Eg
+On
+sG
+DL
+Eg
er
Uz
+Uz
+Uz
+Uz
+Uz
"}
(11,1,1) = {"
+nu
+nu
+nu
+nu
+nu
Uz
-Cd
-Cd
-Cd
-hj
-fF
qn
JG
qn
@@ -2119,7 +2433,7 @@ qn
Cd
qn
qn
-Mv
+Mq
Mv
qn
FX
@@ -2135,40 +2449,40 @@ qn
qn
qn
aG
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+gE
+XV
+eF
kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-YY
-Wh
-dd
-kX
-qn
-qn
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+MN
+MN
+Eg
+EE
+sG
+MY
+Eg
+er
+er
+er
+er
er
Uz
"}
(12,1,1) = {"
+nu
+nu
+nu
+nu
+Uz
Uz
-Cd
-Cd
-DT
-HR
-Qv
qn
JG
qn
@@ -2193,39 +2507,39 @@ Cd
qn
qn
aG
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-kX
-YY
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+Gd
+gE
SB
-dd
+eF
zx
kX
-qn
-dd
-dd
-dd
-dd
-dd
-qn
-qn
-qn
-dd
+MN
+fJ
+Eg
+zp
+Eg
+Eg
+MN
+MN
+MN
+cx
er
Uz
"}
(13,1,1) = {"
+nu
+nu
+nu
+Uz
Uz
-Cd
-hj
-HR
-xI
qn
qn
qn
@@ -2250,22 +2564,22 @@ Cd
Cd
Cd
Cd
-dd
+eF
nH
uM
uM
-YY
+FN
vu
lc
-YY
-YY
-YY
-YY
-YY
-dd
+gE
+gE
+gE
+gE
+gE
+eF
kX
kX
-qn
+MN
vs
kX
kX
@@ -2273,16 +2587,16 @@ kX
kX
kX
kX
-qn
-dd
+MN
+cx
er
Uz
"}
(14,1,1) = {"
+nu
+nu
+Uz
Uz
-Cd
-HR
-xI
qn
qn
qn
@@ -2308,19 +2622,20 @@ Cd
Cd
Cd
Cd
-dd
+eF
Ue
Nl
oz
-YY
-YY
-YY
-YY
-YY
-YY
-YY
-YY
-dd
+gE
+gE
+gE
+gE
+gE
+gE
+gE
+gE
+eF
+PO
kX
kX
kX
@@ -2331,15 +2646,14 @@ kX
kX
kX
kX
-kX
-dd
+cx
er
Uz
"}
(15,1,1) = {"
+nu
+Uz
Uz
-HR
-xI
qn
qn
qn
@@ -2365,38 +2679,38 @@ JG
Cd
Cd
Cd
-hj
-dd
-dd
-dd
-dd
-dd
-YY
+Sv
+uC
+eF
+eF
+eF
+eF
+gE
fu
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
+eF
+eF
+eF
+eF
+eF
+eF
+IS
+IS
+IS
+IS
+IS
+YE
+YE
+IS
+IS
kX
kX
-dd
-dd
-kX
-kX
-dd
+cx
er
Uz
"}
(16,1,1) = {"
Uz
-Fk
+Uz
qn
JG
JG
@@ -2423,32 +2737,32 @@ Cd
Cd
Cd
Wr
-hj
+Sv
rB
-YY
+rO
UQ
Pw
De
YY
-DW
+Ow
wr
-De
+cF
ob
uZ
jS
Zd
rT
-YY
-YY
-YY
-ea
-kX
-qn
-YY
-dd
-qn
+sX
+sX
+sX
+LP
+YE
+Bs
+sX
+IS
+MN
zL
-dd
+cx
er
Uz
"}
@@ -2480,12 +2794,12 @@ JG
Cd
Cd
Cd
-hj
-hj
+Sv
+Sv
rB
-Qn
-Ey
-CR
+YY
+YY
+YY
YY
YY
YY
@@ -2496,17 +2810,17 @@ YY
YY
YY
lz
-YY
+sX
DW
-YY
+sX
jc
-YY
+sX
hJ
bw
-dd
-qn
-qn
-dd
+IS
+MN
+MN
+cx
er
Uz
"}
@@ -2538,11 +2852,11 @@ JG
JG
Cd
Hq
-hj
-hj
-rB
+Sv
+Sv
+Fn
+CR
YY
-cF
tg
YY
YY
@@ -2553,18 +2867,18 @@ tg
YY
YY
YY
-YY
-YY
+Vp
+sX
yt
yt
UD
-YY
+sX
jc
Wh
-dd
-qn
-qn
-dd
+IS
+MN
+MN
+cx
er
Uz
"}
@@ -2597,32 +2911,32 @@ Cd
Cd
Cd
Cd
-hj
-dd
-dd
-dd
-dd
+Sv
+oJ
+oJ
+oJ
+oJ
ka
-dd
-dd
-YY
+oJ
+oJ
+TE
RY
-dd
-dd
-dd
-dd
-dd
+Ox
+Ox
+Ox
+Ox
+Ox
JM
sV
nM
-YY
-YY
-YY
+sX
+sX
+sX
lt
-dd
+IS
kX
kX
-qn
+MN
er
Uz
"}
@@ -2656,31 +2970,31 @@ Cd
Cd
Cd
Cd
-dd
+oJ
Ib
Wq
-YY
-YY
+AH
+AH
iI
-dd
-YY
-YY
+oJ
+TE
+TE
Bd
NA
Zg
OS
-dd
+Ox
Dk
-YY
+sX
yt
-jc
-YY
-jc
+TD
+sX
+TD
iW
-dd
+IS
kX
kX
-dd
+cx
er
Uz
"}
@@ -2714,20 +3028,20 @@ Cd
Cd
Cd
Cd
-dd
-dd
-dd
-YY
-YY
+oJ
+oJ
+oJ
+AH
+AH
Dy
-dd
+oJ
AN
-YY
+TE
Bd
td
-YY
+TE
yV
-dd
+Ox
XK
yt
yt
@@ -2735,10 +3049,10 @@ hH
Fq
hH
Yd
-dd
+IS
kX
kX
-dd
+cx
er
Uz
"}
@@ -2772,31 +3086,31 @@ Cd
Cd
Cd
Cd
-dd
+oJ
ne
Wq
-YY
-YY
+AH
+AH
PM
-dd
+oJ
AB
-DW
+Kx
et
-td
-YY
+wy
+TE
HM
-dd
+Ox
Ff
-YY
-Xh
-YY
-YY
+sX
+sX
+sX
+sX
yt
Wh
-dd
+IS
kX
kX
-dd
+cx
er
Uz
"}
@@ -2830,31 +3144,31 @@ Cd
Wr
DT
Cd
-dd
-dd
-dd
-YY
-YY
+oJ
+oJ
+oJ
+AH
+AH
Dy
-dd
+oJ
lr
-YY
+TE
Bd
MW
-YY
+TE
yn
-dd
+Ox
Dk
-YY
+sX
rx
PJ
nM
jc
Yd
-dd
+IS
kX
-qn
-dd
+MN
+cx
er
Uz
"}
@@ -2888,31 +3202,31 @@ JG
Cd
Cd
Cd
-dd
+oJ
ne
Wq
Sh
Sh
iI
-dd
-jc
+oJ
+RG
te
TE
TE
ZQ
mu
-dd
-YY
+Ox
+Qn
Rk
lX
CH
-tg
+MU
hH
iW
-dd
+IS
kX
kX
-dd
+cx
er
Uz
"}
@@ -2946,79 +3260,79 @@ JG
JG
Cd
Wr
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
+Jq
+oJ
+oJ
+oJ
+oJ
+oJ
+oJ
+or
+Ox
+Ox
+Ox
+Ox
+Ox
+Ox
+IS
+IS
+IS
+IS
+IS
+IS
+IS
+IS
kX
dh
-dd
+cx
er
Uz
"}
(26,1,1) = {"
Uz
-cb
-Hq
-Cd
-Hq
-Cd
-Cd
-Hq
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Hq
-Cd
-Cd
-Cd
-Cd
-JG
-Cd
-Cd
-Cd
-Cd
-Hq
-Cd
-hj
-Cd
-Cd
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-dd
+Qb
+LD
+hy
+LD
+hy
+hy
+LD
+hy
+hy
+hy
+hy
+hy
+hy
+LD
+hy
+hy
+hy
+hy
+Aw
+hy
+hy
+hy
+hy
+LD
+hy
+eQ
+hy
+hy
+er
+er
+er
+er
+er
+er
+er
+er
+er
+er
+er
+er
+er
+er
+cx
kX
kX
kX
@@ -3028,13 +3342,13 @@ kX
kX
kX
kX
-qn
+MN
er
Uz
"}
(27,1,1) = {"
Uz
-hy
+ed
hy
hy
hy
@@ -3061,22 +3375,22 @@ hy
eQ
eQ
eQ
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-dd
+er
+er
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+er
+cx
ED
kX
kX
@@ -3086,96 +3400,99 @@ kX
kX
kX
kX
-qn
+MN
er
Uz
"}
(28,1,1) = {"
Uz
-Cd
-Cd
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
+Vl
+Vl
Mz
Mz
Mz
Mz
Mz
Mz
-pn
+tU
hj
-Cd
-Cd
+Vl
+Vl
er
-dd
-kX
-kX
-dd
-Mg
-Wr
-Cd
-Cd
-hj
-hj
+yh
+oj
+oj
+yh
+er
+yh
+oj
+oj
+yh
+er
+er
+er
+Uz
+Uz
nu
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-dd
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Uz
+er
+cx
kX
kX
-dd
-dd
-dd
-dd
-dd
-qn
-qn
-qn
+cx
+cx
+cx
+cx
+cx
+MN
+MN
+MN
er
Uz
"}
(29,1,1) = {"
Uz
hj
-Cd
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
+Vl
Mz
kJ
-qn
-qn
-qn
+QP
+QP
+QP
Mz
-Cd
-Cd
-Wr
-Cd
+Vl
+Vl
+qC
+Vl
er
-dd
-kX
-kX
-dd
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+yh
+oj
+oj
+yh
+er
+yh
+oj
+oj
+yh
+er
+Uz
+Uz
+Uz
nu
nu
nu
@@ -3187,198 +3504,195 @@ nu
nu
nu
nu
-nu
-nu
-nu
-nu
-nu
-dd
+Uz
+er
+ls
kX
XZ
-dd
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+cx
+er
+er
+er
+er
+er
+er
+er
er
Uz
"}
(30,1,1) = {"
Uz
-Cd
-Cd
-Cd
-Wr
-Cd
-Cd
-qn
-qn
-qn
-qn
-Cd
-Cd
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
+qC
+Vl
+Vl
+QP
+QP
+QP
+QP
+Vl
+Vl
+Vl
+Vl
+Vl
er
-dd
-kX
-kX
-dd
+yh
+oj
+oj
+yh
er
+yh
+oj
+oj
+yh
er
+Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Uz
er
+uz
+uz
+PE
+uz
er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-Eg
-Eg
-zp
-Eg
-Eg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
-er
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
Uz
"}
(31,1,1) = {"
Uz
-Cd
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
+Vl
hj
-Cd
-qn
+Vl
+QP
ZA
-qn
-qn
-Cd
-Cd
-Cd
+QP
+QP
+Vl
+Vl
+Vl
hj
-Cd
+Vl
er
-dd
-kX
-kX
-dd
+yh
+oj
+oj
+yh
er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-Eg
-kL
-AW
-MY
-Eg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+yh
+oj
+oj
+yh
er
Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Uz
+er
+uz
+AW
+AW
+uz
+er
+Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
"}
(32,1,1) = {"
Uz
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-qn
-qn
-Cd
-Cd
-Wr
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+QP
+QP
+Vl
+Vl
+qC
+Vl
+Vl
+Vl
er
-dd
-kX
-kX
-dd
+yh
+oj
+oj
+yh
er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-Eg
-Do
-AW
-MY
-Eg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+yh
+oj
+oj
+yh
er
Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Uz
+er
+uz
+Do
+OG
+uz
+er
+Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
"}
(33,1,1) = {"
Uz
@@ -3398,10 +3712,15 @@ vL
vL
vL
er
-dd
-kX
-kX
-dd
+yh
+oj
+oj
+yh
+er
+yh
+oj
+oj
+yh
er
er
er
@@ -3409,84 +3728,79 @@ er
er
er
er
+Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Uz
er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-Eg
-EE
+uz
AW
-MY
-Eg
-Mg
-Mg
-Mg
-Mg
-Mg
-Mg
+AW
+uz
er
Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
"}
(34,1,1) = {"
Uz
wz
-Cd
-Cd
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
+Vl
+Vl
wv
-qn
-qn
-Cd
+QP
+QP
+Vl
wz
-Cd
-Cd
-Cd
-Cd
-dd
-dd
+Vl
+Vl
+Vl
+Vl
+yh
+yh
TP
TP
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
+yh
+yh
+yh
+TP
+TP
+yh
+go
+go
+go
+go
+go
+go
er
+Uz
+nu
+nu
+nu
+nu
+nu
+nu
+Uz
+Uz
er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-Eg
-Eg
+Sl
+uz
sa
-Eg
-Eg
+uz
+er
er
er
er
@@ -3498,281 +3812,281 @@ Uz
"}
(35,1,1) = {"
Uz
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-dd
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+jn
Wv
-qn
-Cd
+QP
+Vl
lG
-Cd
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
+Vl
TP
TQ
-kX
+oj
fk
-kX
-kX
-kX
+gP
+oj
+oj
Mi
-kX
+oj
fk
-dd
+go
AY
eR
Cr
wh
-dd
+go
+er
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
er
er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
+nA
+nA
+nA
+nA
+nA
+nA
+nA
+nA
+nA
+nA
+nA
+nA
Uz
"}
(36,1,1) = {"
Uz
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
wz
-Cd
-Cd
-Cd
-qn
-qn
-Cd
+Vl
+Vl
+Vl
+QP
+QP
+Vl
bB
bB
bB
bB
-Cd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
+Vl
+qB
+yh
+yh
+yh
+yh
+yh
+yh
yl
Is
-kX
-dd
+Xh
+go
OV
-kX
+aO
MQ
gL
-dd
+go
er
er
er
er
er
er
+Uz
+Uz
er
er
-er
-er
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-qn
+nA
+nA
+nA
+nA
+nA
+nA
+nA
+nA
+nA
+nA
+nA
+nA
+lu
Uz
"}
(37,1,1) = {"
Uz
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-qn
-qn
-Cd
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+QP
+QP
+Vl
bB
RA
nZ
bB
-Cd
-dd
+Vl
+iq
qV
+Cg
Lr
Lr
-Lr
-xa
-dd
+Ey
+yh
EW
-kX
-jV
-dd
+oj
+Rv
+go
th
GS
-kX
+aO
AR
-dd
-dd
-dd
-dd
-dd
-dd
+go
+Ku
+Ku
+Ku
+Ku
+Ku
er
er
er
er
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-qn
-qn
-qn
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+VZ
+VZ
+VZ
Uz
"}
(38,1,1) = {"
Uz
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
TG
sS
-Cd
-Cd
-Cd
-qn
-qn
+Vl
+Vl
+Vl
+QP
+QP
Ww
Vi
bm
bB
-Cd
-dd
+Vl
+iq
zE
Lr
iz
RC
xa
-dd
+yh
uY
QF
WY
-dd
+go
hO
-kX
+aO
pY
-dd
-dd
+go
+go
oe
Ek
Jj
KN
-dd
-dd
-dd
+Ku
+Ku
+Ku
er
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-qn
-qn
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+VZ
+VZ
Uz
"}
(39,1,1) = {"
Uz
-Cd
+Vl
wz
-Cd
+Vl
im
im
-Cd
-Cd
-Cd
-qn
-qn
+Vl
+Vl
+Vl
+QP
+QP
Ww
My
ki
bB
-Cd
-dd
+Vl
+iq
OA
Lr
VC
DN
rl
-dd
+yh
uY
QF
Is
-dd
+go
AC
jV
-kX
-dd
+aO
+go
GR
wx
ek
-AW
+Iz
hp
IH
-dd
-dd
-dd
-Cd
-Cd
-Cd
-Cd
+Ku
+Ku
+Ku
+hZ
+hZ
+hZ
+hZ
kS
lE
lE
@@ -3781,57 +4095,57 @@ lE
lE
JU
qp
-qn
-qn
-qn
+VZ
+VZ
+VZ
Uz
"}
(40,1,1) = {"
Uz
-Cd
-Cd
+Vl
+Vl
bB
bB
bB
Ww
Ww
-Cd
-qn
-qn
+Vl
+QP
+QP
bB
Rn
Rn
bB
-Cd
-dd
+Vl
+iq
HG
Bg
Lr
Lr
Bg
-dd
+yh
cp
Is
QF
-dd
+go
Ux
cV
-kX
+aO
lf
Fv
ek
-dC
-dC
-AW
+CC
+CC
+Iz
hp
ly
-dd
+Ku
uy
-Cd
-Cd
-Cd
-Cd
-Cd
+hZ
+hZ
+hZ
+hZ
+hZ
lE
lE
lE
@@ -3839,14 +4153,14 @@ lE
lE
lE
bd
-qn
-qn
-qn
+VZ
+VZ
+VZ
Uz
"}
(41,1,1) = {"
Uz
-Cd
+Vl
bB
bB
ki
@@ -3854,52 +4168,52 @@ ki
ki
Ww
Ww
-qn
-qn
-Cd
-qn
-qn
-Cd
+QP
+QP
+Vl
+QP
+QP
+Vl
lG
-dd
+iq
tA
Lr
Lr
Lr
pN
-dd
+yh
Rq
-jV
+Rv
fk
-dd
-dd
-dd
+aE
+go
+go
lf
-dd
+go
al
-AW
+Iz
Kf
-ir
+Jn
eh
-AW
+Iz
Gl
-wZ
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
+HT
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
lE
lE
lE
lE
lE
lE
-qn
-qn
+DE
+VZ
PT
-qn
+VZ
Uz
"}
(42,1,1) = {"
@@ -3912,52 +4226,52 @@ ss
ki
ki
bB
-qn
-qn
-Cd
-qn
+QP
+QP
+Vl
+QP
ke
-Cd
-Cd
-dd
+Vl
+Vl
+iq
KA
Lr
Lr
Lr
Lr
-dd
+yh
yl
-kX
+oj
vr
VX
-kX
+oj
Vj
Vj
-dd
+yh
Go
LI
co
vd
CV
-AW
+Iz
Fv
-ft
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
+iO
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
lE
lE
lE
lE
lE
lE
-qn
-qn
-qn
-qn
+DE
+VZ
+VZ
+VZ
Uz
"}
(43,1,1) = {"
@@ -3970,52 +4284,52 @@ SG
ki
ki
Rn
-qn
-qn
-qn
-qn
-qn
-qn
-Cd
-dd
-dd
-dd
-dd
+QP
+QP
+QP
+QP
+QP
+QP
+Vl
+Tx
+iq
+iq
+iq
Lr
Cf
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
-dd
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
+yh
XS
-AW
+Iz
ie
El
CV
-AW
+Iz
Gl
-AW
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
+Iz
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
lE
lE
lE
lE
lE
lE
-qn
-qn
-qn
-qn
+DE
+VZ
+VZ
+VZ
Uz
"}
(44,1,1) = {"
@@ -4028,13 +4342,13 @@ Ab
ki
ki
Rn
-qn
-qn
+QP
+QP
ZA
-qn
-qn
-qn
-qn
+QP
+QP
+QP
+QP
ft
dC
WG
@@ -4051,19 +4365,19 @@ dC
dC
Ir
ot
-AW
+Iz
iU
-ir
+Jn
vz
-AW
+Iz
Gl
-wZ
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
+HT
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
lE
lE
lE
@@ -4071,9 +4385,9 @@ lE
lE
lE
bd
-qn
-qn
-qn
+VZ
+VZ
+VZ
Uz
"}
(45,1,1) = {"
@@ -4086,14 +4400,14 @@ Mo
ki
ki
bB
-Cd
-Cd
-Cd
-qn
-qn
-qn
-qn
-AW
+Vl
+Vl
+Vl
+QP
+QP
+QP
+QP
+va
dC
dC
dC
@@ -4109,34 +4423,34 @@ dC
dC
dC
kh
-AW
-dC
+Iz
+CC
iw
-AW
+Iz
DO
qs
-dd
+Ku
Yx
-Cd
-Cd
-Cd
-Cd
+hZ
+hZ
+hZ
+hZ
kS
+ws
lE
lE
lE
lE
lE
-VZ
qp
-qn
-qn
-qn
+VZ
+VZ
+VZ
Uz
"}
(46,1,1) = {"
Uz
-FN
+Vl
bB
bB
ki
@@ -4144,13 +4458,13 @@ ki
ki
Ww
Ww
-Cd
-Cd
-Cd
-qn
-qn
-Cd
-Cd
+Vl
+Vl
+Vl
+QP
+QP
+Vl
+Vl
wZ
dC
tH
@@ -4168,28 +4482,28 @@ kT
dd
Pi
VA
-AW
-AW
+Iz
+Iz
Ei
wx
-dd
-dd
-dd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-qn
-qn
-qn
+Ku
+Ku
+Ku
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+VZ
+VZ
+VZ
Uz
"}
(47,1,1) = {"
@@ -4201,16 +4515,15 @@ bB
bB
Ww
Ww
-Cd
-Cd
+Vl
+Vl
bB
Ww
Ww
Rn
bB
-Cd
-dd
-dd
+Vl
+WR
dd
dd
dd
@@ -4225,50 +4538,51 @@ dd
dd
dd
dd
+Ku
ba
CJ
OZ
VO
-dd
-dd
-dd
+Ku
+Ku
+Ku
er
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-qn
-qn
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+VZ
+VZ
Uz
"}
(48,1,1) = {"
Uz
Dt
Vr
-wy
-Cd
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
+Vl
+Vl
wz
-Cd
-dd
+Vl
+jn
CT
uq
ki
bB
-Cd
+Vl
qA
-Cd
+Vl
xe
Fb
rb
@@ -4282,58 +4596,63 @@ er
er
er
er
-dd
-dd
-dd
-dd
-dd
-dd
+qr
+Ku
+Ku
+Ku
+Ku
+Ku
er
er
er
er
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-qn
-qn
-qn
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+VZ
+VZ
+VZ
Uz
"}
(49,1,1) = {"
Uz
-DL
+Vl
Vr
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
lG
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
bB
ue
nQ
ki
yd
-qn
+QP
yI
Iy
tI
-qn
-qn
-qn
+QP
+QP
+QP
BO
aP
er
+Uz
+Uz
+Uz
+Uz
+Uz
er
er
er
@@ -4342,147 +4661,143 @@ er
er
er
er
+Uz
+Uz
er
-er
-er
-er
-er
-er
-er
-er
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
Uz
"}
(50,1,1) = {"
Uz
-Cd
+Vl
wz
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
wz
-Cd
-Cd
-Cd
+Vl
+Vl
+Vl
bB
bB
bB
bB
bB
-Cd
+Vl
qA
-Cd
-qn
+Vl
+QP
ZA
wQ
-qn
-qn
+QP
+QP
aP
er
+Uz
+nu
+nu
+nu
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
+Uz
er
er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
Uz
"}
(51,1,1) = {"
Uz
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
+NJ
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
+Vl
qA
xB
kC
-qn
+QP
tI
aP
er
er
er
+Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+Uz
+Uz
er
er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-er
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Cd
-Rl
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
+hZ
Uz
"}
(52,1,1) = {"
+Kw
Uz
Uz
Uz
@@ -4508,21 +4823,20 @@ Uz
Uz
Uz
Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
-Uz
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
+nu
Uz
Uz
Uz
diff --git a/code/__DEFINES/~skyrat_defines/colony_fabricator_misc.dm b/code/__DEFINES/~skyrat_defines/colony_fabricator_misc.dm
index d9012ad0869..1b358da8b11 100644
--- a/code/__DEFINES/~skyrat_defines/colony_fabricator_misc.dm
+++ b/code/__DEFINES/~skyrat_defines/colony_fabricator_misc.dm
@@ -6,6 +6,15 @@
#define RND_CATEGORY_AKHTER_MEDICAL "Emergency Medical"
/// Category for resources made by the organics printer
#define RND_CATEGORY_AKHTER_RESOURCES "Resources"
+
+/// Category for ingredients in the ration printer
+#define RND_CATEGORY_AKHTER_FOODRICATOR_INGREDIENTS "Ingredients"
+/// Category for bags and containers of reagents in the ration printer
+#define RND_CATEGORY_AKHTER_FOODRICATOR_BAGS "Containers"
+/// Category for snacks in the ration printer
+#define RND_CATEGORY_AKHTER_FOODRICATOR_SNACKS "Luxuries"
+/// Category for utensils and whatnot in the ration printer
+#define RND_CATEGORY_AKHTER_FOODRICATOR_UTENSILS "Utensils"
/// Category for the seeds the organics printer can make
#define RND_CATEGORY_AKHTER_SEEDS "Synthesized Seeds"
diff --git a/modular_skyrat/master_files/code/modules/research/designs/limbgrower_designs.dm b/modular_skyrat/master_files/code/modules/research/designs/limbgrower_designs.dm
index 9c65cf4502a..9a3dd0e95a3 100644
--- a/modular_skyrat/master_files/code/modules/research/designs/limbgrower_designs.dm
+++ b/modular_skyrat/master_files/code/modules/research/designs/limbgrower_designs.dm
@@ -18,16 +18,25 @@
name = "Snail Tongue"
id = "snailtongue"
build_path = /obj/item/organ/internal/tongue/snail
- category = list(SPECIES_SNAIL, RND_CATEGORY_INITIAL)
+ category = list(
+ SPECIES_SNAIL,
+ RND_CATEGORY_INITIAL,
+ )
/datum/design/liver/snail
name = "Snail Liver"
id = "snailliver"
build_path = /obj/item/organ/internal/liver/snail
- category = list(SPECIES_SNAIL, RND_CATEGORY_INITIAL)
+ category = list(
+ SPECIES_SNAIL,
+ RND_CATEGORY_INITIAL,
+ )
/datum/design/heart/snail
name = "Snail Heart"
id = "snailheart"
build_path = /obj/item/organ/internal/heart/snail
- category = list(SPECIES_SNAIL, RND_CATEGORY_INITIAL)
+ category = list(
+ SPECIES_SNAIL,
+ RND_CATEGORY_INITIAL,
+ )
diff --git a/modular_skyrat/master_files/code/modules/research/designs/medical_designs.dm b/modular_skyrat/master_files/code/modules/research/designs/medical_designs.dm
index 29bfcc4d02e..c2beb545386 100644
--- a/modular_skyrat/master_files/code/modules/research/designs/medical_designs.dm
+++ b/modular_skyrat/master_files/code/modules/research/designs/medical_designs.dm
@@ -4,10 +4,14 @@
id = "cybernetic_tongue"
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
construction_time = 4 SECONDS
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 2,
+ )
build_path = /obj/item/organ/internal/tongue/cybernetic
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_1
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ORGANS_1,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
diff --git a/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm b/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm
index 9a253d53e7d..c8315b4190b 100644
--- a/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm
+++ b/modular_skyrat/master_files/code/modules/research/designs/misc_designs.dm
@@ -3,10 +3,14 @@
desc = "A fragile, circuitry embedded helmet for boosting the intelligence of a monkey to a higher level."
id = "monkey_helmet"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/clothing/head/helmet/monkey_sentience
category = list(
- RND_CATEGORY_TOOLS + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_EQUIPMENT_SCIENCE,
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
@@ -15,10 +19,14 @@
desc = "A type of plumbing constructor designed to manipulate fluid."
id = "plumbing_eng"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 40, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 5, /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 40,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/construction/plumbing/engineering
category = list(
- RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_ENGINEERING,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
@@ -27,10 +35,14 @@
desc = "An adjusted version of the medical syringe gun that only allows SmartDarts to be chambered."
id = "smartdartgun"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2,
+ )
build_path = /obj/item/gun/syringe/smartdart
category = list(
- RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -39,10 +51,14 @@
desc = "All-in-one kit containing the parts to create a portable anesthetic stand, tank not included."
id = "anesthetic_machine"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2,
+ )
build_path = /obj/item/anesthetic_machine_kit
category = list(
- RND_CATEGORY_TOOLS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -51,18 +67,25 @@
desc = "A frame for a time clock console, contains all of the parts needed to build a new time clock"
id = "time_clock_frame"
build_type = PROTOLATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/wallframe/time_clock
- category = list(RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS)
+ category = list(
+ RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
+ )
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SERVICE
/datum/design/vox_gas_filter
name = "Vox Gas Filter"
id = "vox_gas_filter"
build_type = PROTOLATHE | AUTOLATHE | COLONY_FABRICATOR
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/gas_filter/vox
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GAS_TANKS_EQUIPMENT
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GAS_TANKS_EQUIPMENT,
)
departmental_flags = ALL
diff --git a/modular_skyrat/modules/advanced_engineering/code/adv_engineering.dm b/modular_skyrat/modules/advanced_engineering/code/adv_engineering.dm
index df38f143995..8218fc93be9 100644
--- a/modular_skyrat/modules/advanced_engineering/code/adv_engineering.dm
+++ b/modular_skyrat/modules/advanced_engineering/code/adv_engineering.dm
@@ -31,7 +31,10 @@
name = "industrial RCD matter cartridge"
desc = "A cartridge with one complete refill for an industrial RCD."
w_class = WEIGHT_CLASS_SMALL
- custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 60, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 40)
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 60,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 40,
+ )
ammoamt = 440
/obj/item/storage/box/rcd_ammo
@@ -40,7 +43,9 @@
desc = "A durable box with refill cartridges for an industrial RCD."
icon_state = "engibox"
illustration = "rcd"
- custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ )
/obj/item/storage/box/rcd_ammo/PopulateContents()
for(var/i in 1 to 4)
diff --git a/modular_skyrat/modules/ammo_workbench/code/design_disks.dm b/modular_skyrat/modules/ammo_workbench/code/design_disks.dm
index 26e6302c6da..1b3f831c001 100644
--- a/modular_skyrat/modules/ammo_workbench/code/design_disks.dm
+++ b/modular_skyrat/modules/ammo_workbench/code/design_disks.dm
@@ -20,7 +20,11 @@
name = "Ammo Workbench Advanced Munitions Datadisk"
id = "ammoworkbench_disk_lethal"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT
+ )
build_path = /obj/item/disk/ammo_workbench/advanced
- category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SECURITY)
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SECURITY,
+ )
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
diff --git a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/area.dm b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/area.dm
new file mode 100644
index 00000000000..cbdd79dc25d
--- /dev/null
+++ b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/area.dm
@@ -0,0 +1,72 @@
+/area/virtual_domain/ancient_milsim
+ name = "intro_2" // see fluff.dm, line 18; shouldn't really be used
+ icon = 'icons/area/areas_away_missions.dmi'
+ icon_state = "unknown"
+
+/area/virtual_domain/ancient_milsim/entrance
+ name = "'Time Of Valor 2' Entrance Area" // The most generic FPS title I could think of.
+ icon_state = "awaycontent1"
+
+/area/virtual_domain/ancient_milsim/janitor
+ name = "'Time Of Valor 2' Janitor's Closet"
+ icon_state = "awaycontent2"
+
+/area/virtual_domain/ancient_milsim/medbay
+ name = "'Time Of Valor 2' Medbay"
+ icon_state = "awaycontent3"
+
+/area/virtual_domain/ancient_milsim/atrium
+ name = "'Time Of Valor 2' Atrium"
+ icon_state = "awaycontent4"
+
+/area/virtual_domain/ancient_milsim/hallway
+ name = "'Time Of Valor 2' Hallway"
+ icon_state = "awaycontent5"
+
+/area/virtual_domain/ancient_milsim/maintenance
+ name = "'Time Of Valor 2' Maintenance Tunnel"
+ icon_state = "awaycontent7"
+
+/area/virtual_domain/ancient_milsim/loot_camp
+ name = "'Time Of Valor 2' CIN Encampment"
+ icon_state = "awaycontent7"
+
+/area/virtual_domain/ancient_milsim/snpc_ground
+ name = "'Time Of Valor 2' SNPC Fighting Ground"
+ icon_state = "awaycontent8"
+
+/area/virtual_domain/ancient_milsim/carrier
+ name = "'Time Of Valor 2' Ruined APC"
+ icon_state = "awaycontent9"
+
+/area/virtual_domain/ancient_milsim/snpc_hallway
+ name = "'Time Of Valor 2' SNPC Base Hallway"
+ icon_state = "awaycontent10"
+
+/area/virtual_domain/ancient_milsim/snpc_bar
+ name = "'Time Of Valor 2' SNPC Base Bar"
+ icon_state = "awaycontent11"
+
+/area/virtual_domain/ancient_milsim/snpc_garage
+ name = "'Time Of Valor 2' SNPC Base Garage"
+ icon_state = "awaycontent12"
+
+/area/virtual_domain/ancient_milsim/snpc_cafe
+ name = "'Time Of Valor 2' SNPC Base Cafeteria"
+ icon_state = "awaycontent13"
+
+/area/virtual_domain/ancient_milsim/snpc_toilet
+ name = "'Time Of Valor 2' SNPC Base Restroom"
+ icon_state = "awaycontent14"
+
+/area/virtual_domain/ancient_milsim/snpc_cave
+ name = "'Time Of Valor 2' SNPC Base Maintenance Cave"
+ icon_state = "awaycontent15"
+
+/area/virtual_domain/ancient_milsim/snpc_reward
+ name = "'Time Of Valor 2' SNPC Base Reward Room"
+ icon_state = "awaycontent16"
+
+/area/virtual_domain/ancient_milsim/snpc_exit
+ name = "'Time Of Valor 2' SNPC Base Exit Tunnel"
+ icon_state = "awaycontent17"
diff --git a/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mapping_helpers.dm b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mapping_helpers.dm
new file mode 100644
index 00000000000..ac62cef3a12
--- /dev/null
+++ b/modular_skyrat/modules/bitrunning/code/virtual_domains/ancient_milsim/mapping_helpers.dm
@@ -0,0 +1,10 @@
+/obj/effect/baseturf_helper/virtual_domain/ancient_milsim
+ name = "virtual domain baseturf editor"
+ baseturf_to_replace = list(/turf/open/space,
+ /turf/baseturf_bottom,
+ /turf/open/misc/ashplanet/wateryrock,
+ /turf/open/floor/plating,
+ /turf/open/misc/dirt/planet,
+ /turf/open/misc/sandy_dirt/planet,
+ /turf/open/chasm/lavaland,
+ )
diff --git a/modular_skyrat/modules/borg_buffs/code/robot.dm b/modular_skyrat/modules/borg_buffs/code/robot.dm
index 8a2dfb110c8..99a6ec69596 100644
--- a/modular_skyrat/modules/borg_buffs/code/robot.dm
+++ b/modular_skyrat/modules/borg_buffs/code/robot.dm
@@ -215,9 +215,13 @@
id = "borg_upgrade_brush"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/wirebrush
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2
+ )
construction_time = 40
- category = list(RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR)
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR,
+ )
/obj/item/borg/upgrade/wirebrush
name = "janitor cyborg wire-brush"
diff --git a/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm b/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm
index 48db5b6cdd0..fe34135c88d 100644
--- a/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm
+++ b/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm
@@ -3,9 +3,14 @@
id = "borg_upgrade_snacks"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/snack_dispenser
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ )
construction_time = 1 SECONDS
- category = list(RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL)
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL,
+ )
/obj/item/borg/upgrade/snack_dispenser
name = "Snack Dispenser Module"
diff --git a/modular_skyrat/modules/borgs/code/mechafabricator_designs.dm b/modular_skyrat/modules/borgs/code/mechafabricator_designs.dm
index a8d8c0046ff..6c42e1c4d9e 100644
--- a/modular_skyrat/modules/borgs/code/mechafabricator_designs.dm
+++ b/modular_skyrat/modules/borgs/code/mechafabricator_designs.dm
@@ -3,27 +3,47 @@
id = "borg_upgrade_shrink"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/shrink
- materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 10, /datum/material/glass=SHEET_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 10,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 4,
+ )
construction_time = 120
- category = list(RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL)
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL,
+ )
/datum/design/borg_upgrade_surgicaltools
name = "Advanced Surgical Tools Module"
id = "borg_upgrade_surgicaltools"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/surgerytools
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 3, /datum/material/gold = SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT, /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4, /datum/material/plasma = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = SMALL_MATERIAL_AMOUNT,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 4,
+ /datum/material/plasma = SHEET_MATERIAL_AMOUNT,
+ )
construction_time = 80
- category = list(RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL)
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MEDICAL,
+ )
/datum/design/affection_module
name = "Affection Module"
id = "affection_module"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/affectionmodule
- materials = list(/datum/material/iron=HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass=HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ )
construction_time = 40
- category = list(RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL)
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL,
+ )
/datum/design/advanced_materials
name = "Advanced Materials Module"
@@ -37,7 +57,9 @@
/datum/material/glass=SHEET_MATERIAL_AMOUNT * 5,
/datum/material/plasma=SHEET_MATERIAL_AMOUNT * 3,
)
- category = list(RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ENGINEERING)
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ENGINEERING,
+ )
/datum/design/inducer_upgrade
name = "Inducer Module"
@@ -50,16 +72,24 @@
/datum/material/gold=SHEET_MATERIAL_AMOUNT * 2,
/datum/material/plasma=SHEET_MATERIAL_AMOUNT,
)
- category = list(RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ENGINEERING)
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ENGINEERING,
+ )
/datum/design/borg_shapeshifter_module
name = "Shapeshifting Module"
id = "borg_shapeshifter_module"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/borg_shapeshifter
- materials = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT * 5, /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 5, /datum/material/diamond = SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/diamond = SHEET_MATERIAL_AMOUNT * 2,
+ )
construction_time = 120
- category = list(RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL)
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_ALL,
+ )
/datum/design/borg_upgrade_welding
name = "Welding Module"
@@ -71,7 +101,9 @@
/datum/material/iron=SHEET_MATERIAL_AMOUNT * 5,
/datum/material/plasma=SHEET_MATERIAL_AMOUNT * 1,
)
- category = list(RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MINING)
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_MINING,
+ )
//Cyborg Skyrat overrides
/datum/design/borg_suit
@@ -79,10 +111,12 @@
id = "borg_suit"
build_type = MECHFAB
build_path = /obj/item/robot_suit
- materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
+ )
construction_time = 8 SECONDS
category = list(
- RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS
+ RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS,
)
/datum/design/borg_chest
@@ -90,10 +124,12 @@
id = "borg_chest"
build_type = MECHFAB
build_path = /obj/item/bodypart/chest/robot
- materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT * 8)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 8,
+ )
construction_time = 12 SECONDS
category = list(
- RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS
+ RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS,
)
/datum/design/borg_head
@@ -101,10 +137,12 @@
id = "borg_head"
build_type = MECHFAB
build_path = /obj/item/bodypart/head/robot
- materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ )
construction_time = 4 SECONDS
category = list(
- RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS
+ RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS,
)
/datum/design/borg_l_arm
@@ -112,10 +150,12 @@
id = "borg_l_arm"
build_type = MECHFAB
build_path = /obj/item/bodypart/arm/left/robot
- materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ )
construction_time = 8 SECONDS
category = list(
- RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS
+ RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS,
)
/datum/design/borg_r_arm
@@ -123,10 +163,12 @@
id = "borg_r_arm"
build_type = MECHFAB
build_path = /obj/item/bodypart/arm/right/robot
- materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ )
construction_time = 8 SECONDS
category = list(
- RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS
+ RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS,
)
/datum/design/borg_l_leg
@@ -134,10 +176,12 @@
id = "borg_l_leg"
build_type = MECHFAB
build_path = /obj/item/bodypart/leg/left/robot
- materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ )
construction_time = 8 SECONDS
category = list(
- RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS
+ RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS,
)
/datum/design/borg_r_leg
@@ -145,8 +189,10 @@
id = "borg_r_leg"
build_type = MECHFAB
build_path = /obj/item/bodypart/leg/right/robot
- materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ )
construction_time = 8 SECONDS
category = list(
- RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS
+ RND_CATEGORY_MECHFAB_CYBORG + RND_SUBCATEGORY_MECHFAB_CYBORG_CHASSIS,
)
diff --git a/modular_skyrat/modules/borgs/code/robot_upgrade.dm b/modular_skyrat/modules/borgs/code/robot_upgrade.dm
index f7bd0983140..a032de3415f 100644
--- a/modular_skyrat/modules/borgs/code/robot_upgrade.dm
+++ b/modular_skyrat/modules/borgs/code/robot_upgrade.dm
@@ -243,9 +243,15 @@
id = "borg_upgrade_clamp"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/better_clamp
- materials = list(/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 2, /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
+ )
construction_time = 12 SECONDS
- category = list(RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_CARGO)
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_CARGO,
+ )
/obj/item/borg/upgrade/better_clamp
diff --git a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm
index 4c0c96f0491..c5e0916f5e9 100644
--- a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm
+++ b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm
@@ -74,8 +74,14 @@ GLOBAL_LIST_EMPTY(cargo_marks)
id = "cargotele"
build_type = PROTOLATHE | AWAY_LATHE
build_path = /obj/item/cargo_teleporter
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 5, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 5)
- category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO,
+ )
departmental_flags = DEPARTMENT_BITFLAG_CARGO
/datum/techweb_node/cargo_teleporter
diff --git a/modular_skyrat/modules/cellguns/code/medigun_research.dm b/modular_skyrat/modules/cellguns/code/medigun_research.dm
index 3971455e44e..f7e6030cbbd 100644
--- a/modular_skyrat/modules/cellguns/code/medigun_research.dm
+++ b/modular_skyrat/modules/cellguns/code/medigun_research.dm
@@ -8,8 +8,15 @@
id = "medigun_speed"
build_type = PROTOLATHE | AWAY_LATHE
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
- category = list(RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL)
- materials = list(/datum/material/uranium = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2, /datum/material/plasma = SHEET_MATERIAL_AMOUNT, /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/plasma = SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
+ )
build_path = /obj/item/device/custom_kit/medigun_fastcharge
/datum/design/medicell
@@ -17,7 +24,9 @@
desc = "Hey, you shouldn't see this. Like... at all."
build_type = PROTOLATHE | AWAY_LATHE
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
- category = list(RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_MEDICALAMMO)
+ category = list(
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_MEDICALAMMO,
+ )
//Tier 2 Medicells//
@@ -25,28 +34,52 @@
name = "Brute II Medicell"
desc = "Gives cell-loaded mediguns improved brute damage healing functionality."
id = "brute2medicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/weaponcell/medical/brute/tier_2
/datum/design/medicell/burn2
name = "Burn II Medicell"
desc = "Gives cell-loaded mediguns improved burn damage healing functionality."
id = "burn2medicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/weaponcell/medical/burn/tier_2
/datum/design/medicell/toxin2
name = "Toxin II Medicell"
desc = "Gives cell-loaded mediguns improved toxin damage healing functionality."
id = "toxin2medicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/weaponcell/medical/toxin/tier_2
/datum/design/medicell/oxy2
name = "Oxygen II Medicell"
desc = "Gives cell-loaded mediguns improved oxygen deprivation healing functionality."
id = "oxy2medicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/weaponcell/medical/oxygen/tier_2
//Tier 3 Medicells//
@@ -55,81 +88,157 @@
name = "Brute III Medicell"
desc = "Gives cell-loaded mediguns advanced brute damage healing functionality."
id = "brute3medicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/weaponcell/medical/brute/tier_3
/datum/design/medicell/burn3
name = "Burn III Medicell"
desc = "Gives cell-loaded mediguns advanced burn damage healing functionality."
id = "burn3medicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/weaponcell/medical/burn/tier_3
/datum/design/medicell/toxin3
name = "Toxin III Medicell"
desc = "Gives cell-loaded mediguns advanced toxin damage healing functionality."
id = "toxin3medicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/weaponcell/medical/toxin/tier_3
/datum/design/medicell/oxy3
name = "Oxygen III Medicell"
desc = "Gives cell-loaded mediguns advanced oxygen deprivation healing functionality."
id = "oxy3medicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/weaponcell/medical/oxygen/tier_3
//Utility Medicells
/datum/design/medicell/utility
name = "Utility Medicell"
- category = list(RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_MEDICALAMMO + RND_MEDICALAMMO_UTILITY)
+ category = list(
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_MEDICALAMMO + RND_MEDICALAMMO_UTILITY,
+ )
/datum/design/medicell/utility/clot
name = "Clotting Medicell"
desc = "Gives cell-loaded mediguns projectile-based coagulation functionality."
id = "clotmedicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/weaponcell/medical/utility/clotting
/datum/design/medicell/utility/temp
name = "Temperature Adjustment Medicell"
desc = "Gives cell loaded-mediguns projectile-based body temperature regulation functionality."
id = "tempmedicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/weaponcell/medical/utility/temperature
/datum/design/medicell/utility/gown
name = "Hardlight Gown Medicell"
desc = "Gives cell-loaded mediguns projectile-based hardlight gown deployment functionality."
id = "gownmedicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/weaponcell/medical/utility/hardlight_gown
/datum/design/medicell/utility/bed
name = "Hardlight Roller Bed Medicell"
desc = "Gives cell-loaded mediguns projectile-based hardlight roller bed deployment functionality. Best used on already-horizontal patients."
id = "bedmedicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SHEET_MATERIAL_AMOUNT, /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/weaponcell/medical/utility/bed
/datum/design/medicell/utility/salve
name = "Empty Salve Medicell"
desc = "An incomplete medicell that requires a leaf of aloe to fully realize its potential to provide projectile-embedding-based healing-over-time functionality."
id = "salvemedicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/device/custom_kit/empty_cell
/datum/design/medicell/utility/body
name = "Empty Body Teleporter Medicell"
desc = "An incomplete medicell that requires a bluespace slime extract in order to provide projectile-based corpse retrieval functionality."
id = "bodymedicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SHEET_MATERIAL_AMOUNT, /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/bluespace = SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/device/custom_kit/empty_cell/body_teleporter
/datum/design/medicell/utility/relocation
name = "Oppressive Force Relocation Medicell"
desc = "Gives cell-loaded mediguns projectile-based rubbernecker relocation functionality, by dumping them into the Medbay lobby via eigenstate manipulation. Only works in Medbay when fired by authorized users."
id = "relocatemedicell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SHEET_MATERIAL_AMOUNT, /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/bluespace = SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/device/custom_kit/empty_cell/relocator
diff --git a/modular_skyrat/modules/colony_fabricator/code/appliances/chem_machines.dm b/modular_skyrat/modules/colony_fabricator/code/appliances/chem_machines.dm
index 988e335fff7..e9decad80a3 100644
--- a/modular_skyrat/modules/colony_fabricator/code/appliances/chem_machines.dm
+++ b/modular_skyrat/modules/colony_fabricator/code/appliances/chem_machines.dm
@@ -27,3 +27,105 @@
w_class = WEIGHT_CLASS_NORMAL
type_to_deploy = /obj/machinery/plumbing/synthesizer/water_synth
deploy_time = 2 SECONDS
+
+// Machine that makes botany nutrients for hydroponics farming
+
+/obj/machinery/plumbing/synthesizer/colony_hydroponics
+ name = "hydroponics chemical synthesizer"
+ desc = "An infinitely useful device for those finding themselves in a frontier without a stable source of nutrients for crops. \
+ Using a simplified version of the chemistry dispenser's synthesizer process, it can create hydroponics nutrients out of nothing \
+ but good old electricity."
+ icon = 'modular_skyrat/modules/colony_fabricator/icons/chemistry_machines.dmi'
+ icon_state = "hydro_synth"
+ anchored = FALSE
+ /// Reagents that this can dispense, overrides the default list on init
+ var/static/list/synthesizable_reagents = list(
+ /datum/reagent/plantnutriment/eznutriment,
+ /datum/reagent/plantnutriment/left4zednutriment,
+ /datum/reagent/plantnutriment/robustharvestnutriment,
+ /datum/reagent/plantnutriment/endurogrow,
+ /datum/reagent/plantnutriment/liquidearthquake,
+ /datum/reagent/toxin/plantbgone/weedkiller,
+ /datum/reagent/toxin/pestkiller,
+ )
+
+/obj/machinery/plumbing/synthesizer/colony_hydroponics/Initialize(mapload, bolt, layer)
+ . = ..()
+ dispensable_reagents = synthesizable_reagents
+ AddElement(/datum/element/manufacturer_examine, COMPANY_FRONTIER)
+
+// Deployable item for cargo for the hydro synth
+
+/obj/item/flatpacked_machine/hydro_synth
+ name = "hydroponics chemical synthesizer parts kit"
+ icon = 'modular_skyrat/modules/colony_fabricator/icons/chemistry_machines.dmi'
+ icon_state = "hydro_synth_parts"
+ w_class = WEIGHT_CLASS_NORMAL
+ type_to_deploy = /obj/machinery/plumbing/synthesizer/colony_hydroponics
+ deploy_time = 2 SECONDS
+
+// Chem dispenser with a limited range of thematic reagents to dispense
+
+/obj/machinery/chem_dispenser/frontier_appliance
+ name = "sustenance dispenser"
+ desc = "Creates and dispenses a small pre-defined set of chemicals and other liquids for the convenience of those typically on the frontier. \
+ While the machine is loved by many, it also has a reputation for making some of the worst coffees this side of the galaxy. Use at your own risk."
+ icon = 'modular_skyrat/modules/colony_fabricator/icons/chemistry_machines.dmi'
+ icon_state = "dispenser"
+ base_icon_state = "dispenser"
+ pass_flags = PASSTABLE
+ anchored_tabletop_offset = 4
+ anchored = FALSE
+ circuit = null
+ powerefficiency = 0.5
+ recharge_amount = 50
+ show_ph = FALSE
+ base_reagent_purity = 0.5
+ // God's strongest coffee machine
+ dispensable_reagents = list(
+ /datum/reagent/water,
+ /datum/reagent/consumable/powdered_milk,
+ /datum/reagent/consumable/sugar,
+ /datum/reagent/consumable/powdered_lemonade,
+ /datum/reagent/consumable/powdered_coco,
+ /datum/reagent/consumable/powdered_coffee,
+ /datum/reagent/consumable/powdered_tea,
+ /datum/reagent/consumable/vanilla,
+ /datum/reagent/consumable/caramel,
+ /datum/reagent/consumable/korta_nectar,
+ /datum/reagent/consumable/korta_milk,
+ /datum/reagent/consumable/astrotame,
+ /datum/reagent/consumable/salt,
+ /datum/reagent/consumable/blackpepper,
+ /datum/reagent/consumable/nutraslop,
+ /datum/reagent/consumable/enzyme,
+ )
+ /// Since we don't have a board to take from, we use this to give the dispenser a cell on spawning
+ var/cell_we_spawn_with = /obj/item/stock_parts/cell/crap/empty
+
+/obj/machinery/chem_dispenser/frontier_appliance/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/manufacturer_examine, COMPANY_FRONTIER)
+ cell = new cell_we_spawn_with(src)
+
+/obj/machinery/chem_dispenser/frontier_appliance/display_beaker()
+ var/mutable_appearance/overlayed_beaker = beaker_overlay || mutable_appearance(icon, "disp_beaker")
+ return overlayed_beaker
+
+/obj/machinery/chem_dispenser/frontier_appliance/RefreshParts()
+ . = ..()
+ powerefficiency = 0.5
+ recharge_amount = 50
+
+/obj/machinery/chem_dispenser/frontier_appliance/default_deconstruction_crowbar()
+ return
+
+// Deployable item for cargo for the sustenance machine
+
+/obj/item/flatpacked_machine/sustenance_machine
+ name = "sustenance dispenser parts kit"
+ icon = 'modular_skyrat/modules/colony_fabricator/icons/chemistry_machines.dmi'
+ icon_state = "dispenser_parts"
+ w_class = WEIGHT_CLASS_NORMAL
+ type_to_deploy = /obj/machinery/chem_dispenser/frontier_appliance
+ deploy_time = 2 SECONDS
diff --git a/modular_skyrat/modules/colony_fabricator/code/appliances/co2_cracker.dm b/modular_skyrat/modules/colony_fabricator/code/appliances/co2_cracker.dm
new file mode 100644
index 00000000000..5835e65318b
--- /dev/null
+++ b/modular_skyrat/modules/colony_fabricator/code/appliances/co2_cracker.dm
@@ -0,0 +1,118 @@
+// We can't just use electrolyzer reactions, because that'd let electrolyzers do co2 cracking
+
+GLOBAL_LIST_INIT(cracker_reactions, cracker_reactions_list())
+
+/// Global proc to build up the list of co2 cracker reactions
+/proc/cracker_reactions_list()
+ var/list/built_reaction_list = list()
+ for(var/reaction_path in subtypesof(/datum/cracker_reaction))
+ var/datum/cracker_reaction/reaction = new reaction_path()
+
+ built_reaction_list[reaction.id] = reaction
+
+ return built_reaction_list
+
+/datum/cracker_reaction
+ var/list/requirements
+ var/name = "reaction"
+ var/id = "r"
+ var/desc = ""
+ var/list/factor
+
+/// Called when the co2 cracker reaction is run, should be where the code for actually changing gasses around is run
+/datum/cracker_reaction/proc/react(turf/location, datum/gas_mixture/air_mixture, working_power)
+ return
+
+/// Checks if this reaction can actually be run
+/datum/cracker_reaction/proc/reaction_check(datum/gas_mixture/air_mixture)
+ var/temp = air_mixture.temperature
+ var/list/cached_gases = air_mixture.gases
+ if((requirements["MIN_TEMP"] && temp < requirements["MIN_TEMP"]) || (requirements["MAX_TEMP"] && temp > requirements["MAX_TEMP"]))
+ return FALSE
+ for(var/id in requirements)
+ if(id == "MIN_TEMP" || id == "MAX_TEMP")
+ continue
+ if(!cached_gases[id] || cached_gases[id][MOLES] < requirements[id])
+ return FALSE
+ return TRUE
+
+/datum/cracker_reaction/co2_cracking
+ name = "CO2 Cracking"
+ id = "co2_cracking"
+ desc = "Conversion of CO2 into equal amounts of O2"
+ requirements = list(
+ /datum/gas/carbon_dioxide = MINIMUM_MOLE_COUNT,
+ )
+ factor = list(
+ /datum/gas/carbon_dioxide = "1 mole of CO2 gets consumed",
+ /datum/gas/oxygen = "1 mole of O2 gets produced",
+ "Location" = "Can only happen on turfs with an active CO2 cracker.",
+ )
+
+/datum/cracker_reaction/co2_cracking/react(turf/location, datum/gas_mixture/air_mixture, working_power)
+ var/old_heat_capacity = air_mixture.heat_capacity()
+ air_mixture.assert_gases(/datum/gas/water_vapor, /datum/gas/oxygen)
+ var/proportion = min(air_mixture.gases[/datum/gas/carbon_dioxide][MOLES] * INVERSE(2), (2.5 * (working_power ** 2)))
+ air_mixture.gases[/datum/gas/carbon_dioxide][MOLES] -= proportion
+ air_mixture.gases[/datum/gas/oxygen][MOLES] += proportion
+ var/new_heat_capacity = air_mixture.heat_capacity()
+ if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ air_mixture.temperature = max(air_mixture.temperature * old_heat_capacity / new_heat_capacity, TCMB)
+
+// CO2 cracker machine itself
+
+/obj/machinery/electrolyzer/co2_cracker
+ name = "portable CO2 cracker"
+ desc = "A portable device that is the savior of many a colony on the frontier. Performing similarly to an electrolyzer, \
+ it takes in nearby gasses and breaks them into different gasses. The big draw of this one? It can crack carbon dioxide \
+ into breathable oxygen. Handy for places where CO2 is all too common, and oxygen is all too hard to find."
+ icon = 'modular_skyrat/modules/colony_fabricator/icons/portable_machines.dmi'
+ circuit = null
+ working_power = 1
+ /// Soundloop for while the thermomachine is turned on
+ var/datum/looping_sound/conditioner_running/soundloop
+
+/obj/machinery/electrolyzer/co2_cracker/Initialize(mapload)
+ . = ..()
+ soundloop = new(src, FALSE)
+ AddElement(/datum/element/manufacturer_examine, COMPANY_FRONTIER)
+
+/obj/machinery/electrolyzer/co2_cracker/process_atmos()
+ if(on && !soundloop.loop_started)
+ soundloop.start()
+ else if(soundloop.loop_started)
+ soundloop.stop()
+ return ..()
+
+/obj/machinery/electrolyzer/co2_cracker/call_reactions(datum/gas_mixture/env)
+ for(var/reaction in GLOB.cracker_reactions)
+ var/datum/cracker_reaction/current_reaction = GLOB.cracker_reactions[reaction]
+
+ if(!current_reaction.reaction_check(env))
+ continue
+
+ current_reaction.react(loc, env, working_power)
+
+ env.garbage_collect()
+
+/obj/machinery/electrolyzer/co2_cracker/RefreshParts()
+ . = ..()
+ working_power = 2
+ efficiency = 1
+
+/obj/machinery/electrolyzer/co2_cracker/crowbar_act(mob/living/user, obj/item/tool)
+ return
+
+// "parts kit" for buying these from cargo
+
+/obj/item/flatpacked_machine/co2_cracker
+ name = "CO2 cracker parts kit"
+ icon = 'modular_skyrat/modules/colony_fabricator/icons/parts_kits.dmi'
+ icon_state = "co2_cracker"
+ type_to_deploy = /obj/machinery/electrolyzer/co2_cracker
+ deploy_time = 2 SECONDS
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 7.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT, // We're gonna pretend plasma is the catalyst for co2 cracking
+ )
diff --git a/modular_skyrat/modules/colony_fabricator/code/appliances/foodricator.dm b/modular_skyrat/modules/colony_fabricator/code/appliances/foodricator.dm
new file mode 100644
index 00000000000..780979a60ce
--- /dev/null
+++ b/modular_skyrat/modules/colony_fabricator/code/appliances/foodricator.dm
@@ -0,0 +1,46 @@
+/obj/machinery/biogenerator/foodricator
+ name = "organic rations printer"
+ desc = "An advanced machine seen in frontier outposts and colonies capable of turning organic plant matter into \
+ various foods or ingredients. The best friend of a chef where deliveries are inconsistent or simply don't exist. \
+ Some of those that consume the food from this complain that the foods it makes have poor taste, though they must \
+ not appreciate being able to eat steak and eggs for breakfast with a lack of any livestock at all in the colony."
+ icon = 'modular_skyrat/modules/colony_fabricator/icons/foodricator.dmi'
+ circuit = null
+ anchored = FALSE
+ pass_flags = PASSTABLE
+ efficiency = 1
+ productivity = 2.5
+ anchored_tabletop_offset = 8
+ show_categories = list(
+ RND_CATEGORY_AKHTER_FOODRICATOR_INGREDIENTS,
+ RND_CATEGORY_AKHTER_FOODRICATOR_BAGS,
+ RND_CATEGORY_AKHTER_FOODRICATOR_SNACKS,
+ RND_CATEGORY_AKHTER_FOODRICATOR_UTENSILS,
+ RND_CATEGORY_AKHTER_SEEDS,
+ )
+
+/obj/machinery/biogenerator/foodricator/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/manufacturer_examine, COMPANY_FRONTIER)
+
+/obj/machinery/biogenerator/foodricator/RefreshParts()
+ . = ..()
+ efficiency = 1
+ productivity = 3
+
+/obj/machinery/biogenerator/foodricator/default_deconstruction_crowbar()
+ return
+
+// Deployable item for cargo for the rations printer
+
+/obj/item/flatpacked_machine/organics_ration_printer
+ name = "organic rations printer parts kit"
+ icon = 'modular_skyrat/modules/colony_fabricator/icons/foodricator.dmi'
+ icon_state = "biogenerator_parts"
+ type_to_deploy = /obj/machinery/biogenerator/foodricator
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ )
diff --git a/modular_skyrat/modules/colony_fabricator/code/appliances/recycler.dm b/modular_skyrat/modules/colony_fabricator/code/appliances/recycler.dm
new file mode 100644
index 00000000000..1dca7c330c6
--- /dev/null
+++ b/modular_skyrat/modules/colony_fabricator/code/appliances/recycler.dm
@@ -0,0 +1,81 @@
+/obj/machinery/colony_recycler
+ name = "materials recycler"
+ desc = "A large crushing machine used to recycle small items inefficiently. Items are inserted by hand, rather than by belt. \
+ Mind your fingers."
+ icon = 'modular_skyrat/modules/colony_fabricator/icons/portable_machines.dmi'
+ icon_state = "recycler"
+ anchored = FALSE
+ density = TRUE
+ circuit = null
+ /// The percentage of materials returned
+ var/amount_produced = 80
+ /// The sound made when an item is eaten
+ var/item_recycle_sound = 'modular_skyrat/modules/reagent_forging/sound/forge.ogg'
+ /// The recycler's internal materials storage, for when items recycled don't produce enough to make a full sheet of that material
+ var/datum/component/material_container/materials
+ /// The list of all the materials we can recycle
+ var/static/list/allowed_materials = list(
+ /datum/material/iron,
+ /datum/material/glass,
+ /datum/material/silver,
+ /datum/material/plasma,
+ /datum/material/gold,
+ /datum/material/diamond,
+ /datum/material/plastic,
+ /datum/material/uranium,
+ /datum/material/bananium,
+ /datum/material/titanium,
+ /datum/material/bluespace,
+ )
+ /// The item we turn into when repacked
+ var/repacked_type = /obj/item/flatpacked_machine/recycler
+
+/obj/machinery/colony_recycler/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/repackable, repacked_type, 5 SECONDS)
+ AddElement(/datum/element/manufacturer_examine, COMPANY_FRONTIER)
+ materials = AddComponent( \
+ /datum/component/material_container, \
+ allowed_materials, \
+ INFINITY, \
+ MATCONTAINER_EXAMINE, \
+ container_signals = list(COMSIG_MATCONTAINER_ITEM_CONSUMED = TYPE_PROC_REF(/obj/machinery/colony_recycler, has_eaten_materials)), \
+ )
+
+/obj/machinery/colony_recycler/Destroy()
+ materials = null
+ return ..()
+
+/obj/machinery/colony_recycler/examine(mob/user)
+ . = ..()
+ . += span_notice("Reclaiming [amount_produced]% of materials salvaged.")
+ . += span_notice("Can be secured with a wrench using Right-Click.")
+
+/obj/machinery/colony_recycler/wrench_act_secondary(mob/living/user, obj/item/tool)
+ default_unfasten_wrench(user, tool)
+ return ITEM_INTERACT_SUCCESS
+
+/// Proc called when the recycler eats new materials, checks if we should spit out new material sheets
+/obj/machinery/colony_recycler/proc/has_eaten_materials(container, obj/item/item_inserted, last_inserted_id, mats_consumed, amount_inserted, atom/context)
+ SIGNAL_HANDLER
+
+ flick("recycler_grind", src)
+ playsound(src, item_recycle_sound, 50, TRUE)
+ use_power(min(active_power_usage * 0.25, amount_inserted / 100))
+
+ if(amount_inserted)
+ materials.retrieve_all(drop_location())
+
+// "parts kit" for buying these from cargo
+
+/obj/item/flatpacked_machine/recycler
+ name = "recycler parts kit"
+ icon = 'modular_skyrat/modules/colony_fabricator/icons/parts_kits.dmi'
+ icon_state = "recycler"
+ type_to_deploy = /obj/machinery/colony_recycler
+ deploy_time = 2 SECONDS
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 7.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT, // Titan for the crushing element
+ )
diff --git a/modular_skyrat/modules/colony_fabricator/code/appliances/wind_turbine.dm b/modular_skyrat/modules/colony_fabricator/code/appliances/wind_turbine.dm
index 41bfdeb7448..29cf41d4299 100644
--- a/modular_skyrat/modules/colony_fabricator/code/appliances/wind_turbine.dm
+++ b/modular_skyrat/modules/colony_fabricator/code/appliances/wind_turbine.dm
@@ -29,6 +29,7 @@
. = ..()
AddElement(/datum/element/repackable, undeploy_type, 2 SECONDS)
AddElement(/datum/element/manufacturer_examine, COMPANY_FRONTIER)
+ connect_to_network()
/obj/machinery/power/colony_wind_turbine/examine(mob/user)
. = ..()
diff --git a/modular_skyrat/modules/colony_fabricator/code/design_datums/appliances.dm b/modular_skyrat/modules/colony_fabricator/code/design_datums/appliances.dm
index acd6182f3f1..8a4a70f318f 100644
--- a/modular_skyrat/modules/colony_fabricator/code/design_datums/appliances.dm
+++ b/modular_skyrat/modules/colony_fabricator/code/design_datums/appliances.dm
@@ -4,6 +4,8 @@
#define FABRICATOR_SUBCATEGORY_POWER "/Power"
#define FABRICATOR_SUBCATEGORY_ATMOS "/Atmospherics"
#define FABRICATOR_SUBCATEGORY_FLUIDS "/Liquids"
+#define FABRICATOR_SUBCATEGORY_MATERIALS "/Materials"
+#define FABRICATOR_SUBCATEGORY_SUSTENANCE "/Sustenance"
// Techweb node that shouldnt show up anywhere ever specifically for the fabricator to work with
@@ -18,6 +20,11 @@
"survival_knife", // I just don't want to make a whole new node for this one sorry
"soup_pot", // This one too
"water_synth",
+ "hydro_synth",
+ "frontier_sustenance_dispenser",
+ "co2_cracker",
+ "portable_recycler",
+ "foodricator",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000000000000000) // God save you
hidden = TRUE
@@ -90,7 +97,99 @@
)
construction_time = 10 SECONDS
+// Plumbable chem machine that makes nothing but water
+
+/datum/design/hydro_synthesizer
+ name = "Hydroponics Chemical Synthesizer"
+ id = "hydro_synth"
+ build_type = COLONY_FABRICATOR
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/machinery/plumbing/synthesizer/colony_hydroponics
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_CATEGORY_APPLIANCES + FABRICATOR_SUBCATEGORY_FLUIDS,
+ )
+ construction_time = 10 SECONDS
+
+// Chem dispenser that dispenses various flavored beverages and nutrislop, yum!
+
+/datum/design/frontier_sustenance_dispenser
+ name = "Sustenance Dispenser"
+ id = "frontier_sustenance_dispenser"
+ build_type = COLONY_FABRICATOR
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ /datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/machinery/chem_dispenser/frontier_appliance
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_CATEGORY_APPLIANCES + FABRICATOR_SUBCATEGORY_SUSTENANCE,
+ )
+ construction_time = 30 SECONDS
+
+// CO2 cracker, portable machines that takes CO2 and turns it into oxygen
+
+/datum/design/co2_cracker
+ name = "Portable Carbon Dioxide Cracker"
+ id = "co2_cracker"
+ build_type = COLONY_FABRICATOR
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 7.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT, // We're gonna pretend plasma is the catalyst for co2 cracking
+ )
+ build_path = /obj/machinery/electrolyzer/co2_cracker
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_CATEGORY_APPLIANCES + FABRICATOR_SUBCATEGORY_ATMOS,
+ )
+ construction_time = 30 SECONDS
+
+// A portable recycling machine, use item with materials on it to recycle
+
+/datum/design/portable_recycler
+ name = "Portable Recycler"
+ id = "portable_recycler"
+ build_type = COLONY_FABRICATOR
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 7.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT, // Titan for the crushing element
+ )
+ build_path = /obj/machinery/colony_recycler
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_CATEGORY_APPLIANCES + FABRICATOR_SUBCATEGORY_MATERIALS,
+ )
+ construction_time = 30 SECONDS
+
+// Rations printer, turns biomass into seeds, some synthesized foods, ingredients, so on
+
+/datum/design/foodricator
+ name = "Organic Rations Printer"
+ id = "foodricator"
+ build_type = COLONY_FABRICATOR
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/flatpacked_machine/organics_ration_printer
+ category = list(
+ RND_CATEGORY_INITIAL,
+ FABRICATOR_CATEGORY_APPLIANCES + FABRICATOR_SUBCATEGORY_SUSTENANCE,
+ )
+ construction_time = 30 SECONDS
+
#undef FABRICATOR_CATEGORY_APPLIANCES
#undef FABRICATOR_SUBCATEGORY_POWER
#undef FABRICATOR_SUBCATEGORY_ATMOS
#undef FABRICATOR_SUBCATEGORY_FLUIDS
+#undef FABRICATOR_SUBCATEGORY_MATERIALS
+#undef FABRICATOR_SUBCATEGORY_SUSTENANCE
diff --git a/modular_skyrat/modules/colony_fabricator/code/design_datums/construction.dm b/modular_skyrat/modules/colony_fabricator/code/design_datums/construction.dm
index 933a067d7a2..7e5e608aca3 100644
--- a/modular_skyrat/modules/colony_fabricator/code/design_datums/construction.dm
+++ b/modular_skyrat/modules/colony_fabricator/code/design_datums/construction.dm
@@ -112,7 +112,7 @@
build_type = COLONY_FABRICATOR
materials = list(
/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5,
- /datum/material/glass = SHEET_MATERIAL_AMOUNT * 5
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 5,
)
build_path = /obj/item/stack/sheet/plastic_wall_panel/ten
category = list(
diff --git a/modular_skyrat/modules/colony_fabricator/code/design_datums/equipment.dm b/modular_skyrat/modules/colony_fabricator/code/design_datums/equipment.dm
index 1740162cbf4..067b0084046 100644
--- a/modular_skyrat/modules/colony_fabricator/code/design_datums/equipment.dm
+++ b/modular_skyrat/modules/colony_fabricator/code/design_datums/equipment.dm
@@ -3,7 +3,7 @@
id = "survival_knife"
build_type = COLONY_FABRICATOR
materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT * 6
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 6,
)
build_path = /obj/item/knife/combat/survival
category = list(
@@ -17,7 +17,7 @@
id = "soup_pot"
build_type = COLONY_FABRICATOR
materials = list(
- /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5,
)
build_path = /obj/item/reagent_containers/cup/soup_pot
category = list(
diff --git a/modular_skyrat/modules/colony_fabricator/code/design_datums/fabricator_flag_additions/machine_boards.dm b/modular_skyrat/modules/colony_fabricator/code/design_datums/fabricator_flag_additions/machine_boards.dm
index e076743df4b..47560f14e6a 100644
--- a/modular_skyrat/modules/colony_fabricator/code/design_datums/fabricator_flag_additions/machine_boards.dm
+++ b/modular_skyrat/modules/colony_fabricator/code/design_datums/fabricator_flag_additions/machine_boards.dm
@@ -14,10 +14,6 @@
. = ..()
build_type |= COLONY_FABRICATOR
-/datum/design/board/recycler/New()
- . = ..()
- build_type |= COLONY_FABRICATOR
-
/datum/design/board/suit_storage_unit/New()
. = ..()
build_type |= COLONY_FABRICATOR
@@ -34,10 +30,6 @@
. = ..()
build_type |= COLONY_FABRICATOR
-/datum/design/board/biogenerator/New()
- . = ..()
- build_type |= COLONY_FABRICATOR
-
// Turbine Stuff
/datum/design/board/turbine_computer/New()
@@ -60,10 +52,10 @@
. = ..()
build_type |= COLONY_FABRICATOR
-/datum/design/turbine_part_rotor/New()
- . = ..()
- build_type |= COLONY_FABRICATOR
-
/datum/design/turbine_part_stator/New()
. = ..()
build_type |= COLONY_FABRICATOR
+
+/datum/design/turbine_part_rotor/New()
+ . = ..()
+ build_type |= COLONY_FABRICATOR
diff --git a/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/ingredients.dm b/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/ingredients.dm
new file mode 100644
index 00000000000..3c7b6e8d39a
--- /dev/null
+++ b/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/ingredients.dm
@@ -0,0 +1,65 @@
+/datum/design/frontier_ration_egg
+ name = "Egg"
+ id = "frontier_ration_egg"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/food/egg
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_INGREDIENTS,
+ )
+
+/datum/design/frontier_ration_chicken
+ name = "Chicken"
+ id = "frontier_ration_chicken"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 50)
+ build_path = /obj/item/food/meat/slab/chicken
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_INGREDIENTS,
+ )
+
+/datum/design/frontier_ration_mystery_meat
+ name = "Meat Product"
+ id = "frontier_ration_mystery_meat"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 50)
+ build_path = /obj/item/food/meat/slab/meatproduct
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_INGREDIENTS,
+ )
+
+/datum/design/frontier_ration_butter
+ name = "Butter"
+ id = "frontier_ration_butter"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/food/butter
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_INGREDIENTS,
+ )
+
+/datum/design/frontier_ration_cheese
+ name = "Cheese"
+ id = "frontier_ration_cheese"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/food/cheese/wedge
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_INGREDIENTS,
+ )
+
+/datum/design/frontier_ration_cheese_firm
+ name = "Firm Cheese"
+ id = "frontier_ration_firm_cheese"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/food/cheese/firm_cheese_slice
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_INGREDIENTS,
+ )
diff --git a/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/reagents.dm b/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/reagents.dm
new file mode 100644
index 00000000000..64134e7f67f
--- /dev/null
+++ b/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/reagents.dm
@@ -0,0 +1,65 @@
+/datum/design/frontier_ration_flour
+ name = "Flour Sack"
+ id = "frontier_ration_flour_sack"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 100)
+ build_path = /obj/item/reagent_containers/condiment/flour/small_ration
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_BAGS,
+ )
+
+/datum/design/frontier_ration_flour_korta
+ name = "Korta Flour Sack"
+ id = "frontier_ration_flour_sack_korta"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 100)
+ build_path = /obj/item/reagent_containers/condiment/small_ration_korta_flour
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_BAGS,
+ )
+
+/datum/design/frontier_ration_rice
+ name = "Rice Sack"
+ id = "frontier_ration_rice_sack"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 100)
+ build_path = /obj/item/reagent_containers/condiment/rice/small_ration
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_BAGS,
+ )
+
+/datum/design/frontier_ration_sugar
+ name = "Sugar Sack"
+ id = "frontier_ration_sugar_sack"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 100)
+ build_path = /obj/item/reagent_containers/condiment/sugar/small_ration
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_BAGS,
+ )
+
+/datum/design/frontier_ration_soy_milk
+ name = "Soy Milk"
+ id = "frontier_ration_soy_milk_cart"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 100)
+ build_path = /obj/item/reagent_containers/condiment/soymilk/small_ration
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_BAGS,
+ )
+
+/datum/design/frontier_ration_milk
+ name = "Milk"
+ id = "frontier_ration_milk_cart"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 100)
+ build_path = /obj/item/reagent_containers/condiment/milk/small_ration
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_BAGS,
+ )
diff --git a/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/seeds.dm b/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/seeds.dm
new file mode 100644
index 00000000000..ed1590d71b3
--- /dev/null
+++ b/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/seeds.dm
@@ -0,0 +1,87 @@
+/datum/design/organic_parsnip_seed
+ name = "Pack of Parsnip Seeds"
+ id = "oganic_parsnip_seed"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/seeds/carrot/parsnip
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_SEEDS,
+ )
+
+/datum/design/organic_beet_seed
+ name = "Pack of White-Beet Seeds"
+ id = "oganic_beet_seed"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/seeds/whitebeet
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_SEEDS,
+ )
+
+/datum/design/organic_potato_seed
+ name = "Pack of Potato Seeds"
+ id = "oganic_potato_seed"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/seeds/potato
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_SEEDS,
+ )
+
+/datum/design/organic_soy_seed
+ name = "Pack of Soybean Seeds"
+ id = "oganic_soy_seed"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/seeds/soya
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_SEEDS,
+ )
+
+/datum/design/organic_rice_seed
+ name = "Pack of Rice Seeds"
+ id = "oganic_rice_seed"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/seeds/wheat/rice
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_SEEDS,
+ )
+
+/datum/design/organic_oat_seed
+ name = "Pack of Oat Seeds"
+ id = "oganic_oat_seed"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/seeds/wheat/oat
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_SEEDS,
+ )
+
+/datum/design/organic_korta_seed
+ name = "Pack of Korta Seeds"
+ id = "oganic_korta_seed"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/seeds/korta_nut
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_SEEDS,
+ )
+
+/datum/design/organic_herb_seed
+ name = "Pack of Herb Seeds"
+ id = "oganic_herb_seed"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/seeds/herbs
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_SEEDS,
+ )
diff --git a/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/snacks.dm b/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/snacks.dm
new file mode 100644
index 00000000000..73098b23288
--- /dev/null
+++ b/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/snacks.dm
@@ -0,0 +1,76 @@
+/datum/design/frontier_ration_gum
+ name = "Gum"
+ id = "frontier_ration_gum"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 100)
+ build_path = /obj/item/storage/box/gum
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_SNACKS,
+ )
+
+/datum/design/frontier_ration_gum_wakeup
+ name = "Activin 12 Hour Medicated Gum"
+ id = "frontier_ration_gum_wakeup"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 100)
+ build_path = /obj/item/storage/box/gum/wake_up
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_SNACKS,
+ )
+
+/datum/design/frontier_ration_energy_bar
+ name = "High Power Energy Bar"
+ id = "frontier_ration_energy_bar"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 50)
+ build_path = /obj/item/food/energybar
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_SNACKS,
+ )
+
+/datum/design/frontier_ration_ciggies
+ name = "Cigarettes"
+ id = "frontier_ration_ciggies"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 50)
+ build_path = /obj/item/storage/fancy/cigarettes/cigpack_uplift
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_SNACKS,
+ )
+
+/datum/design/frontier_ration_engine_fodder
+ name = "Engine Fodder"
+ id = "frontier_ration_engine_fodder"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 50)
+ build_path = /obj/item/food/vendor_snacks/moth_bag
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_SNACKS,
+ )
+
+/datum/design/frontier_ration_fueljak_snack
+ name = "Fueljack's Snack"
+ id = "frontier_ration_fueljak_snack"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 50)
+ build_path = /obj/item/food/vendor_snacks/moth_bag/fuel_jack
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_SNACKS,
+ )
+
+/datum/design/frontier_ration_ricecracker
+ name = "Rice Crackers"
+ id = "frontier_ration_ricecracker"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 50)
+ build_path = /obj/item/food/vendor_snacks/rice_crackers
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_SNACKS,
+ )
diff --git a/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/utensils.dm b/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/utensils.dm
new file mode 100644
index 00000000000..05508fc659b
--- /dev/null
+++ b/modular_skyrat/modules/colony_fabricator/code/design_datums/rations_printer_designs/utensils.dm
@@ -0,0 +1,43 @@
+/datum/design/frontier_ration_plastic_fork
+ name = "Plastic Fork"
+ id = "frontier_ration_plastic_fork"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 10)
+ build_path = /obj/item/kitchen/fork/plastic
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_UTENSILS,
+ )
+
+/datum/design/frontier_ration_plastic_spoon
+ name = "Plastic Spoon"
+ id = "frontier_ration_plastic_spoon"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 10)
+ build_path = /obj/item/kitchen/spoon/plastic
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_UTENSILS,
+ )
+
+/datum/design/frontier_ration_plastic_knife
+ name = "Plastic Knife"
+ id = "frontier_ration_plastic_knife"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 10)
+ build_path = /obj/item/knife/plastic
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_UTENSILS,
+ )
+
+/datum/design/frontier_ration_plastic_cup
+ name = "Plastic Cup"
+ id = "frontier_ration_plastic_cup"
+ build_type = BIOGENERATOR
+ materials = list(/datum/material/biomass = 25)
+ build_path = /obj/item/reagent_containers/cup/glass/coffee_cup
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_AKHTER_FOODRICATOR_UTENSILS,
+ )
diff --git a/modular_skyrat/modules/colony_fabricator/code/design_datums/tools.dm b/modular_skyrat/modules/colony_fabricator/code/design_datums/tools.dm
index 0ddfb18e1f7..f69d0d1f431 100644
--- a/modular_skyrat/modules/colony_fabricator/code/design_datums/tools.dm
+++ b/modular_skyrat/modules/colony_fabricator/code/design_datums/tools.dm
@@ -55,7 +55,7 @@
build_path = /obj/item/weldingtool/electric/arc_welder
materials = list(
/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
/datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
)
category = list(
diff --git a/modular_skyrat/modules/colony_fabricator/code/looping_sounds.dm b/modular_skyrat/modules/colony_fabricator/code/looping_sounds.dm
index df4af16517e..f8caa59225f 100644
--- a/modular_skyrat/modules/colony_fabricator/code/looping_sounds.dm
+++ b/modular_skyrat/modules/colony_fabricator/code/looping_sounds.dm
@@ -33,4 +33,3 @@
mid_length = 3 SECONDS
volume = 40
falloff_exponent = 3
-
diff --git a/modular_skyrat/modules/colony_fabricator/icons/chemistry_machines.dmi b/modular_skyrat/modules/colony_fabricator/icons/chemistry_machines.dmi
index c8533ee3e1e..96126d26101 100644
Binary files a/modular_skyrat/modules/colony_fabricator/icons/chemistry_machines.dmi and b/modular_skyrat/modules/colony_fabricator/icons/chemistry_machines.dmi differ
diff --git a/modular_skyrat/modules/colony_fabricator/icons/foodricator.dmi b/modular_skyrat/modules/colony_fabricator/icons/foodricator.dmi
new file mode 100644
index 00000000000..d54728eb58a
Binary files /dev/null and b/modular_skyrat/modules/colony_fabricator/icons/foodricator.dmi differ
diff --git a/modular_skyrat/modules/colony_fabricator/icons/parts_kits.dmi b/modular_skyrat/modules/colony_fabricator/icons/parts_kits.dmi
new file mode 100644
index 00000000000..75a4e97e23f
Binary files /dev/null and b/modular_skyrat/modules/colony_fabricator/icons/parts_kits.dmi differ
diff --git a/modular_skyrat/modules/colony_fabricator/icons/portable_machines.dmi b/modular_skyrat/modules/colony_fabricator/icons/portable_machines.dmi
new file mode 100644
index 00000000000..046d517a0de
Binary files /dev/null and b/modular_skyrat/modules/colony_fabricator/icons/portable_machines.dmi differ
diff --git a/modular_skyrat/modules/colony_fabricator/sound/attributions.txt b/modular_skyrat/modules/colony_fabricator/sound/attributions.txt
index 41f5a6b8600..a2042d10aa0 100644
--- a/modular_skyrat/modules/colony_fabricator/sound/attributions.txt
+++ b/modular_skyrat/modules/colony_fabricator/sound/attributions.txt
@@ -12,3 +12,5 @@ modular_skyrat/modules/colony_fabricator/sound/conditioner/conditioner_(1 - 4).w
The following sounds are from https://pixabay.com/sound-effects/welder-3-54547/
modular_skyrat/modules/colony_fabricator/sound/arc_welder/arc_welder.ogg
+
+The sounds at modular_skyrat/modules/colony_fabriactor_event_code/sound/manual_door are from https://pixabay.com/sound-effects/schlonk-107321/
diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/akh_frontier.dm b/modular_skyrat/modules/company_imports/code/armament_datums/akh_frontier.dm
index 1c42f23b121..290ab7386fc 100644
--- a/modular_skyrat/modules/company_imports/code/armament_datums/akh_frontier.dm
+++ b/modular_skyrat/modules/company_imports/code/armament_datums/akh_frontier.dm
@@ -31,6 +31,10 @@
cost = CARGO_CRATE_VALUE * 6
restricted = TRUE
+/datum/armament_entry/company_import/akh_frontier/deployables_fab/foodricator
+ item_type = /obj/item/flatpacked_machine/organics_ration_printer
+ cost = CARGO_CRATE_VALUE * 2
+
// Various smaller appliances than the deployable machines below
/datum/armament_entry/company_import/akh_frontier/appliances
@@ -44,6 +48,13 @@
/datum/armament_entry/company_import/akh_frontier/appliances/water_synth
item_type = /obj/item/flatpacked_machine/water_synth
+/datum/armament_entry/company_import/akh_frontier/appliances/hydro_synth
+ item_type = /obj/item/flatpacked_machine/hydro_synth
+
+/datum/armament_entry/company_import/akh_frontier/appliances/sustenance_dispenser
+ item_type = /obj/item/flatpacked_machine/sustenance_machine
+ cost = PAYCHECK_COMMAND * 2
+
// Flatpacked, ready to deploy machines
/datum/armament_entry/company_import/akh_frontier/deployables_misc
@@ -56,6 +67,12 @@
/datum/armament_entry/company_import/akh_frontier/deployables_misc/thermomachine
item_type = /obj/item/flatpacked_machine/thermomachine
+/datum/armament_entry/company_import/akh_frontier/deployables_misc/co2_cracker
+ item_type = /obj/item/flatpacked_machine/co2_cracker
+
+/datum/armament_entry/company_import/akh_frontier/deployables_misc/recycler
+ item_type = /obj/item/flatpacked_machine/recycler
+
// Flatpacked, ready to deploy machines for power related activities
/datum/armament_entry/company_import/akh_frontier/deployables
diff --git a/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm b/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm
index 0793a3cca8e..fdb9df70e32 100644
--- a/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm
+++ b/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm
@@ -17,7 +17,12 @@
desc = "A heads-up display that scans humanoids in view, and displays if their current ID possesses a firearms permit or not."
id = "permit_glasses"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/clothing/glasses/hud/gun_permit
- category = list(RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC)
+ category = list(
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC,
+ )
departmental_flags = DEPARTMENT_BITFLAG_CARGO
diff --git a/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm b/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm
index 32cec0b2f9a..550de51f205 100644
--- a/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm
+++ b/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm
@@ -144,8 +144,13 @@
id = "conveysorter"
build_type = PROTOLATHE | AWAY_LATHE
build_path = /obj/item/conveyor_sorter
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 5)
- category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO,
+ )
departmental_flags = DEPARTMENT_BITFLAG_CARGO
/datum/techweb_node/conveyor_sorter
@@ -181,10 +186,10 @@
id = "conveyor_sorter_improved"
build_path = /obj/item/conveyor_sorter/improved
materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 5,
- /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 5,
- /datum/material/gold = SMALL_MATERIAL_AMOUNT * 5,
- /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 5,
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
)
diff --git a/modular_skyrat/modules/customization/game/objects/items/devices/crutch.dm b/modular_skyrat/modules/customization/game/objects/items/devices/crutch.dm
index 77bae224399..9377029f96a 100644
--- a/modular_skyrat/modules/customization/game/objects/items/devices/crutch.dm
+++ b/modular_skyrat/modules/customization/game/objects/items/devices/crutch.dm
@@ -6,7 +6,9 @@
inhand_icon_state = "crutch"
lefthand_file = 'modular_skyrat/master_files/icons/mob/inhands/melee_lefthand.dmi'
righthand_file = 'modular_skyrat/master_files/icons/mob/inhands/melee_righthand.dmi'
- custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 6)
+ custom_materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 6,
+ )
attack_verb_continuous = list("bludgeons", "whacks", "thrashes")
attack_verb_simple = list("bludgeon", "whack", "thrash")
-
+
diff --git a/modular_skyrat/modules/food_replicator/code/rationpacks.dm b/modular_skyrat/modules/food_replicator/code/rationpacks.dm
index c22d588d49a..98b9a0240a2 100644
--- a/modular_skyrat/modules/food_replicator/code/rationpacks.dm
+++ b/modular_skyrat/modules/food_replicator/code/rationpacks.dm
@@ -89,14 +89,18 @@
name = "empty nachos tray"
desc = "Covered in sauce smearings and smaller pieces of the dish on the inside, a plastic food tray with not much use anymore. It's probably best to dispose of it or recycle it."
icon = 'modular_skyrat/modules/food_replicator/icons/rationpack.dmi'
- custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ )
icon_state = "nacho_trash"
/obj/item/trash/blins
name = "empty crepes wrapper"
desc = "Empty torn wrapper that used to hold something ridiculously sweet. It's probably best to recycle it."
icon = 'modular_skyrat/modules/food_replicator/icons/rationpack.dmi'
- custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 0.5)
+ custom_materials = list(
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
+ )
icon_state = "blin_trash"
/obj/item/storage/box/gum/colonial
diff --git a/modular_skyrat/modules/holdingfashion_port/code/bluespace_design.dm b/modular_skyrat/modules/holdingfashion_port/code/bluespace_design.dm
index dfef15d2312..79856dcc67e 100644
--- a/modular_skyrat/modules/holdingfashion_port/code/bluespace_design.dm
+++ b/modular_skyrat/modules/holdingfashion_port/code/bluespace_design.dm
@@ -3,9 +3,16 @@
desc = "A block of metal ready to be transformed into a satchel of holding with a bluespace anomaly core."
id = "satchel_holding"
build_type = PROTOLATHE
- materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT * 2, /datum/material/diamond = SHEET_MATERIAL_AMOUNT, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/diamond = SHEET_MATERIAL_AMOUNT,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/bluespace = SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/satchel_of_holding_inert
- category = list(RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE)
+ category = list(
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE,
+ )
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
/datum/design/duffel_holding
@@ -13,7 +20,14 @@
desc = "A block of metal ready to be transformed into a duffel bag of holding with a bluespace anomaly core."
id = "duffel_holding"
build_type = PROTOLATHE
- materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT * 2, /datum/material/diamond = SHEET_MATERIAL_AMOUNT, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/diamond = SHEET_MATERIAL_AMOUNT,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/bluespace = SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/duffel_of_holding_inert
- category = list(RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE)
+ category = list(
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_BLUESPACE,
+ )
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
diff --git a/modular_skyrat/modules/huds/code/designs.dm b/modular_skyrat/modules/huds/code/designs.dm
index d4f0586ada9..631e0859c02 100644
--- a/modular_skyrat/modules/huds/code/designs.dm
+++ b/modular_skyrat/modules/huds/code/designs.dm
@@ -3,10 +3,14 @@
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status. This one has a prescription lens."
id = "health_hud_prescription"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/health/prescription
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -15,10 +19,14 @@
desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status. This one has a prescription lens."
id = "security_hud_prescription"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/security/prescription
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY,
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
@@ -27,10 +35,14 @@
desc = "A HUD used to analyze and determine faults within robotic machinery. This one has a prescription lens."
id = "diagnostic_hud_prescription"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/diagnostic/prescription
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE,
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
@@ -39,10 +51,14 @@
desc = "These glasses scan the contents of containers and projects their contents to the user in an easy to read format. This one has a prescription lens."
id = "science_hud_prescription"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/science/prescription
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE,
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL
@@ -51,10 +67,14 @@
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition. Prescription lens has been added into this design."
id = "mesons_prescription"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/meson/prescription
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
)
departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_ENGINEERING
@@ -63,10 +83,15 @@
desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, regardless of lighting condition. The T-ray Scanner mode lets you see underfloor objects such as cables and pipes. Prescription lens has been added into this design."
id = "engine_goggles_prescription"
build_type = PROTOLATHE | AWAY_LATHE | COLONY_FABRICATOR
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plasma = SMALL_MATERIAL_AMOUNT, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plasma = SMALL_MATERIAL_AMOUNT,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/meson/engine/prescription
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
@@ -75,9 +100,13 @@
desc = "Used by engineering staff to see underfloor objects such as cables and pipes. Prescription lens has been added into this design."
id = "tray_goggles_prescription"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/silver = SMALL_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/clothing/glasses/meson/engine/tray/prescription
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
diff --git a/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm b/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm
index 504f7346dfb..6933041c786 100644
--- a/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm
+++ b/modular_skyrat/modules/hyposprays/code/autolathe_designs.dm
@@ -2,15 +2,26 @@
name = "Large Hypovial"
id = "large_hypovial"
build_type = AUTOLATHE | PROTOLATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/reagent_containers/cup/vial/large
- category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL)
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
+ )
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
/datum/design/pen
name = "Pen"
id = "pen"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/pen
- category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC)
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC,
+ )
diff --git a/modular_skyrat/modules/implants/code/medical_designs.dm b/modular_skyrat/modules/implants/code/medical_designs.dm
index 3197d96c5b7..5ebcfa2e63e 100644
--- a/modular_skyrat/modules/implants/code/medical_designs.dm
+++ b/modular_skyrat/modules/implants/code/medical_designs.dm
@@ -3,11 +3,15 @@
desc = "A long, sharp, mantis-like blade installed within the forearm, acting as a deadly self defense weapon."
id = "ci-mantis"
build_type = MECHFAB
- materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list (
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
construction_time = 200
build_path = /obj/item/organ/internal/cyberimp/arm/armblade
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT,
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
@@ -19,12 +23,12 @@
materials = list (
/datum/material/iron = SHEET_MATERIAL_AMOUNT,
/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
- /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
)
construction_time = 20 SECONDS
build_path = /obj/item/organ/internal/cyberimp/arm/razor_claws
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SECURITY
@@ -33,11 +37,15 @@
desc = "An advanced hacking and machine modification toolkit fitted into an arm implant, designed to be installed on a subject's arm."
id = "ci-hacker"
build_type = MECHFAB
- materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list (
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
construction_time = 200
build_path = /obj/item/organ/internal/cyberimp/arm/hacker
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
@@ -46,11 +54,15 @@
desc = "An integrated projector mounted onto a user's arm that is able to be used as a powerful flash."
id = "ci-flash"
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
- materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list (
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
construction_time = 200
build_path = /obj/item/organ/internal/cyberimp/arm/flash
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -59,11 +71,16 @@
desc = "Everything a botanist needs in an arm implant, designed to be installed on a subject's arm."
id = "ci-botany"
build_type = MECHFAB | PROTOLATHE
- materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT)
+ materials = list (
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ )
construction_time = 200
build_path = /obj/item/organ/internal/cyberimp/arm/botany
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE
@@ -73,10 +90,16 @@
id = "ci-nv"
build_type = PROTOLATHE | MECHFAB
construction_time = 60
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 6, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 6, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 6, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 6, /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT,)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 6,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 6,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 6,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 6,
+ /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/organ/internal/eyes/night_vision/cyber
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -86,10 +109,15 @@
id = "ci-antisleep"
build_type = PROTOLATHE | MECHFAB
construction_time = 60
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 6, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 6, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 6,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 6,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/organ/internal/cyberimp/brain/anti_sleep
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -99,10 +127,15 @@
id = "ci-scanner"
build_type = MECHFAB | PROTOLATHE
construction_time = 40
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SHEET_MATERIAL_AMOUNT, /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/organ/internal/cyberimp/chest/scanner
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -111,11 +144,15 @@
desc = "A set of janitor tools fitted into an arm implant, designed to be installed on subject's arm."
id = "ci-janitor"
build_type = PROTOLATHE | MECHFAB
- materials = list (/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list (
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
construction_time = 200
build_path = /obj/item/organ/internal/cyberimp/arm/janitor
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_TOOLS,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE
@@ -124,11 +161,15 @@
desc = "A lighter, installed into the subject's arm. Incredibly useless."
id = "ci-lighter"
build_type = PROTOLATHE | MECHFAB
- materials = list (/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list (
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
construction_time = 100
build_path = /obj/item/organ/internal/cyberimp/arm/lighter
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_MISC
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_MISC,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE
@@ -142,6 +183,6 @@
name = "Reviver Implant"
id = "ci-reviver"
category = list(
- RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_COMBAT,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
diff --git a/modular_skyrat/modules/imported_vendors/code/vendor_food.dm b/modular_skyrat/modules/imported_vendors/code/vendor_food.dm
index 2fe1e97965d..df5e62c82c9 100644
--- a/modular_skyrat/modules/imported_vendors/code/vendor_food.dm
+++ b/modular_skyrat/modules/imported_vendors/code/vendor_food.dm
@@ -7,14 +7,18 @@
desc = "The condensation and what you can only hope are the leftovers of food make this a bit hard to reuse."
icon = 'modular_skyrat/modules/imported_vendors/icons/imported_quick_foods.dmi'
icon_state = "foodtray_empty"
- custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ )
/obj/item/trash/empty_side_pack
name = "empty side wrapper"
desc = "Unfortunately, this no longer holds any sides to distract you from the other 'food'."
icon = 'modular_skyrat/modules/imported_vendors/icons/imported_quick_foods.dmi'
icon_state = "foodpack_generic_trash"
- custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ )
/obj/item/trash/empty_side_pack/nt
icon_state = "foodpack_nt_trash"
diff --git a/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm b/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm
index 38de344ec4d..b5229a876bf 100644
--- a/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm
+++ b/modular_skyrat/modules/imported_vendors/code/vendor_snacks.dm
@@ -19,7 +19,9 @@
desc = "The leftovers of what was likely a great snack in a past time."
icon = 'modular_skyrat/modules/imported_vendors/icons/imported_quick_foods.dmi'
icon_state = "foodpack_generic_trash"
- custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ )
/*
* Yangyu Snacks
diff --git a/modular_skyrat/modules/medical_designs/medical_designs.dm b/modular_skyrat/modules/medical_designs/medical_designs.dm
index dc2e28def25..d0e0ecf934c 100644
--- a/modular_skyrat/modules/medical_designs/medical_designs.dm
+++ b/modular_skyrat/modules/medical_designs/medical_designs.dm
@@ -2,10 +2,12 @@
name = "Hospital Gown"
id = "hospital_gown"
build_type = PROTOLATHE
- materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/clothing/suit/toggle/labcoat/hospitalgown
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE
diff --git a/modular_skyrat/modules/microfusion/code/microfusion_designs.dm b/modular_skyrat/modules/microfusion/code/microfusion_designs.dm
index ad8dd991a65..861b8ed9c1a 100644
--- a/modular_skyrat/modules/microfusion/code/microfusion_designs.dm
+++ b/modular_skyrat/modules/microfusion/code/microfusion_designs.dm
@@ -15,32 +15,51 @@
build_type = PROTOLATHE | AWAY_LATHE
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
construction_time = 10 SECONDS //dunno if this is for mechfabs or what but I'll keep this anyway
- category = list(RND_CATEGORY_MICROFUSION_WEAPONS)
+ category = list(
+ RND_CATEGORY_MICROFUSION_WEAPONS,
+ )
// EMITTERS
/datum/design/microfusion/phase_emitter
name = "Placeholder Microfusion Phase Emitter"
desc = "You shouldn't see this. Still, odd how there's no basic phase emitter design, despite how redundant it'd be."
- category = list(RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_EMITTERS)
+ category = list(
+ RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_EMITTERS,
+ )
/datum/design/microfusion/phase_emitter/enhanced
name = "Enhanced Microfusion Phase Emitter"
desc = "The core of a microfusion projection weapon, produces the laser."
id = "enhanced_microfusion_phase_emitter"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_phase_emitter/enhanced
/datum/design/microfusion/phase_emitter/advanced
name = "Advanced Microfusion Phase Emitter"
id = "advanced_microfusion_phase_emitter"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_phase_emitter/advanced
/datum/design/microfusion/phase_emitter/bluespace
name = "Bluespace Microfusion Phase Emitter"
id = "bluespace_microfusion_phase_emitter"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 5, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_phase_emitter/bluespace
// CELLS
@@ -48,39 +67,62 @@
/datum/design/microfusion/cell
name = "Microfusion Cell"
desc = "A microfusion cell. There's a basic type defined next to this, right?"
- category = list(RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_CELLS)
+ category = list(
+ RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_CELLS,
+ )
/datum/design/microfusion/cell/basic
name = "Basic Microfusion Cell"
desc = "A basic microfusion cell with a capacity of 1200 MF and and 1 attachment point."
id = "basic_microfusion_cell"
build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2,
+ )
build_path = /obj/item/stock_parts/cell/microfusion
category = list(
RND_CATEGORY_INITIAL,
- RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_CELLS // i kinda hate this but what can you do
+ RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_CELLS,
)
/datum/design/microfusion/cell/enhanced
name = "Enhanced Microfusion Cell"
desc = "An enhanced microfusion cell with a capacity of 1500 MF and 1 attachment point."
id = "enhanced_microfusion_cell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 2,
+ )
build_path = /obj/item/stock_parts/cell/microfusion/enhanced
/datum/design/microfusion/cell/advanced
name = "Advanced Microfusion Cell"
desc = "An advanced microfusion cell with a capacity of 1700 MF and 3 attachment points."
id = "advanced_microfusion_cell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/stock_parts/cell/microfusion/advanced
/datum/design/microfusion/cell/bluespace
name = "Bluespace Microfusion Cell"
desc = "A bluespace microfusion cell with a capacity of 2000 MF and 3 attachment points."
id = "bluespace_microfusion_cell"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 3,
+ /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/stock_parts/cell/microfusion/bluespace
// CELL UPGRADES
@@ -88,99 +130,158 @@
/datum/design/microfusion/cell_attachment
name = "Placeholder Cell Attachment"
desc = "You shouldn't be seeing this."
- category = list(RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_CELL_ATTACHMENTS)
+ category = list(
+ RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_CELL_ATTACHMENTS,
+ )
/datum/design/microfusion/cell_attachment/stabilising
name = "Stabilising Microfusion Cell Attachment"
desc = "Stabilises the internal fusion reaction of microfusion cells, preventing sparks during firing and occasional radiation pulses when used in tandem with a self-charging attachment."
id = "microfusion_cell_attachment_stabiliser"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_cell_attachment/stabiliser
/datum/design/microfusion/cell_attachment/overcapacity
name = "Overcapacity Microfusion Cell Attachment"
desc = "An attachment for microfusion cells that increases MF capacity."
id = "microfusion_cell_attachment_overcapacity"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 20)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/microfusion_cell_attachment/overcapacity
/datum/design/microfusion/cell_attachment/selfcharging
name = "Self-Charging Microfusion Cell Attachment"
desc = "Contains a small amount of infinitely decaying nuclear material, causing the fusion reaction to be self sustaining. WARNING: May cause radiation burns if not stabilised."
id = "microfusion_cell_attachment_selfcharging"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5, /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 3, /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 3, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT) // Makes it almost in-line with Advanced Egun pricing
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/bluespace = SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_cell_attachment/selfcharging
/datum/design/microfusion/attachment
name = "Placeholder MCR Attachment"
desc = "You *really* shouldn't be seeing this. Now in different attachment flavors! The Req line will hate you."
- category = list(RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT)
+ category = list(
+ RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT,
+ )
// RAIL MODS
/datum/design/microfusion/attachment/rail_slot
name = "Placeholder Microfusion Rail Slot Attachment"
- category = list(RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT + RND_MICROFUSION_ATTACHMENT_RAIL)
+ category = list(
+ RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT + RND_MICROFUSION_ATTACHMENT_RAIL,
+ )
/datum/design/microfusion/attachment/rail_slot/rail
name = "Microfusion Weapon Rail"
desc = "A carrying handle/rail system for any additional attachments, such as a seclite and/or bayonet."
id = "microfusion_gun_attachment_rail"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/rail
/datum/design/microfusion/attachment/rail_slot/scope
name = "Microfusion Weapon Scope"
desc = "A scope. For microfusion weapon platforms, probably."
id = "microfusion_gun_attachment_scope"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/scope
// UNDERBARREL MODS
/datum/design/microfusion/attachment/underbarrel
name = "Placeholder Microfusion Underbarrel Slot Attachment"
- category = list(RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT + RND_MICROFUSION_ATTACHMENT_UNDERBARREL)
+ category = list(
+ RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT + RND_MICROFUSION_ATTACHMENT_UNDERBARREL,
+ )
/datum/design/microfusion/attachment/underbarrel/grip
name = "Microfusion Weapon Grip"
desc = "A grip. For microfusion weapon platforms, ostensibly."
id = "microfusion_gun_attachment_grip"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/grip
/datum/design/microfusion/attachment/underbarrel/heatsink
name = "Phase Emitter Heatsink"
desc = "A heatsink attachment for your microfusion weapon. Massively increases cooling potential."
id = "microfusion_gun_attachment_heatsink"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/heatsink
// BARREL MODS (there's a lot)
/datum/design/microfusion/attachment/barrel
name = "Placeholder Microfusion Barrel Slot Attachment"
- category = list(RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT + RND_MICROFUSION_ATTACHMENT_BARREL)
+ category = list(
+ RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT + RND_MICROFUSION_ATTACHMENT_BARREL,
+ )
/datum/design/microfusion/attachment/barrel/suppressor
name = "Suppressor Lens Attachment"
desc = "An experimental barrel attachment that dampens the soundwave of the emitter, suppressing the report. Does not make the lasers themselves more stealthy, as they are lasers."
id = "microfusion_gun_attachment_suppressor"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/barrel/suppressor
/datum/design/microfusion/attachment/barrel/honk
name = "Bananium Phase Emitter \"Upgrade\""
desc = "Makes your lasers into the greatest clowning tool ever made. HONK!"
id = "microfusion_gun_attachment_honk"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bananium = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/bananium = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/barrel/honk
/datum/design/microfusion/attachment/barrel/lance
name = "Lance Induction Carriage"
desc = "Turns the gun into a designated marksman rifle."
id = "microfusion_gun_attachment_lance"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plasma = SMALL_MATERIAL_AMOUNT * 5, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/barrel/lance
// EMITTER UPGRADES (they're still barrel upgrades, though)
@@ -189,88 +290,147 @@
name = "Diffuser Microfusion Lens Attachment"
desc = "Splits the microfusion laser beam entering the lens."
id = "microfusion_gun_attachment_scatter"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/barrel/scatter
/datum/design/microfusion/attachment/barrel/scatter/max
name = "Crystalline Diffuser Microfusion Lens Attachment"
desc = "Splits the microfusion laser beam entering the lens even more."
id = "microfusion_gun_attachment_scattermax"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/barrel/scatter/max
/datum/design/microfusion/attachment/barrel/superheat
name = "Superheating Phase Emitter Upgrade"
desc = "Superheats the beam, causing targets to ignite."
id = "microfusion_gun_attachment_superheat"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/barrel/superheat
/datum/design/microfusion/attachment/barrel/hellfire
name = "Hellfire Phase Emitter Upgrade"
desc = "Overheats the beam, causing nastier wounds and higher damage."
id = "microfusion_gun_attachment_hellfire"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plasma = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/barrel/hellfire
/datum/design/microfusion/attachment/barrel/repeater
name = "Repeating Phase Emitter Upgrade"
desc = "Upgrades the central phase emitter to repeat twice."
id = "microfusion_gun_attachment_repeater"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5, /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/barrel/repeater
/datum/design/microfusion/attachment/barrel/repeater/penetrator
name = "Focused Repeating Phase Emitter Upgrade"
desc = "Upgrades the central phase emitter to repeat twice and penetrate armor."
id = "microfusion_gun_attachment_penetrator"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5, /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/barrel/repeater/penetrator
/datum/design/microfusion/attachment/barrel/xray
name = "Phase Inverter Emitter Array"
desc = "Experimental technology that inverts the central phase emitter causing the wave frequency to shift into X-rays that pierce solid objects. CAUTION: Phase emitter heats up very quickly."
id = "microfusion_gun_attachment_xray"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 5, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/barrel/xray
// COSMETICS
/datum/design/microfusion/attachment/unique
name = "Placeholder Microfusion Unique/Cosmetic Attachment"
- category = list(RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT + RND_MICROFUSION_ATTACHMENT_UNIQUE)
+ category = list(
+ RND_CATEGORY_MICROFUSION_WEAPONS + RND_MICROFUSION_ATTACHMENT + RND_MICROFUSION_ATTACHMENT_UNIQUE,
+ )
/datum/design/microfusion/attachment/unique/rgb
name = "Phase Emitter Spectrograph"
desc = "An attachment hooked up to the phase emitter, allowing the user to adjust the color of the beam outputted. This has seen widespread use by various factions capable of getting their hands on microfusion weapons, whether as a calling card or simply for entertainment."
id = "microfusion_gun_attachment_rgb"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/rgb
/datum/design/microfusion/attachment/unique/camo_black
name = "Black Camo Microfusion Frame"
desc = "A frame modification for the MCR-10, changing the color of the gun to black."
id = "microfusion_gun_attachment_black_camo"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/camo
/datum/design/microfusion/attachment/unique/camo_nanotrasen
name = "Nanotrasen Camo Microfusion Frame"
desc = "A frame modification for the MCR-01, changing the color of the gun to blue."
id = "microfusion_gun_attachment_nt_camo"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plasma = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/camo/nanotrasen
/datum/design/microfusion/attachment/unique/camo_syndicate
name = "Blood Red Camo Microfusion Frame"
desc = "A frame modification for the MCR-01, changing the color of the gun to a slick blood red."
id = "microfusion_gun_attachment_syndi_camo"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/camo/syndicate
/datum/design/microfusion/attachment/unique/camo_bananium
name = "Bananium Microfusion Frame"
desc = "A frame modification for the MCR-01, plating the gun in bananium."
id = "microfusion_gun_attachment_honk_camo"
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/bananium = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/bananium = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/microfusion_gun_attachment/camo/honk
diff --git a/modular_skyrat/modules/modular_implants/code/nif_research.dm b/modular_skyrat/modules/modular_implants/code/nif_research.dm
index 4e88040cddf..3355a31e0ea 100644
--- a/modular_skyrat/modules/modular_implants/code/nif_research.dm
+++ b/modular_skyrat/modules/modular_implants/code/nif_research.dm
@@ -4,8 +4,14 @@
id = "nifsoft_remover"
build_type = PROTOLATHE | AWAY_LATHE
build_path = /obj/item/nifsoft_remover
- materials = list(/datum/material/iron = 200, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 5, /datum/material/uranium = SMALL_MATERIAL_AMOUNT * 5)
- category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SECURITY)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_SECURITY,
+ )
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
/datum/design/nifsoft_money_sense
@@ -14,8 +20,14 @@
id = "nifsoft_money_sense"
build_type = PROTOLATHE | AWAY_LATHE
build_path = /obj/item/disk/nifsoft_uploader/money_sense
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT)
- category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_CARGO,
+ )
departmental_flags = DEPARTMENT_BITFLAG_CARGO
/datum/design/soulcatcher_device
@@ -24,8 +36,14 @@
id = "soulcatcher_device"
build_type = PROTOLATHE | AWAY_LATHE
build_path = /obj/item/handheld_soulcatcher
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/silver = SHEET_MATERIAL_AMOUNT, /datum/material/bluespace = SHEET_MATERIAL_AMOUNT)
- category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL) // look, the anesthetic machine's there too
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT,
+ /datum/material/bluespace = SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
+ )
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE
/datum/design/mini_soulcatcher
@@ -34,14 +52,25 @@
id = "mini_soulcatcher"
build_type = PROTOLATHE | AWAY_LATHE
build_path = /obj/item/attachable_soulcatcher
- materials = list(/datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/iron = SMALL_MATERIAL_AMOUNT * 5)
- category = list(RND_CATEGORY_AI + RND_SUBCATEGORY_AI_MISC) // look, the anesthetic machine's there too
+ materials = list(
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_AI + RND_SUBCATEGORY_AI_MISC,
+ )
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_MEDICAL
/datum/design/nifsoft_hud
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT)
- category = list(RND_CATEGORY_EQUIPMENT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_EQUIPMENT,
+ )
/datum/design/nifsoft_hud/medical
name = "Medical HUD NIFSoft"
@@ -91,11 +120,13 @@
id = "nifsoft_hud_kit"
build_type = PROTOLATHE | AWAY_LATHE
departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SECURITY
- category = list(RND_CATEGORY_EQUIPMENT)
materials = list(
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
/datum/material/plastic = SHEET_MATERIAL_AMOUNT,
)
+ category = list(
+ RND_CATEGORY_EQUIPMENT,
+ )
build_path = /obj/item/nif_hud_adapter
diff --git a/modular_skyrat/modules/modular_items/code/designs.dm b/modular_skyrat/modules/modular_items/code/designs.dm
index e811691e3b5..c8cd1e71514 100644
--- a/modular_skyrat/modules/modular_items/code/designs.dm
+++ b/modular_skyrat/modules/modular_items/code/designs.dm
@@ -7,10 +7,14 @@
desc = "A heads-up display that scans the humanoids in view and provides accurate data about their health status. This HUD has been fitted inside of a pair of sunglasses."
id = "health_hud_aviator"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/ar/aviator/health
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -19,10 +23,15 @@
desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status. This HUD has been fitted inside of a pair of sunglasses."
id = "security_hud_aviator"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 2,)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 2,
+ )
build_path = /obj/item/clothing/glasses/hud/ar/aviator/security
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY,
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
@@ -31,10 +40,14 @@
desc = "A heads-up display used to analyze and determine faults within robotic machinery. This HUD has been fitted inside of a pair of sunglasses."
id = "diagnostic_hud_aviator"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/ar/aviator/diagnostic
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE,
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
@@ -43,10 +56,14 @@
desc = "A heads-up display used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition. This HUD has been fitted inside of a pair of sunglasses."
id = "meson_hud_aviator"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/ar/aviator/meson
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
)
departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_ENGINEERING
@@ -55,10 +72,14 @@
desc = "A pair of tacky purple aviator sunglasses that allow the wearer to recognize various chemical compounds with only a glance."
id = "science_hud_aviator"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8,
+ /datum/material/gold = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/ar/aviator/science
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE,
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
@@ -67,10 +88,14 @@
desc = "A headset equipped with a scanning lens and mounted retinal projector. It doesn't provide any eye protection, but it's less obtrusive than goggles."
id = "health_hud_projector"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/ar/projector/health
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
@@ -79,10 +104,15 @@
desc = "A headset equipped with a scanning lens and mounted retinal projector. It doesn't provide any eye protection, but it's less obtrusive than goggles."
id = "security_hud_projector"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 2,)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 2,
+ )
build_path = /obj/item/clothing/glasses/hud/ar/projector/security
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SECURITY,
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
@@ -91,10 +121,14 @@
desc = "A headset equipped with a scanning lens and mounted retinal projector. It doesn't provide any eye protection, but it's less obtrusive than goggles."
id = "diagnostic_hud_projector"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/ar/projector/diagnostic
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE,
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
@@ -103,10 +137,14 @@
desc = "A headset equipped with a scanning lens and mounted retinal projector. It doesn't provide any eye protection, but it's less obtrusive than goggles."
id = "meson_hud_projector"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/ar/projector/meson
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_ENGINEERING,
)
departmental_flags = DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_ENGINEERING
@@ -115,9 +153,13 @@
desc = "A headset equipped with a scanning lens and mounted retinal projector. It doesn't provide any eye protection, but it's less obtrusive than goggles."
id = "science_hud_projector"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 8,
+ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 4,
+ )
build_path = /obj/item/clothing/glasses/hud/ar/projector/science
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE + RND_SUBCATEGORY_EQUIPMENT_MEDICAL
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm
index 6a8f8a37c58..913ed0470cb 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm
@@ -314,7 +314,10 @@
unique_reskin = list("pink" = "filter_pink",
"teal" = "filter_teal")
w_class = WEIGHT_CLASS_SMALL
- custom_materials = list(/datum/material/glass = SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+ )
volume = 50
possible_transfer_amounts = list(1, 2, 3, 4, 5, 10, 25, 50)
list_reagents = list(/datum/reagent/drug/aphrodisiac/crocin = 50)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shockcollar.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shockcollar.dm
index 63ddfd330ba..6bbe0f729fc 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shockcollar.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shockcollar.dm
@@ -10,7 +10,10 @@
w_class = WEIGHT_CLASS_SMALL
strip_delay = 60
// equip_delay_other = 60
- custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/glass = SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
var/random = TRUE
var/freq_in_name = TRUE
var/tagname = null
@@ -20,8 +23,14 @@
id = "shockcollar"
build_type = AUTOLATHE
build_path = /obj/item/electropack/shockcollar
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/glass = SHEET_MATERIAL_AMOUNT)
- category = list(RND_CATEGORY_HACKED, RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_HACKED,
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC,
+ )
/obj/item/electropack/shockcollar/attack_hand(mob/user)
if(loc == user && user.get_item_by_slot(ITEM_SLOT_NECK))
diff --git a/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm b/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm
index 89695235d2b..d91a802fd84 100644
--- a/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm
+++ b/modular_skyrat/modules/modular_weapons/code/autolathe_designs.dm
@@ -6,9 +6,14 @@
name = ".310 Rubber Bullet (Less Lethal)"
id = "astrilka310_rubber"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/ammo_casing/strilka310/rubber
- category = list(RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ category = list(
+ RND_CATEGORY_HACKED,
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
// 4.6x30mm - SMG round, used in the WT550 and in numerous modular guns as a weaker alternative to 9mm.
@@ -16,17 +21,27 @@
name = "4.6x30mm Bullet"
id = "c46x30mm"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5,
+ )
build_path = /obj/item/ammo_casing/c46x30mm
- category = list(RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ category = list(
+ RND_CATEGORY_HACKED,
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
/datum/design/c46x30mm_rubber
name = "4.6x30mm Rubber Bullet"
id = "c46x30mm_rubber"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5
+ )
build_path = /obj/item/ammo_casing/c46x30mm/rubber
- category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
// .45
@@ -34,31 +49,51 @@
name = ".45 Bullet"
id = "c45_lethal"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5,
+ )
build_path = /obj/item/ammo_casing/c45
- category = list(RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ category = list(
+ RND_CATEGORY_HACKED,
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
/datum/design/c45_rubber
name = ".45 Bouncy Rubber Ball"
id = "c45_rubber"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5,
+ )
build_path = /obj/item/ammo_casing/c45/rubber
- category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
// 10mm
/datum/design/c10mm_lethal
name = "10mm Bullet"
id = "c10mm_lethal"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5,
+ )
build_path = /obj/item/ammo_casing/c10mm
- category = list(RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ category = list(
+ RND_CATEGORY_HACKED,
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
/datum/design/c10mm_rubber
name = "10mm Rubber Bullet"
id = "c10mm_rubber"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT * 7.5,
+ )
build_path = /obj/item/ammo_casing/c10mm/rubber
- category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
diff --git a/modular_skyrat/modules/modular_weapons/code/pepperball_gun.dm b/modular_skyrat/modules/modular_weapons/code/pepperball_gun.dm
index 6b28643245d..990581bfb4a 100644
--- a/modular_skyrat/modules/modular_weapons/code/pepperball_gun.dm
+++ b/modular_skyrat/modules/modular_weapons/code/pepperball_gun.dm
@@ -60,9 +60,14 @@
name = "Pepperball Ammo Box"
id = "pepperballs"
build_type = AUTOLATHE | PROTOLATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
+ )
build_path = /obj/item/ammo_box/advanced/pepperballs
- category = list(RND_CATEGORY_INITIAL, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
/obj/item/ammo_box/advanced/pepperballs
@@ -70,7 +75,9 @@
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/pepperball/ammoboxes.dmi'
icon_state = "box10x24"
ammo_type = /obj/item/ammo_casing/pepperball
- custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3)
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
+ )
max_ammo = 15
// Gunset for the pepperball pistol
diff --git a/modular_skyrat/modules/moretraitoritems/code/weapons.dm b/modular_skyrat/modules/moretraitoritems/code/weapons.dm
index 576bca81f2f..fdcabbf5776 100644
--- a/modular_skyrat/modules/moretraitoritems/code/weapons.dm
+++ b/modular_skyrat/modules/moretraitoritems/code/weapons.dm
@@ -29,9 +29,14 @@
name = "Speed Loader (.357 Peacemaker)"
id = "a357PM"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ )
build_path = /obj/item/ammo_box/a357/peacemaker
- category = list(RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ category = list(
+ RND_CATEGORY_HACKED,
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
/obj/item/ammo_box/a357/peacemaker
name = "speed loader (.357 Peacemaker)"
diff --git a/modular_skyrat/modules/mutants/code/mutant_cure.dm b/modular_skyrat/modules/mutants/code/mutant_cure.dm
index f6c72454c55..ee10bb45f89 100644
--- a/modular_skyrat/modules/mutants/code/mutant_cure.dm
+++ b/modular_skyrat/modules/mutants/code/mutant_cure.dm
@@ -3,7 +3,12 @@
desc = "A tool used to extract the RNA from viruses. Apply to skin."
icon = 'modular_skyrat/modules/mutants/icons/extractor.dmi'
icon_state = "extractor"
- custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/gold = SHEET_MATERIAL_AMOUNT, /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT,
+ /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ )
/// Our loaded vial.
var/obj/item/rna_vial/loaded_vial
@@ -84,7 +89,11 @@
desc = "A glass vial containing raw virus RNA. Slot this into the combinator to upload the sample."
icon = 'modular_skyrat/modules/mutants/icons/extractor.dmi'
icon_state = "rnavial"
- custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
var/contains_rna = FALSE
/obj/item/rna_vial/proc/load_rna(mob/living/carbon/human/H)
@@ -349,7 +358,9 @@
icon = 'modular_skyrat/modules/mutants/icons/extractor.dmi'
icon_state = "tvirus_infector"
list_reagents = list(/datum/reagent/hnz = 30)
- custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT * 5)
+ custom_materials = list(
+ /datum/material/glass=HALF_SHEET_MATERIAL_AMOUNT,
+ )
/obj/item/reagent_containers/cup/bottle/hnz/one
list_reagents = list(/datum/reagent/hnz = 1)
diff --git a/modular_skyrat/modules/mutants/code/mutant_techweb.dm b/modular_skyrat/modules/mutants/code/mutant_techweb.dm
index e2570bfd311..8099b4f3b6d 100644
--- a/modular_skyrat/modules/mutants/code/mutant_techweb.dm
+++ b/modular_skyrat/modules/mutants/code/mutant_techweb.dm
@@ -21,10 +21,14 @@
desc = "An empty RNA vial for storing genetic information."
id = "rna_vial"
build_type = PROTOLATHE
- materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/glass = SHEET_MATERIAL_AMOUNT, /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/rna_vial
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL + RND_SUBCATEGORY_EQUIPMENT_SCIENCE,
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL
@@ -33,10 +37,15 @@
desc = "An RNA extraction device, use this on any subect you'd like to extract RNA data from, needs RNA vials to work."
id = "rna_extractor"
build_type = PROTOLATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/gold = SHEET_MATERIAL_AMOUNT * 2, /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/rna_extractor
category = list(
- RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL + RND_SUBCATEGORY_EQUIPMENT_SCIENCE,
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL
@@ -45,5 +54,7 @@
desc = "The MRNA Recombinator is one of Nanotrasens most advanced technologies and allows the exact recombination of virus RNA."
id = "rna_recombinator"
build_path = /obj/item/circuitboard/machine/rna_recombinator
- category = list(RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_RESEARCH)
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_RESEARCH,
+ )
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL
diff --git a/modular_skyrat/modules/paycheck_rations/code/reagents.dm b/modular_skyrat/modules/paycheck_rations/code/reagents.dm
index eefcce274af..c2649fe289b 100644
--- a/modular_skyrat/modules/paycheck_rations/code/reagents.dm
+++ b/modular_skyrat/modules/paycheck_rations/code/reagents.dm
@@ -33,6 +33,12 @@
icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi'
list_reagents = list(/datum/reagent/consumable/soymilk = 15)
+/obj/item/reagent_containers/condiment/milk/small_ration
+ name = "small milk"
+ desc = "It's milk. White and nutritious goodness! This one is significantly smaller than normal cartons; just enough to make some cheese with."
+ icon = 'modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi'
+ list_reagents = list(/datum/reagent/consumable/milk = 15)
+
/obj/item/reagent_containers/cup/glass/bottle/small/tiny
name = "tiny glass bottle"
volume = 10
diff --git a/modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi b/modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi
index e87a6a9cb58..70bc6082b7a 100644
Binary files a/modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi and b/modular_skyrat/modules/paycheck_rations/icons/food_containers.dmi differ
diff --git a/modular_skyrat/modules/polarized_windows/polarizer.dm b/modular_skyrat/modules/polarized_windows/polarizer.dm
index 351815dd102..fbfd4ba119e 100644
--- a/modular_skyrat/modules/polarized_windows/polarizer.dm
+++ b/modular_skyrat/modules/polarized_windows/polarizer.dm
@@ -51,7 +51,10 @@
name = "Window Polarization Remote Controller"
id = "polarizer"
build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE | COLONY_FABRICATOR
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/glass = SMALL_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/assembly/control/polarizer
category = list(
RND_CATEGORY_INITIAL,
diff --git a/modular_skyrat/modules/primitive_cooking_additions/code/big_mortar.dm b/modular_skyrat/modules/primitive_cooking_additions/code/big_mortar.dm
index 0ee1202ef72..4860aed6331 100644
--- a/modular_skyrat/modules/primitive_cooking_additions/code/big_mortar.dm
+++ b/modular_skyrat/modules/primitive_cooking_additions/code/big_mortar.dm
@@ -11,7 +11,9 @@
max_integrity = 100
pass_flags = PASSTABLE
resistance_flags = FLAMMABLE
- custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 10)
+ custom_materials = list(
+ /datum/material/wood = SHEET_MATERIAL_AMOUNT * 10,
+ )
/// The maximum number of items this structure can store
var/maximum_contained_items = 10
diff --git a/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm b/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm
index 70404fadbb1..9a028936f1e 100644
--- a/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm
+++ b/modular_skyrat/modules/primitive_cooking_additions/code/millstone.dm
@@ -10,7 +10,9 @@
anchored = TRUE
max_integrity = 200
pass_flags = PASSTABLE
- custom_materials = list(/datum/material/stone = SHEET_MATERIAL_AMOUNT * 6)
+ custom_materials = list(
+ /datum/material/stone = SHEET_MATERIAL_AMOUNT * 6,
+ )
drag_slowdown = 2
/// The maximum number of items this structure can store
var/maximum_contained_items = 10
diff --git a/modular_skyrat/modules/primitive_production/code/glassblowing.dm b/modular_skyrat/modules/primitive_production/code/glassblowing.dm
index 3898b4f25de..8dcc4f3cd3a 100644
--- a/modular_skyrat/modules/primitive_production/code/glassblowing.dm
+++ b/modular_skyrat/modules/primitive_production/code/glassblowing.dm
@@ -13,7 +13,9 @@
desc = "A glass bowl that is capable of carrying things."
icon_state = "glass_globe"
material_flags = MATERIAL_COLOR
- custom_materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT)
+ custom_materials = list(
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ )
/datum/export/glassblowing
cost = CARGO_CRATE_VALUE * 5
diff --git a/modular_skyrat/modules/resleeving/code/research/resleeving_research.dm b/modular_skyrat/modules/resleeving/code/research/resleeving_research.dm
index 4dcd00cc73e..9579341947d 100644
--- a/modular_skyrat/modules/resleeving/code/research/resleeving_research.dm
+++ b/modular_skyrat/modules/resleeving/code/research/resleeving_research.dm
@@ -4,7 +4,9 @@
id = "rsd_interface"
build_type = PROTOLATHE | AWAY_LATHE
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE
- category = list(RND_CATEGORY_EQUIPMENT)
+ category = list(
+ RND_CATEGORY_EQUIPMENT,
+ )
materials = list(
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 0.5,
/datum/material/gold = SHEET_MATERIAL_AMOUNT,
diff --git a/modular_skyrat/modules/salon/code/hair_tie.dm b/modular_skyrat/modules/salon/code/hair_tie.dm
index 7276071e4eb..2b490ec749b 100644
--- a/modular_skyrat/modules/salon/code/hair_tie.dm
+++ b/modular_skyrat/modules/salon/code/hair_tie.dm
@@ -30,7 +30,7 @@
name = "colorful hair tie"
desc = "An elastic hair tie, adornished with colorful plastic beads."
icon_state = "hairtie_beads"
- custom_materials = (list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT * 5))
+ custom_materials = (list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT))
/obj/item/clothing/head/hair_tie/syndicate
name = "\improper Syndicate hair tie"
@@ -138,10 +138,12 @@
name = "Plastic Hair Tie"
id = "plastic_hair_tie"
build_type = PROTOLATHE | AWAY_LATHE | AUTOLATHE | COLONY_FABRICATOR
- materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/clothing/head/hair_tie/plastic_beads
category = list(
- RND_CATEGORY_INITIAL,
+ RND_CATEGORY_INITIAL,
RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE,
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
diff --git a/modular_skyrat/modules/shotgunrebalance/code/autolathe_design.dm b/modular_skyrat/modules/shotgunrebalance/code/autolathe_design.dm
index a45c5df389d..3d097fe6f97 100644
--- a/modular_skyrat/modules/shotgunrebalance/code/autolathe_design.dm
+++ b/modular_skyrat/modules/shotgunrebalance/code/autolathe_design.dm
@@ -3,15 +3,23 @@
name = "Shotgun Slug"
id = "shotgun_slug"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ )
build_path = /obj/item/ammo_casing/shotgun
- category = list(RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ category = list(
+ RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
/datum/design/shotgun_slug/sec
id = "sec_shotgun_slug"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
- category = list(RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
autolathe_exportable = FALSE
@@ -19,40 +27,64 @@
name = "Buckshot Shell"
id = "buckshot_shell"
build_type = AUTOLATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ )
build_path = /obj/item/ammo_casing/shotgun/buckshot
- category = list(RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ category = list(
+ RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
/datum/design/buckshot_shell/sec
id = "sec_buckshot_shell"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
- category = list(RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
+ )
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
autolathe_exportable = FALSE
//Existing Designs Discounting
/datum/design/rubbershot
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ )
/datum/design/rubbershot/sec
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ )
/datum/design/beanbag_slug
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ )
/datum/design/beanbag_slug/sec
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ )
/datum/design/shotgun_dart
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ )
/datum/design/shotgun_dart/sec
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ )
/datum/design/incendiary_slug
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ )
/datum/design/incendiary_slug/sec
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ )
diff --git a/modular_skyrat/modules/space_vines/scythes.dm b/modular_skyrat/modules/space_vines/scythes.dm
index 3fe17ad3bae..a5011fdc6b0 100644
--- a/modular_skyrat/modules/space_vines/scythes.dm
+++ b/modular_skyrat/modules/space_vines/scythes.dm
@@ -63,15 +63,23 @@
desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
id = "scythet1"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/scythe/tier1
- category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_BOTANY)
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_BOTANY,
+ )
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
/datum/design/scythe/tier2
name = "Scythe (Tier 2)"
id = "scythet2"
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ )
build_path = /obj/item/scythe/tier2
/datum/techweb_node/scythe_t1
diff --git a/modular_skyrat/modules/stasisrework/code/medical_designs.dm b/modular_skyrat/modules/stasisrework/code/medical_designs.dm
index 7ced4d0daf4..322af325716 100644
--- a/modular_skyrat/modules/stasisrework/code/medical_designs.dm
+++ b/modular_skyrat/modules/stasisrework/code/medical_designs.dm
@@ -3,9 +3,15 @@
desc = "A stasis body bag, powered by cryogenic stasis technology. It can hold only one body, but it prevents decay."
id = "stasisbag"
build_type = PROTOLATHE | AWAY_LATHE
- materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/plasma = SHEET_MATERIAL_AMOUNT, /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT)
build_path = /obj/item/bodybag/stasis
- category = list(RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL)
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/plasma = SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MEDICAL,
+ )
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SCIENCE
/datum/design/board/stasissleeper
@@ -13,5 +19,7 @@
desc = "The circuit board for a Stasis Unit"
id = "stasissleeper"
build_path = /obj/item/circuitboard/machine/stasissleeper
- category = list(RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_MEDICAL)
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_MEDICAL,
+ )
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
diff --git a/modular_skyrat/modules/stone/code/stone.dm b/modular_skyrat/modules/stone/code/stone.dm
index 60b18ad1f44..21fb7c952b8 100644
--- a/modular_skyrat/modules/stone/code/stone.dm
+++ b/modular_skyrat/modules/stone/code/stone.dm
@@ -79,7 +79,7 @@ GLOBAL_LIST_INIT(stone_recipes, list ( \
inhand_icon_state = "tile"
turf_type = /turf/open/floor/stone
mineralType = "stone"
- mats_per_unit = list(/datum/material/stone= SMALL_MATERIAL_AMOUNT * 5)
+ mats_per_unit = list(/datum/material/stone= HALF_SHEET_MATERIAL_AMOUNT)
merge_type = /obj/item/stack/tile/mineral/stone
/turf/open/floor/stone
@@ -96,7 +96,9 @@ GLOBAL_LIST_INIT(stone_recipes, list ( \
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = SMOOTH_GROUP_STONE_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
canSmoothWith = SMOOTH_GROUP_STONE_WALLS
- custom_materials = list(/datum/material/stone = SHEET_MATERIAL_AMOUNT * 2)
+ custom_materials = list(
+ /datum/material/stone = SHEET_MATERIAL_AMOUNT * 2,
+ )
/turf/closed/wall/mineral/stone/try_decon(obj/item/item_used, mob/user) // Lets you break down stone walls with stone breaking tools
if(item_used.tool_behaviour != TOOL_MINING)
@@ -121,7 +123,9 @@ GLOBAL_LIST_INIT(stone_recipes, list ( \
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = SMOOTH_GROUP_STONE_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
canSmoothWith = SMOOTH_GROUP_STONE_WALLS
- custom_materials = list(/datum/material/stone = SHEET_MATERIAL_AMOUNT * 2) // Does this even need materials?
+ custom_materials = list(
+ /datum/material/stone = SHEET_MATERIAL_AMOUNT * 2,
+ )
/obj/structure/falsewall/stone
name = "stone wall"
diff --git a/modular_skyrat/modules/synths/code/bodyparts/ears.dm b/modular_skyrat/modules/synths/code/bodyparts/ears.dm
index 841a69f9d58..904c103c392 100644
--- a/modular_skyrat/modules/synths/code/bodyparts/ears.dm
+++ b/modular_skyrat/modules/synths/code/bodyparts/ears.dm
@@ -38,8 +38,8 @@
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
construction_time = 4 SECONDS
materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 5,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5,
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
)
build_path = /obj/item/organ/internal/ears/synth
category = list(
diff --git a/modular_skyrat/modules/synths/code/bodyparts/eyes.dm b/modular_skyrat/modules/synths/code/bodyparts/eyes.dm
index 82e32b918f6..afa938dfdd8 100644
--- a/modular_skyrat/modules/synths/code/bodyparts/eyes.dm
+++ b/modular_skyrat/modules/synths/code/bodyparts/eyes.dm
@@ -26,8 +26,8 @@
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
construction_time = 4 SECONDS
materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 5,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5,
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
)
build_path = /obj/item/organ/internal/eyes/synth
category = list(
diff --git a/modular_skyrat/modules/synths/code/bodyparts/heart.dm b/modular_skyrat/modules/synths/code/bodyparts/heart.dm
index a17d99be2d7..f7c50fe602c 100644
--- a/modular_skyrat/modules/synths/code/bodyparts/heart.dm
+++ b/modular_skyrat/modules/synths/code/bodyparts/heart.dm
@@ -34,8 +34,8 @@
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
construction_time = 4 SECONDS
materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 5,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5,
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
)
build_path = /obj/item/organ/internal/heart/synth
category = list(
diff --git a/modular_skyrat/modules/synths/code/bodyparts/liver.dm b/modular_skyrat/modules/synths/code/bodyparts/liver.dm
index cd0f6bae037..5affa0f6ad6 100644
--- a/modular_skyrat/modules/synths/code/bodyparts/liver.dm
+++ b/modular_skyrat/modules/synths/code/bodyparts/liver.dm
@@ -34,8 +34,8 @@
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
construction_time = 4 SECONDS
materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 5,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5,
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
)
build_path = /obj/item/organ/internal/liver/synth
category = list(
diff --git a/modular_skyrat/modules/synths/code/bodyparts/lungs.dm b/modular_skyrat/modules/synths/code/bodyparts/lungs.dm
index 69ff9d0dfcf..f972480f712 100644
--- a/modular_skyrat/modules/synths/code/bodyparts/lungs.dm
+++ b/modular_skyrat/modules/synths/code/bodyparts/lungs.dm
@@ -39,8 +39,8 @@
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
construction_time = 4 SECONDS
materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 5,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5,
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
)
build_path = /obj/item/organ/internal/lungs/synth
category = list(
diff --git a/modular_skyrat/modules/synths/code/bodyparts/stomach.dm b/modular_skyrat/modules/synths/code/bodyparts/stomach.dm
index a8dfb30521e..80ba4fa5223 100644
--- a/modular_skyrat/modules/synths/code/bodyparts/stomach.dm
+++ b/modular_skyrat/modules/synths/code/bodyparts/stomach.dm
@@ -38,8 +38,8 @@
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
construction_time = 4 SECONDS
materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 5,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5,
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
)
build_path = /obj/item/organ/internal/stomach/synth
category = list(
diff --git a/modular_skyrat/modules/synths/code/bodyparts/tongue.dm b/modular_skyrat/modules/synths/code/bodyparts/tongue.dm
index 1d64febe161..f181b07e284 100644
--- a/modular_skyrat/modules/synths/code/bodyparts/tongue.dm
+++ b/modular_skyrat/modules/synths/code/bodyparts/tongue.dm
@@ -28,8 +28,8 @@
build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
construction_time = 4 SECONDS
materials = list(
- /datum/material/iron = SMALL_MATERIAL_AMOUNT * 5,
- /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5,
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
)
build_path = /obj/item/organ/internal/tongue/synth
category = list(
diff --git a/modular_skyrat/modules/tagline/code/world.dm b/modular_skyrat/modules/tagline/code/world.dm
index f158b310640..1e3e74c783e 100644
--- a/modular_skyrat/modules/tagline/code/world.dm
+++ b/modular_skyrat/modules/tagline/code/world.dm
@@ -2,39 +2,33 @@
var/list/features = list()
- var/s = ""
+ var/new_status = ""
var/hostedby
if(config)
var/server_name = CONFIG_GET(string/servername)
if (server_name)
- s += "[server_name] — "
+ new_status += "[server_name] — "
hostedby = CONFIG_GET(string/hostedby)
- s += " ("
- s += ""
- s += "Discord"
- s += ")\]"
- s += "
[CONFIG_GET(string/servertagline)]
"
+ new_status += " ("
+ new_status += ""
+ new_status += "Discord"
+ new_status += ")\]"
+ new_status += "
[CONFIG_GET(string/servertagline)]
"
- var/n = 0
- for (var/mob/M in GLOB.player_list)
- if (M.client)
- n++
+ var/players = GLOB.clients.len
if(SSmapping.config)
features += "[SSmapping.config.map_name]"
- if (n > 1)
- features += "~[n] players"
- else if (n > 0)
- features += "~[n] player"
+ features += "~[players] player[players == 1 ? "": "s"]"
if (!host && hostedby)
features += "hosted by [hostedby]"
- if (features)
- s += "\[[jointext(features, ", ")]"
+ if(length(features))
+ new_status += "\[[jointext(features, ", ")]"
- status = s
+ status = new_status
diff --git a/modular_skyrat/modules/time_clock/code/console.dm b/modular_skyrat/modules/time_clock/code/console.dm
index 0305045c511..2d4891366a1 100644
--- a/modular_skyrat/modules/time_clock/code/console.dm
+++ b/modular_skyrat/modules/time_clock/code/console.dm
@@ -202,6 +202,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/time_clock, 28)
icon_state = "unanchoredstatusdisplay"
result_path = /obj/machinery/time_clock
pixel_shift = 28
- custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2)
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
+ )
#undef CLOCK_IN_COOLDOWN
diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm
index 9147ecec1e4..fb9b5d14399 100644
--- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm
+++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm
@@ -6,10 +6,15 @@
/datum/design/xenoarch
build_type = PROTOLATHE | AWAY_LATHE
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ )
/datum/design/xenoarch/tool
- category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_XENOARCH)
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_XENOARCH,
+ )
/datum/design/xenoarch/tool/hammer
desc = "A hammer that can slowly remove debris on strange rocks."
@@ -68,8 +73,15 @@
build_path = /obj/item/xenoarch/handheld_scanner
/datum/design/xenoarch/tool/advanced
- category = list(RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_XENOARCH_ADVANCED)
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 5, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ )
+ category = list(
+ RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_XENOARCH_ADVANCED,
+ )
+
/datum/design/xenoarch/tool/advanced/scanner
name = "Xenoarch Advanced Handheld Scanner"
@@ -80,7 +92,10 @@
name = "Xenoarch Handheld Recoverer"
desc = "A device with the capabilities to recover items lost due to time."
id = "xenoarch_handrecoverer"
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ )
// rebalance material req after first repath/categorization?
build_path = /obj/item/xenoarch/handheld_recoverer
@@ -99,7 +114,9 @@
/datum/design/xenoarch/equipment
// everything under this except the adv bag feels redundant because cloth/leather are there too
// but i guess we'll burn that bridge another time
- category = list(RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_XENOARCH)
+ category = list(
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_XENOARCH,
+ )
/datum/design/xenoarch/equipment/bag
name = "Xenoarchaeology Bag"
@@ -117,12 +134,18 @@
name = "Advanced Xenoarch Bag"
desc = "A bag that can hold about fifty strange rocks."
id = "xenoarch_bag_adv"
- materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 5, /datum/material/diamond = SMALL_MATERIAL_AMOUNT * 5)
+ materials = list(
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/diamond = HALF_SHEET_MATERIAL_AMOUNT,
+ )
// i kinda hate how this requires diamond, but this is supposed to be a fix pr, burn the gbp on it later
build_path = /obj/item/storage/bag/xenoarch/adv
/datum/design/board/xenoarch
- category = list(RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_XENOARCH)
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_XENOARCH,
+ )
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
/datum/design/board/xenoarch/researcher
diff --git a/tgstation.dme b/tgstation.dme
index 43b62e37efb..3fc948f7220 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6648,12 +6648,14 @@
#include "modular_skyrat\modules\better_vox\code\vox_clothing.dm"
#include "modular_skyrat\modules\better_vox\code\vox_species.dm"
#include "modular_skyrat\modules\better_vox\code\vox_sprite_accessories.dm"
+#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\area.dm"
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\choice_beacon.dm"
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\disk.dm"
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\fluff.dm"
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\fog_of_war.dm"
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\ghost_spawner.dm"
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\iv_drip.dm"
+#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\mapping_helpers.dm"
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\mine.dm"
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\mobs.dm"
#include "modular_skyrat\modules\bitrunning\code\virtual_domains\ancient_milsim\mod.dm"
@@ -6837,6 +6839,9 @@
#include "modular_skyrat\modules\colony_fabricator\code\looping_sounds.dm"
#include "modular_skyrat\modules\colony_fabricator\code\repacking_element.dm"
#include "modular_skyrat\modules\colony_fabricator\code\appliances\chem_machines.dm"
+#include "modular_skyrat\modules\colony_fabricator\code\appliances\co2_cracker.dm"
+#include "modular_skyrat\modules\colony_fabricator\code\appliances\foodricator.dm"
+#include "modular_skyrat\modules\colony_fabricator\code\appliances\recycler.dm"
#include "modular_skyrat\modules\colony_fabricator\code\appliances\wall_cell_charger.dm"
#include "modular_skyrat\modules\colony_fabricator\code\appliances\wind_turbine.dm"
#include "modular_skyrat\modules\colony_fabricator\code\construction\doors.dm"
@@ -6854,6 +6859,11 @@
#include "modular_skyrat\modules\colony_fabricator\code\design_datums\fabricator_flag_additions\machine_boards.dm"
#include "modular_skyrat\modules\colony_fabricator\code\design_datums\fabricator_flag_additions\stock_parts.dm"
#include "modular_skyrat\modules\colony_fabricator\code\design_datums\fabricator_flag_additions\tools.dm"
+#include "modular_skyrat\modules\colony_fabricator\code\design_datums\rations_printer_designs\ingredients.dm"
+#include "modular_skyrat\modules\colony_fabricator\code\design_datums\rations_printer_designs\reagents.dm"
+#include "modular_skyrat\modules\colony_fabricator\code\design_datums\rations_printer_designs\seeds.dm"
+#include "modular_skyrat\modules\colony_fabricator\code\design_datums\rations_printer_designs\snacks.dm"
+#include "modular_skyrat\modules\colony_fabricator\code\design_datums\rations_printer_designs\utensils.dm"
#include "modular_skyrat\modules\colony_fabricator\code\machines\arc_furnace.dm"
#include "modular_skyrat\modules\colony_fabricator\code\machines\ore_silo.dm"
#include "modular_skyrat\modules\colony_fabricator\code\machines\power_storage_unit.dm"