From 85173ee62b501c1fab3e8be2de074d34a8c68dbc Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Fri, 23 Aug 2024 15:40:08 -0400 Subject: [PATCH] Map REALLY fixed --- maps/map_files/chapaev/chapaev.dmm | 45 +++++++++++++----------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm index 2ccfcca969..f8686b4519 100644 --- a/maps/map_files/chapaev/chapaev.dmm +++ b/maps/map_files/chapaev/chapaev.dmm @@ -1125,26 +1125,20 @@ can_block_movement = 0; anchored = 1 }, -/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ - pixel_y = 11; - pixel_x = 10 - }, -/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ - pixel_y = 12; - pixel_x = 6 - }, -/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ - pixel_y = 7; - pixel_x = 6 - }, -/obj/item/reagent_container/food/drinks/bottle/beer/craft/tazhushka{ - pixel_y = 10; - pixel_x = 9 - }, /obj/item/snowball{ pixel_y = 9; pixel_x = 5 }, +/obj/item/reagent_container/food/snacks/bearmeat{ + pixel_y = 8; + pixel_x = 6; + desc = "This slab of bear meat was bartered for from a couple of enterprising Territorial Guardsmen a few missions prior. Was it worth the NODs you traded?" + }, +/obj/item/reagent_container/food/snacks/bearmeat{ + pixel_y = 14; + pixel_x = 6; + desc = "This slab of bear meat was bartered for from a couple of enterprising Territorial Guardsmen a few missions prior. Was it worth the incinerators you traded?" + }, /turf/open/floor/strata{ icon_state = "floor2" }, @@ -1369,7 +1363,7 @@ /area/golden_arrow/canteen) "le" = ( /obj/structure/largecrate/random/case{ - stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/heavy/slug); + stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/slug/heavy); parts_type = /obj/item/stack/sheet/metal; pixel_x = 1 }, @@ -3610,11 +3604,11 @@ /area/golden_arrow/supply) "Cy" = ( /obj/structure/largecrate/random/case{ - stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/heavy/slug); + stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/slug/heavy); parts_type = /obj/item/stack/sheet/metal }, /obj/structure/largecrate/random/case{ - stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/heavy/slug); + stuff = list(/obj/item/ammo_magazine/shotgun/buckshot/heavy,/obj/item/ammo_magazine/shotgun/slug/heavy); parts_type = /obj/item/stack/sheet/metal; pixel_y = 11 }, @@ -4145,6 +4139,12 @@ icon_state = "multi_tiles" }, /area/golden_arrow/engineering) +"GN" = ( +/obj/item/clothing/head/helmet/marine/veteran/bear{ + anchored = 1 + }, +/turf/closed/wall/strata_outpost/reinforced/hull, +/area/golden_arrow/platoon_sergeant) "GQ" = ( /obj/structure/machinery/recharge_station{ pixel_y = 13 @@ -4460,11 +4460,6 @@ pixel_x = -32; can_block_movement = 0 }, -/obj/item/weapon/gun/shotgun/double/sawn{ - pixel_x = -32; - pixel_y = 1; - anchored = 1 - }, /obj/structure/surface/table{ color = "#8B7B5B" }, @@ -12943,7 +12938,7 @@ mV mV hE hE -hE +GN hE hE hE