From 723ddb3303e44cd19b382c7e5b99b9463a0331b5 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Mon, 23 Sep 2024 17:22:11 -0400 Subject: [PATCH] fixes --- .../modules/projectiles/magazines/shotguns.dm | 4 +++ .../Sorokyne_Strata/Sorokyne_Strata.dmm | 2 +- maps/shuttles/dropship_upp.dmm | 25 +++++++++++++------ 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm index 0d8ff0d7ca..a6262939b6 100644 --- a/code/modules/projectiles/magazines/shotguns.dm +++ b/code/modules/projectiles/magazines/shotguns.dm @@ -164,11 +164,13 @@ also doesn't really matter. You can only reload them with handfuls. /obj/item/ammo_magazine/internal/shotgun/double //For a double barrel. max_rounds = 2 + current_rounds = 0 chamber_closed = 1 //Starts out with a closed tube. /obj/item/ammo_magazine/internal/shotgun/double/cane default_ammo = /datum/ammo/bullet/revolver/marksman max_rounds = 6 + current_rounds = 6 caliber = ".44" /obj/item/ammo_magazine/internal/shotgun/double/mou53 default_ammo = /datum/ammo/bullet/shotgun/flechette @@ -176,6 +178,8 @@ also doesn't really matter. You can only reload them with handfuls. /obj/item/ammo_magazine/internal/shotgun/double/twobore //Van Bandolier's superheavy double-barreled hunting rifle. caliber = "2 bore" + max_rounds = 2 + current_rounds = 0 default_ammo = /datum/ammo/bullet/shotgun/twobore /obj/item/ammo_magazine/internal/shotgun/combat diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index c280c69ab3..f146ff8185 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -10474,7 +10474,7 @@ /area/strata/ag/interior/administration) "cfX" = ( /obj/structure/largecrate/random, -/obj/item/storage/belt/marine/upp/sapper, +/obj/item/storage/belt/marine/upp/full, /turf/open/asphalt/cement, /area/strata/ag/exterior/research_decks) "cfZ" = ( diff --git a/maps/shuttles/dropship_upp.dmm b/maps/shuttles/dropship_upp.dmm index 2c28023880..04eb51e2bb 100644 --- a/maps/shuttles/dropship_upp.dmm +++ b/maps/shuttles/dropship_upp.dmm @@ -246,13 +246,15 @@ }, /area/shuttle/ds_upp) "CV" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = 30 - }, /obj/structure/barricade/handrail/strata{ dir = 4; can_buckle = 1 }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ + name = "\improper MinZdrav dispenser"; + desc = "A wall-mounted medical equipment dispenser. Provided by Ministry of Health of UPP, it contains a small quantity of emergency supplies."; + pixel_x = 30 + }, /turf/open/floor/plating/plating_catwalk/strata, /area/shuttle/ds_upp) "DG" = ( @@ -261,6 +263,13 @@ opacity = 0 }, /area/shuttle/ds_upp) +"Ek" = ( +/obj/effect/attach_point/crew_weapon/midway{ + attach_id = 7; + ship_tag = "dropship_upp" + }, +/turf/open/floor/strata/multi_tiles/southwest, +/area/shuttle/ds_upp) "Fc" = ( /obj/structure/barricade/handrail/strata{ dir = 4; @@ -569,13 +578,15 @@ /turf/open/floor/strata/floor3/east, /area/shuttle/ds_upp) "YJ" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_x = -30 - }, /obj/structure/barricade/handrail/strata{ dir = 8; can_buckle = 1 }, +/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{ + name = "\improper MinZdrav dispenser"; + desc = "A wall-mounted medical equipment dispenser. Provided by Ministry of Health of UPP, it contains a small quantity of emergency supplies."; + pixel_x = -30 + }, /turf/open/floor/plating/plating_catwalk/strata, /area/shuttle/ds_upp) "Zh" = ( @@ -701,7 +712,7 @@ Nh Sn Ab cS -Th +Ek Th Th Yn