Power Armorn't

ARF-SS13 · Jan 6, 2025 · ee3ecdb · ee3ecdb
1 parent d4bc69a
commit ee3ecdb
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 26 deletions.
diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Dungeons.dmm b/_maps/map_files/Pahrump-Sunset - Backup/Dungeons.dmm
@@ -9229,8 +9229,6 @@
 /area/f13/brotherhood/offices1st)
 "heQ" = (
 /obj/structure/rack,
-/obj/item/clothing/suit/armor/power_armor/excavator,
-/obj/item/clothing/head/helmet/f13/power_armor/excavator,
 /turf/open/floor/plasteel/dark,
 /area/f13/vault)
 "hfm" = (

diff --git a/_maps/map_files/coyote_bayou/Backup Nash/Texarkana_underground.dmm b/_maps/map_files/coyote_bayou/Backup Nash/Texarkana_underground.dmm
@@ -37320,7 +37320,6 @@
 /area/f13/building/hospital)
 "vrZ" = (
 /obj/structure/rack/shelf_metal,
-/obj/item/clothing/suit/armor/power_armor/excavator,
 /obj/effect/spawner/lootdrop/f13/uncommon,
 /obj/effect/spawner/lootdrop/f13/uncommon,
 /turf/open/indestructible/ground/inside/subway,

diff --git a/_maps/map_files/coyote_bayou/Dungeons.dmm b/_maps/map_files/coyote_bayou/Dungeons.dmm
@@ -19264,7 +19264,6 @@
 /area/f13/vault)
 "iTf" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/item/clothing/suit/armor/power_armor/advanced/x02,
 /turf/open/floor/f13{
 	dir = 8;
 	icon_state = "bluemark"

diff --git a/_maps/map_files/coyote_bayou/Newboston.dmm b/_maps/map_files/coyote_bayou/Newboston.dmm
@@ -25792,6 +25792,10 @@
 	icon_state = "yellowsiding"
 	},
 /area/f13/brotherhood)
+"kCq" = (
+/obj/machinery/mineral/wasteland_vendor/ammo,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
+/area/f13/building/workshop/nash)
 "kCM" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/bed/wooden{
@@ -29099,10 +29103,11 @@
 /area/f13/building)
 "lSr" = (
 /obj/structure/rack/shelf_metal,
-/obj/item/clothing/mask/gas/stalker,
-/obj/item/clothing/mask/gas/stalker,
-/obj/item/clothing/mask/gas/stalker,
-/obj/item/clothing/mask/gas/stalker,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
 /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{
 	icon_state = "floorsolid";
 	color = "#BBBBBB"
@@ -32245,10 +32250,6 @@
 /obj/item/storage/trash_stack/loot/uncommon,
 /turf/open/floor/wood_common,
 /area/f13/building/coyote/nash/school/groundfloor)
-"nfT" = (
-/obj/machinery/mineral/wasteland_vendor/ammo,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/building/workshop/nash)
 "nfV" = (
 /obj/structure/bed/mattress,
 /turf/open/floor/f13/wood{
@@ -40571,6 +40572,13 @@
 	},
 /turf/open/floor/plasteel/f13/vault_floor/purple,
 /area/f13/building/hospital/clinic/nash)
+"qvF" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/mineral/wasteland_vendor/ammo,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
+/area/f13/building/workshop/nash)
 "qvW" = (
 /obj/structure/camera_assembly,
 /obj/item/storage/trash_stack{
@@ -53801,13 +53809,6 @@
 	icon_state = "whitegreenrustychess"
 	},
 /area/f13/ruins)
-"vPJ" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/machinery/mineral/wasteland_vendor/ammo,
-/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
-/area/f13/building/workshop/nash)
 "vPL" = (
 /obj/structure/chair/f13chair2,
 /turf/open/floor/f13{
@@ -116056,8 +116057,8 @@ nJt
 cki
 wBU
 qpV
-vPJ
-nfT
+qvF
+kCq
 nIN
 nIN
 nIN

diff --git a/code/game/objects/effects/spawners/masterlootdrop.dm b/code/game/objects/effects/spawners/masterlootdrop.dm
@@ -909,15 +909,15 @@
 		/obj/effect/spawner/bundle/f13/armor/riot = 40,
 		/obj/effect/spawner/bundle/f13/armor/combat/mk2 = 40,
 		/obj/effect/spawner/bundle/f13/armor/combat/mk2/dark = 40,
-		/obj/effect/spawner/bundle/f13/armor/t45b_salvaged = 20,
+		///obj/effect/spawner/bundle/f13/armor/t45b_salvaged = 20,
 		/obj/item/clothing/suit/armor/heavy/riot/vault = 20,
 		/obj/item/clothing/suit/armor/heavy/riot/marine = 20,
 		/obj/item/clothing/suit/armor/medium/odst = 2,
-		/obj/effect/spawner/bundle/f13/armor/hotrodpa = 2,
-		/obj/effect/spawner/bundle/f13/armor/t45d = 1,
+		///obj/effect/spawner/bundle/f13/armor/hotrodpa = 2,
+		///obj/effect/spawner/bundle/f13/armor/t45d = 1,
 		/obj/item/clothing/suit/armor/medium/odstlead = 1,
-		/obj/effect/spawner/bundle/f13/armor/t51b = 1,
-		/obj/item/clothing/suit/armor/power_armor/t51b/pony = 1,
+		///obj/effect/spawner/bundle/f13/armor/t51b = 1,
+		///obj/item/clothing/suit/armor/power_armor/t51b/pony = 1,
 		/obj/effect/spawner/lootdrop/f13/uncommon_armor = 20
 	)