Починил 170+ карт от ошибок. Осталось починить шипы наши

CeladonSS13 · Dec 28, 2024 · 427cf3f · 427cf3f
1 parent 6742cb2
commit 427cf3f
Show file tree

Hide file tree

Showing 181 changed files with 2,270 additions and 2,340 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm b/_maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
@@ -2737,8 +2737,8 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/gun/ballistic/automatic/marksman/vickland,
-/obj/item/ammo_box/vickland_a308/empty,
-/obj/item/ammo_box/vickland_a308/empty,
+/obj/item/storage/box/ammo/vickland_a308/empty,
+/obj/item/storage/box/ammo/vickland_a308/empty,
 /turf/open/floor/wood/mahogany,
 /area/ruin/powered/icemoon/lodge/montagne_office)
 "Oa" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm b/_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
@@ -1340,7 +1340,7 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/neutered,
+/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals/neutered,
 /turf/open/floor/plasteel/patterned/brushed,
 /area/ruin/jungle/cavecrew/security)
 "pB" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm b/_maps/RandomRuins/JungleRuins/jungle_medtech_outbreak.dmm
@@ -3171,7 +3171,7 @@
 "VL" = (
 /obj/structure/closet/cabinet,
 /obj/item/hatchet/wooden,
-/obj/item/ammo_box/a357,
+/obj/item/storage/box/ammo/a357,
 /obj/item/gun/ballistic/revolver/viper,
 /turf/open/floor/wood,
 /area/ship/bridge)

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm b/_maps/RandomRuins/LavaRuins/lavaland_crashed_starwalker.dmm
@@ -1243,7 +1243,7 @@
 	pixel_x = 6;
 	pixel_y = 5
 	},
-/obj/item/ammo_box/a357{
+/obj/item/storage/box/ammo/a357{
 	pixel_y = 6
 	},
 /turf/open/floor/plasteel/dark,

diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm
@@ -49,7 +49,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "m" = (
 /obj/structure/table,
-/obj/item/soulstone/anybody,
+/obj/item/storage/belt/chameleon,
 /obj/item/toy/plush/lizardplushie,
 /obj/machinery/light/broken/directional/north,
 /obj/structure/window/reinforced/spawner,
@@ -189,7 +189,7 @@
 "O" = (
 /obj/effect/mob_spawn/human/corpse/damaged,
 /obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/under/color/khaki/buster,
+/obj/item/clothing/glasses/welding/ghostbuster,
 /obj/item/clothing/glasses/welding/ghostbuster,
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/mineral/plastitanium/red,

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm b/_maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
@@ -618,11 +618,11 @@
 	pixel_y = 6;
 	start_empty = 1
 	},
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
-/obj/item/ammo_casing/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
+/obj/item/storage/box/ammo/c9mm,
 /turf/open/floor/carpet,
 /area/ruin/rockplanet/distillery/office)
 "gM" = (
@@ -3069,7 +3069,7 @@
 /obj/structure/closet/crate/secure/weapon{
 	name = "ammo crate"
 	},
-/obj/item/ammo_box/a357{
+/obj/item/storage/box/ammo/a357{
 	pixel_x = -3
 	},
 /obj/item/ammo_box/magazine/illestren_a850r,
@@ -3081,7 +3081,7 @@
 /obj/item/ammo_box/magazine/co9mm{
 	start_empty = 1
 	},
-/obj/item/ammo_box/a357{
+/obj/item/storage/box/ammo/a357{
 	pixel_x = 3
 	},
 /obj/machinery/button/door{

diff --git a/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm b/_maps/RandomRuins/SpaceRuins/power_puzzle.dmm
@@ -2167,7 +2167,7 @@
 /obj/item/ammo_casing/c9mm/surplus{
 	pixel_x = 6
 	},
-/obj/item/ammo_casing/c9mm/surplus,
+/obj/item/storage/box/ammo/c9mm_surplus,
 /obj/item/ammo_casing/c9mm/surplus{
 	pixel_x = 3;
 	pixel_y = 5

diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_ancient_ruin.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
@@ -1144,7 +1144,7 @@
 /turf/open/floor/concrete/slab_1,
 /area/ruin/beach/complex/wall)
 "sa" = (
-/obj/effect/spawner/lootdrop/garden/seaweed,
+/obj/effect/spawner/random/food_or_drink/garden/seaweed,
 /turf/open/water/beach,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "so" = (

diff --git a/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_colony.dmm b/_maps/_mod_celadon/RandomRuins/BeachRuins/beach_colony.dmm
@@ -540,7 +540,7 @@
 /turf/open/floor/plating/asteroid/sand/lit,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Xo" = (
-/obj/structure/statue/sandstone/assistant,
+/obj/item/statuebust,
 /turf/open/floor/plating/asteroid/sand/lit,
 /area/overmap_encounter/planetoid/beachplanet/explored)
 "Xr" = (