Merge branch 'Fluffy-Frontier:master' into NTpolice

Fluffy-Frontier · Mar 23, 2024 · 5419de6 · 5419de6
2 parents 37e98d8 + 9aba8d1
commit 5419de6
Show file tree

Hide file tree

Showing 327 changed files with 7,333 additions and 1,586 deletions.
diff --git a/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm b/_maps/RandomRuins/IceRuins/fluffy/icemoon_interdyne_base_ff.dmm
diff --git a/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm b/_maps/RandomRuins/LavaRuins/fluffy/lavaland_interdyne_base_ff.dmm
diff --git a/_maps/RandomRuins/SpaceRuins/nova/piratefort.dmm b/_maps/RandomRuins/SpaceRuins/nova/piratefort.dmm
@@ -281,7 +281,7 @@
 /turf/open/floor/carpet,
 /area/ruin/space/has_grav/powered)
 "kb" = (
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "kh" = (
 /obj/structure/safe,
@@ -433,7 +433,7 @@
 /turf/closed/wall/r_wall/syndicate/nodiagonal,
 /area/ruin/space/has_grav/powered)
 "oZ" = (
-/turf/open/floor/engine,
+/turf/open/floor/engine/airless,
 /area/ruin/space)
 "pu" = (
 /mob/living/basic/trooper/syndicate/ranged{
@@ -1192,7 +1192,7 @@
 /area/ruin/space/has_grav/powered)
 "Ph" = (
 /obj/structure/marker_beacon/burgundy,
-/turf/open/floor/engine,
+/turf/open/floor/engine/airless,
 /area/ruin/space)
 "Qc" = (
 /obj/effect/turf_decal/trimline/dark_red/filled/corner{
@@ -1282,7 +1282,7 @@
 /area/ruin/space/has_grav/powered)
 "TK" = (
 /mob/living/basic/trooper/pirate/ranged/space,
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "TO" = (
 /obj/machinery/door/airlock/vault{
@@ -1361,7 +1361,7 @@
 /area/ruin/space/has_grav/powered)
 "VI" = (
 /mob/living/basic/trooper/pirate/melee/space,
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "VL" = (
 /mob/living/basic/trooper/pirate/melee,

diff --git a/_maps/RandomRuins/SpaceRuins/nova/syndibase.dmm b/_maps/RandomRuins/SpaceRuins/nova/syndibase.dmm
@@ -12,7 +12,7 @@
 /turf/open/floor/iron/dark,
 /area/ruin/space/has_grav/powered)
 "aZ" = (
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space)
 "be" = (
 /obj/effect/spawner/random/trash/bin,
@@ -57,10 +57,10 @@
 /area/ruin/space/has_grav/powered)
 "dY" = (
 /obj/structure/chair/sofa/corp/left,
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space/has_grav/powered)
 "ei" = (
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space/has_grav/powered)
 "eo" = (
 /obj/machinery/atmospherics/components/tank/air{
@@ -92,7 +92,7 @@
 /area/ruin/space/has_grav/powered)
 "hE" = (
 /mob/living/basic/trooper/syndicate/ranged/space/anthro/cat,
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space/has_grav/powered)
 "if" = (
 /mob/living/basic/trooper/syndicate/ranged,
@@ -167,7 +167,7 @@
 /area/ruin/space/has_grav/powered)
 "pL" = (
 /obj/structure/table/reinforced,
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space/has_grav/powered)
 "qo" = (
 /obj/structure/table/reinforced,
@@ -189,7 +189,7 @@
 /area/ruin/space/has_grav/powered)
 "tD" = (
 /obj/structure/chair/sofa/corp/right,
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space/has_grav/powered)
 "tH" = (
 /obj/structure/table/reinforced,
@@ -271,7 +271,7 @@
 /area/ruin/space/has_grav/powered)
 "DI" = (
 /mob/living/basic/trooper/syndicate/melee/space/stormtrooper,
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space/has_grav/powered)
 "DM" = (
 /obj/structure/table/optable,
@@ -300,7 +300,7 @@
 /area/ruin/space/has_grav/powered)
 "EL" = (
 /mob/living/basic/trooper/syndicate/melee/sword/space,
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space/has_grav/powered)
 "FA" = (
 /obj/effect/spawner/random/entertainment/arcade,
@@ -387,7 +387,7 @@
 /obj/machinery/porta_turret/syndicate/energy{
 	dir = 9
 	},
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space/has_grav/powered)
 "NA" = (
 /obj/machinery/computer{
@@ -414,7 +414,7 @@
 /area/ruin/space)
 "Qt" = (
 /obj/structure/showcase/machinery/signal_decrypter,
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space/has_grav/powered)
 "Qw" = (
 /turf/closed/wall/mineral/plastitanium,
@@ -479,7 +479,7 @@
 /area/ruin/space/has_grav/powered)
 "Yw" = (
 /obj/structure/barricade/sandbags,
-/turf/open/misc/asteroid/lowpressure,
+/turf/open/misc/asteroid/airless,
 /area/ruin/space/has_grav/powered)
 "ZK" = (
 /obj/structure/fluff/empty_sleeper/syndicate{

diff --git a/_maps/map_files/Deathmatch/OSHA_Violator.dmm → _maps/deathmatch/OSHA_Violator.dmm b/_maps/map_files/Deathmatch/OSHA_Violator.dmm → _maps/deathmatch/OSHA_Violator.dmm
diff --git a/_maps/map_files/Deathmatch/starwars.dmm → _maps/deathmatch/arena_station.dmm b/_maps/map_files/Deathmatch/starwars.dmm → _maps/deathmatch/arena_station.dmm
diff --git a/_maps/map_files/Deathmatch/raidthebase.dmm → _maps/deathmatch/backalley.dmm b/_maps/map_files/Deathmatch/raidthebase.dmm → _maps/deathmatch/backalley.dmm
diff --git a/_maps/map_files/Deathmatch/instagib.dmm → _maps/deathmatch/instagib.dmm b/_maps/map_files/Deathmatch/instagib.dmm → _maps/deathmatch/instagib.dmm
diff --git a/_maps/map_files/Deathmatch/Maint_Mania.dmm → _maps/deathmatch/maint_mania.dmm b/_maps/map_files/Deathmatch/Maint_Mania.dmm → _maps/deathmatch/maint_mania.dmm
diff --git a/_maps/map_files/Deathmatch/meatower.dmm → _maps/deathmatch/meat_tower.dmm b/_maps/map_files/Deathmatch/meatower.dmm → _maps/deathmatch/meat_tower.dmm
diff --git a/_maps/map_files/Deathmatch/mech_madness.dmm → _maps/deathmatch/mech_madness.dmm b/_maps/map_files/Deathmatch/mech_madness.dmm → _maps/deathmatch/mech_madness.dmm
diff --git a/_maps/map_files/Deathmatch/The_Brig.dmm → _maps/deathmatch/meta_brig.dmm b/_maps/map_files/Deathmatch/The_Brig.dmm → _maps/deathmatch/meta_brig.dmm
diff --git a/_maps/map_files/Deathmatch/ragecage.dmm → _maps/deathmatch/ragecage.dmm b/_maps/map_files/Deathmatch/ragecage.dmm → _maps/deathmatch/ragecage.dmm
diff --git a/_maps/map_files/Deathmatch/SecuRing.dmm → _maps/deathmatch/secu_ring.dmm b/_maps/map_files/Deathmatch/SecuRing.dmm → _maps/deathmatch/secu_ring.dmm
diff --git a/...s/map_files/Deathmatch/shooting_range.dmm → _maps/deathmatch/shooting_range.dmm b/...s/map_files/Deathmatch/shooting_range.dmm → _maps/deathmatch/shooting_range.dmm
diff --git a/_maps/map_files/Deathmatch/Sniper_elite.dmm → _maps/deathmatch/sniper_elite.dmm b/_maps/map_files/Deathmatch/Sniper_elite.dmm → _maps/deathmatch/sniper_elite.dmm
diff --git a/_maps/map_files/Deathmatch/chinatown.dmm → _maps/deathmatch/sunrise.dmm b/_maps/map_files/Deathmatch/chinatown.dmm → _maps/deathmatch/sunrise.dmm
diff --git a/_maps/map_files/Deathmatch/arena.dmm → _maps/deathmatch/underground_arena.dmm b/_maps/map_files/Deathmatch/arena.dmm → _maps/deathmatch/underground_arena.dmm
diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm
@@ -1466,8 +1466,8 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/disposal/bin,
 /obj/effect/turf_decal/bot,
+/obj/machinery/disposal/bin/tagger,
 /turf/open/floor/iron/smooth,
 /area/station/command/bridge)
 "aEl" = (
@@ -11922,7 +11922,6 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
-/obj/machinery/disposal/bin,
 /obj/structure/railing{
 	dir = 10
 	},
@@ -11931,6 +11930,7 @@
 	dir = 10
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/disposal/bin/tagger,
 /turf/open/floor/plating,
 /area/station/engineering/break_room)
 "ewi" = (
@@ -18008,10 +18008,8 @@
 /area/station/hallway/primary/fore)
 "gBT" = (
 /obj/structure/window/reinforced/spawner/directional/east,
+/obj/structure/secure_safe/caps_spare,
 /obj/structure/table/glass,
-/obj/item/folder/blue{
-	pixel_y = 2
-	},
 /turf/open/floor/glass/reinforced,
 /area/station/command/bridge)
 "gCe" = (
@@ -24768,9 +24766,9 @@
 /area/station/construction/mining/aux_base)
 "iUN" = (
 /obj/structure/disposalpipe/trunk,
-/obj/machinery/disposal/bin,
 /obj/effect/turf_decal/bot,
 /obj/machinery/airalarm/directional/north,
+/obj/machinery/disposal/bin/tagger,
 /turf/open/floor/iron,
 /area/station/cargo/storage)
 "iVq" = (
@@ -35084,15 +35082,6 @@
 /area/station/maintenance/central/lesser)
 "mxa" = (
 /obj/structure/window/reinforced/spawner/directional/east,
-/obj/structure/table/glass,
-/obj/item/paper_bin{
-	pixel_x = -2;
-	pixel_y = 8
-	},
-/obj/item/pen{
-	pixel_x = -1;
-	pixel_y = 8
-	},
 /turf/open/floor/glass/reinforced,
 /area/station/command/bridge)
 "mxe" = (
@@ -40627,7 +40616,6 @@
 /area/station/hallway/primary/central/fore)
 "owZ" = (
 /obj/item/kirbyplants/organic/applebush,
-/obj/structure/secure_safe/caps_spare/directional/west,
 /turf/open/floor/iron/dark/smooth_large,
 /area/station/command/bridge)
 "oxb" = (
@@ -50925,7 +50913,7 @@
 /turf/open/misc/sandy_dirt,
 /area/station/maintenance/starboard/aft)
 "rLN" = (
-/obj/structure/safe,
+/obj/structure/safe/vault,
 /obj/item/lazarus_injector,
 /obj/effect/turf_decal/bot_white,
 /obj/effect/turf_decal/siding/thinplating_new{
@@ -57444,8 +57432,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/obj/machinery/disposal/bin,
 /obj/effect/turf_decal/bot,
+/obj/machinery/disposal/bin/tagger,
 /turf/open/floor/iron/white/side{
 	dir = 4
 	},
@@ -63482,10 +63470,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/stripes/box,
-/obj/machinery/disposal/bin{
-	desc = "A pneumatic waste disposal unit. This one leads to the morgue.";
-	name = "corpse disposal"
-	},
+/obj/machinery/disposal/bin/tagger,
 /turf/open/floor/iron/dark,
 /area/station/medical/medbay/central)
 "vLT" = (
@@ -65241,8 +65226,8 @@
 /obj/structure/disposalpipe/trunk{
 	dir = 8
 	},
-/obj/machinery/disposal/bin,
 /obj/structure/sign/poster/official/random/directional/north,
+/obj/machinery/disposal/bin/tagger,
 /turf/open/floor/iron/dark,
 /area/station/security/office)
 "woT" = (