Merge pull request #5581 from ARF-SS13/shnields

Removes some magazines and vending machine overhaul
ARF-SS13 · Jan 13, 2025 · d8e5c4c · d8e5c4c
2 parents 79dff10 + 31b2f70
commit d8e5c4c
Show file tree

Hide file tree

Showing 20 changed files with 11,211 additions and 4,533 deletions.
diff --git a/_maps/map_files/coyote_bayou/Ashdown.dmm b/_maps/map_files/coyote_bayou/Ashdown.dmm
@@ -30405,15 +30405,6 @@
 /obj/effect/decal/cleanable/oil,
 /turf/open/indestructible/ground/outside/desert,
 /area/f13/wasteland)
-"nkK" = (
-/obj/structure/rack/shelf_metal,
-/obj/item/locked_box/misc/blueprints/tier3,
-/turf/open/floor/f13{
-	color = "#ffe9de";
-	icon_state = "darkrusty";
-	name = "dirty floor"
-	},
-/area/f13/building)
 "nlb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -89267,7 +89258,7 @@ dZs
 dZs
 ndZ
 xMQ
-nkK
+ukj
 dZs
 dZs
 dZs

diff --git a/_maps/map_files/coyote_bayou/Dungeons.dmm b/_maps/map_files/coyote_bayou/Dungeons.dmm
@@ -1570,7 +1570,6 @@
 /obj/structure/table{
 	layer = 2.9
 	},
-/obj/item/book/granter/crafting_recipe/gunsmith_three,
 /obj/machinery/cell_charger{
 	pixel_y = 6
 	},
@@ -47756,9 +47755,6 @@
 	pixel_x = -9;
 	pixel_y = 4
 	},
-/obj/item/book/granter/crafting_recipe/gunsmith_three{
-	pixel_x = 5
-	},
 /obj/effect/spawner/lootdrop/f13/uncommon,
 /obj/effect/spawner/lootdrop/f13/uncommon,
 /turf/open/floor/plasteel/darkred/side{

diff --git a/_maps/map_files/coyote_bayou/Garland-City.dmm b/_maps/map_files/coyote_bayou/Garland-City.dmm
@@ -31483,7 +31483,6 @@
 "xSS" = (
 /obj/machinery/autolathe/ammo,
 /obj/effect/decal/cleanable/dirt,
-/obj/item/book/granter/crafting_recipe/gunsmith_four,
 /turf/open/floor/f13{
 	icon_state = "reddirtyfull"
 	},

diff --git a/_maps/map_files/coyote_bayou/Nash_and_Texarkana-Upper.dmm b/_maps/map_files/coyote_bayou/Nash_and_Texarkana-Upper.dmm
@@ -931,7 +931,6 @@
 /area/f13/caves)
 "azD" = (
 /obj/structure/bookcase,
-/obj/item/book/granter/crafting_recipe/gunsmith_three,
 /obj/item/storage/trash_stack/loot/uncommon,
 /turf/open/floor/f13/wood,
 /area/f13/building/mall)
@@ -15386,9 +15385,6 @@
 /area/f13/bar/nash)
 "idL" = (
 /obj/machinery/autolathe/ammo/unlocked,
-/obj/item/book/granter/crafting_recipe/gunsmith_one,
-/obj/item/book/granter/crafting_recipe/gunsmith_three,
-/obj/item/book/granter/crafting_recipe/gunsmith_two,
 /obj/item/stack/ore/blackpowder/twenty,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/building)