Merge branch 'master' of https://github.com/goonstation/goonstation

Coll6 · Dec 3, 2024 · ea8108a · ea8108a
2 parents 3072a79 + 0ed34c0
commit ea8108a
Show file tree

Hide file tree

Showing 21 changed files with 333 additions and 54 deletions.
diff --git a/+secret b/+secret
diff --git a/_std/packets.dm b/_std/packets.dm
@@ -78,6 +78,6 @@ proc/get_radio_connection_by_id(atom/movable/AM, id)
 #define FREQ_TRACKING_IMPLANT 1451
 #define FREQ_MARIONETTE_IMPLANT 1153
 #define FREQ_POWER_SYSTEMS 1473 // for services that interface with power machinery
-
+#define FREQ_ARMORY 1461
 // Address Tags
 #define ADDRESS_TAG_POWER "POWER_CONTROL" // for syncing variables and data with power_checker
diff --git a/assets/maps/random_rooms/3x5/enginetest.dmm b/assets/maps/random_rooms/3x5/enginetest.dmm
@@ -1,27 +1,27 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/turf/simulated/floor/airless/caution/east,
+/turf/simulated/floor/caution/east,
 /area/dmm_suite/clear_area)
 "e" = (
 /obj/table/auto,
 /obj/machinery/computer3/generic/personal,
-/turf/simulated/floor/airless/caution/corner/ne,
+/turf/simulated/floor/caution/corner/ne,
 /area/dmm_suite/clear_area)
 "f" = (
-/turf/simulated/floor/airless/caution/west,
+/turf/simulated/floor/caution/west,
 /area/dmm_suite/clear_area)
 "m" = (
 /obj/decal/cleanable/dirt/dirt5,
-/turf/simulated/floor/airless/caution/west,
+/turf/simulated/floor/caution/west,
 /area/dmm_suite/clear_area)
 "p" = (
 /obj/stool/chair/office,
 /obj/decal/cleanable/dirt/dirt2,
-/turf/simulated/floor/airless/caution/east,
+/turf/simulated/floor/caution/east,
 /area/dmm_suite/clear_area)
 "s" = (
 /obj/fakeobject/shuttleweapon/base,
-/turf/simulated/floor/airless/caution/corner,
+/turf/simulated/floor,
 /area/dmm_suite/clear_area)
 "v" = (
 /obj/item/paper/safehouse/delivery_note{
@@ -31,37 +31,37 @@
 	},
 /obj/decal/cleanable/dirt/dirt3,
 /obj/fakeobject/lightbulb_broken,
-/turf/simulated/floor/airless/caution/corner/sw,
+/turf/simulated/floor/caution/corner/sw,
 /area/dmm_suite/clear_area)
 "y" = (
 /obj/storage/closet/radiation,
-/turf/simulated/floor/airless/caution/corner/nw,
+/turf/simulated/floor/caution/corner/nw,
 /area/dmm_suite/clear_area)
 "z" = (
 /obj/decal/cleanable/blood/gibs,
 /obj/machinery/light/emergency,
 /obj/fakeobject/lightbulb_broken,
-/turf/simulated/floor/airless/caution/corner/se,
+/turf/simulated/floor/caution/corner/se,
 /area/dmm_suite/clear_area)
 "C" = (
 /obj/fakeobject/skeleton/decomposed_corpse,
 /obj/decal/cleanable/dirt/jen,
-/turf/simulated/floor/airless/caution/south,
+/turf/simulated/floor/caution/south,
 /area/dmm_suite/clear_area)
 "F" = (
 /obj/fakeobject/shuttlethruster,
-/turf/simulated/floor/airless/caution/corner,
+/turf/simulated/floor,
 /area/dmm_suite/clear_area)
 "G" = (
-/turf/simulated/floor/airless/caution/north,
+/turf/simulated/floor/caution/north,
 /area/dmm_suite/clear_area)
 "P" = (
 /obj/machinery/light/emergency,
-/turf/simulated/floor/airless/caution/corner,
+/turf/simulated/floor,
 /area/dmm_suite/clear_area)
 "V" = (
 /obj/decal/cleanable/dirt/jen,
-/turf/simulated/floor/airless/caution/west,
+/turf/simulated/floor/caution/west,
 /area/dmm_suite/clear_area)
 
 (1,1,1) = {"

diff --git a/assets/maps/random_rooms/3x5/fishingtrip.dmm b/assets/maps/random_rooms/3x5/fishingtrip.dmm
@@ -13,20 +13,20 @@
 	pixel_y = -11;
 	pixel_x = 8
 	},
-/turf/unsimulated/floor/setpieces/swampgrass,
+/turf/simulated/floor/swampgrass,
 /area/space)
 "h" = (
 /obj/machinery/light/incandescent,
 /turf/simulated/floor/blue,
 /area/space)
 "i" = (
-/turf/simulated/floor/airless/stairs/wood2,
+/turf/simulated/floor/stairs/wood2,
 /area/space)
 "o" = (
 /obj/machinery/light/incandescent{
 	dir = 1
 	},
-/turf/unsimulated/floor/setpieces/swampgrass,
+/turf/simulated/floor/swampgrass,
 /area/space)
 "t" = (
 /obj/item/fishing_rod/basic{
@@ -41,7 +41,7 @@
 	pixel_y = -5;
 	pixel_x = 12
 	},
-/turf/unsimulated/floor/wood,
+/turf/simulated/floor/wood,
 /area/space)
 "w" = (
 /obj/decal/cleanable/paper,
@@ -56,20 +56,20 @@
 	pixel_y = 3;
 	pixel_x = 8
 	},
-/turf/unsimulated/floor/setpieces/swampgrass,
+/turf/simulated/floor/swampgrass,
 /area/space)
 "E" = (
-/turf/unsimulated/floor/setpieces/swampgrass,
+/turf/simulated/floor/swampgrass,
 /area/space)
 "I" = (
-/turf/unsimulated/floor/setpieces/swampgrass_edging,
+/turf/simulated/floor/swampgrass_edging,
 /area/space)
 "Q" = (
 /obj/storage/crate/freezer{
 	desc = "A cooler to keep your fresh catches in.";
 	name = "cooler"
 	},
-/turf/unsimulated/floor/setpieces/swampgrass,
+/turf/simulated/floor/swampgrass,
 /area/space)
 "R" = (
 /turf/simulated/floor/twotone/blue,
@@ -85,7 +85,7 @@
 	pixel_y = -6;
 	pixel_x = -12
 	},
-/turf/unsimulated/floor/wood,
+/turf/simulated/floor/wood,
 /area/space)
 
 (1,1,1) = {"

diff --git a/assets/maps/random_rooms/3x5/openmic.dmm b/assets/maps/random_rooms/3x5/openmic.dmm
@@ -8,7 +8,7 @@
 /obj/item/reagent_containers/food/snacks/plant/tomato,
 /obj/item/reagent_containers/food/snacks/plant/tomato,
 /obj/item/kitchen/food_box/egg_box,
-/turf/simulated/floor/airless/damaged2,
+/turf/simulated/floor/damaged2,
 /area/dmm_suite/clear_area)
 "c" = (
 /obj/decal/cleanable/dirt/jen,

diff --git a/assets/maps/random_rooms/5x3/borglounge.dmm b/assets/maps/random_rooms/5x3/borglounge.dmm
@@ -1,29 +1,29 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/turf/simulated/floor/airless/grime,
+/turf/simulated/floor/grime,
 /area/dmm_suite/clear_area)
 "f" = (
 /obj/stool/chair/couch{
 	dir = 8
 	},
-/turf/simulated/floor/airless/grime,
+/turf/simulated/floor/grime,
 /area/dmm_suite/clear_area)
 "h" = (
 /obj/machinery/vending/standard,
 /obj/machinery/light/small{
 	dir = 1;
 	pixel_y = 21
 	},
-/turf/simulated/floor/airless/grime,
+/turf/simulated/floor/grime,
 /area/dmm_suite/clear_area)
 "j" = (
 /obj/machinery/recharge_station,
-/turf/simulated/floor/airless/grime,
+/turf/simulated/floor/grime,
 /area/dmm_suite/clear_area)
 "m" = (
 /obj/storage/crate/loot,
 /obj/random_item_spawner/tools/some,
-/turf/simulated/floor/airless/grime,
+/turf/simulated/floor/grime,
 /area/dmm_suite/clear_area)
 "p" = (
 /obj/stool/chair/couch{
@@ -37,19 +37,19 @@
 	dir = 1;
 	pixel_y = 21
 	},
-/turf/simulated/floor/airless/grime,
+/turf/simulated/floor/grime,
 /area/dmm_suite/clear_area)
 "r" = (
 /obj/storage/crate/loot,
 /obj/item/weldingtool,
 /obj/random_item_spawner/tools/maybe_few,
-/turf/simulated/floor/airless/grime,
+/turf/simulated/floor/grime,
 /area/dmm_suite/clear_area)
 "C" = (
 /obj/item/storage/secure/ssafe/loot{
 	pixel_y = 32
 	},
-/turf/simulated/floor/airless/grime,
+/turf/simulated/floor/grime,
 /area/dmm_suite/clear_area)
 
 (1,1,1) = {"

diff --git a/assets/maps/random_rooms/5x3/crimepodbay_70.dmm b/assets/maps/random_rooms/5x3/crimepodbay_70.dmm
@@ -6,7 +6,7 @@
 /obj/item/clothing/mask/breath,
 /obj/item/tank/air,
 /obj/item/device/light/flashlight,
-/turf/simulated/floor/airless/caution/south,
+/turf/simulated/floor/caution/south,
 /area/dmm_suite/clear_area)
 "d" = (
 /obj/cable/black{

diff --git a/assets/maps/random_rooms/5x3/laundromat.dmm b/assets/maps/random_rooms/5x3/laundromat.dmm
@@ -6,7 +6,7 @@
 /area/dmm_suite/clear_area)
 "b" = (
 /obj/decal/cleanable/dirt/dirt3,
-/turf/simulated/floor/airless/plating,
+/turf/simulated/floor/plating,
 /area/dmm_suite/clear_area)
 "g" = (
 /obj/decal/cleanable/dirt/dirt2,
@@ -24,7 +24,7 @@
 /area/dmm_suite/clear_area)
 "L" = (
 /obj/decal/cleanable/dirt/dirt5,
-/turf/simulated/floor/airless/plating,
+/turf/simulated/floor/plating,
 /area/dmm_suite/clear_area)
 "M" = (
 /obj/fakeobject/lighttube_broken{
@@ -37,12 +37,12 @@
 	pixel_y = 3
 	},
 /obj/item/raw_material/scrap_metal,
-/turf/simulated/floor/airless/plating,
+/turf/simulated/floor/plating,
 /area/dmm_suite/clear_area)
 "R" = (
 /obj/submachine/laundry_machine,
 /obj/item/clothing/under/misc/bandshirt,
-/turf/simulated/floor/airless/black,
+/turf/simulated/floor/black,
 /area/dmm_suite/clear_area)
 "V" = (
 /obj/submachine/laundry_machine,
@@ -55,12 +55,12 @@
 /obj/machinery/light_switch/north{
 	pixel_x = 13
 	},
-/turf/simulated/floor/airless/black,
+/turf/simulated/floor/black,
 /area/dmm_suite/clear_area)
 "W" = (
 /obj/submachine/laundry_machine,
 /obj/decal/cleanable/cobweb,
-/turf/simulated/floor/airless/black,
+/turf/simulated/floor/black,
 /area/dmm_suite/clear_area)
 "X" = (
 /obj/item/cloth/towel/white{

diff --git a/assets/maps/random_rooms/5x3/plushbridge.dmm b/assets/maps/random_rooms/5x3/plushbridge.dmm
@@ -8,7 +8,7 @@
 	pixel_y = -1;
 	pixel_x = -3
 	},
-/turf/simulated/floor/airless/blue/corner{
+/turf/simulated/floor/blue/corner{
 	dir = 4
 	},
 /area/dmm_suite/clear_area)
@@ -83,7 +83,7 @@
 	pixel_y = 34;
 	pixel_x = -7
 	},
-/turf/simulated/floor/airless/blue/side,
+/turf/simulated/floor/blue/side,
 /area/dmm_suite/clear_area)
 "J" = (
 /obj/table/wood,
@@ -99,7 +99,7 @@
 /obj/decal/cleanable/cobweb{
 	layer = 14
 	},
-/turf/simulated/floor/airless/blue/corner,
+/turf/simulated/floor/blue/corner,
 /area/dmm_suite/clear_area)
 "N" = (
 /obj/table/wood,
@@ -157,7 +157,7 @@
 /turf/simulated/floor/carpet/blue/fancy/edge/south,
 /area/dmm_suite/clear_area)
 "X" = (
-/turf/simulated/floor/airless/blue/side{
+/turf/simulated/floor/blue/side{
 	dir = 4
 	},
 /area/dmm_suite/clear_area)
@@ -166,7 +166,7 @@
 /obj/machinery/light/small{
 	pixel_y = -5
 	},
-/turf/simulated/floor/airless/blue/side{
+/turf/simulated/floor/blue/side{
 	dir = 1
 	},
 /area/dmm_suite/clear_area)