From 79ce021a2f90deea966f83eadaf93617295eb0dc Mon Sep 17 00:00:00 2001 From: Morrow Date: Sat, 14 Oct 2023 08:59:57 -0400 Subject: [PATCH] more map prep --- .../vendor_types/squad_prep/squad_prep.dm | 16 --- .../crates_lockers/largecrate_supplies.dm | 5 + .../modules/projectiles/magazines/shotguns.dm | 5 + maps/map_files/golden_arrow/golden_arrow.dmm | 130 ++++++++---------- 4 files changed, 66 insertions(+), 90 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index f67b56b8ca..bf63cd5d4f 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -73,7 +73,6 @@ list("Marine Combat Boots", round(scale * 15), /obj/item/clothing/shoes/marine, VENDOR_ITEM_REGULAR), list("USCM Uniform", round(scale * 15), /obj/item/clothing/under/marine, VENDOR_ITEM_REGULAR), list("Marine Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine, VENDOR_ITEM_REGULAR), - list("Marine Black Combat Gloves", round(scale * 15), /obj/item/clothing/gloves/marine/black, VENDOR_ITEM_REGULAR), list("Marine Radio Headset", round(scale * 15), /obj/item/device/radio/headset/almayer, VENDOR_ITEM_REGULAR), list("M10 Pattern Marine Helmet", round(scale * 15), /obj/item/clothing/head/helmet/marine, VENDOR_ITEM_REGULAR), @@ -96,33 +95,21 @@ list("BACKPACK", -1, null, null, null), list("Lightweight IMP Backpack", round(scale * 15), /obj/item/storage/backpack/marine, VENDOR_ITEM_REGULAR), - list("Technician Backpack", round(scale * 15), /obj/item/storage/backpack/marine/tech, VENDOR_ITEM_REGULAR), - list("Medical Backpack", round(scale * 15), /obj/item/storage/backpack/marine/medic, VENDOR_ITEM_REGULAR), list("USCM Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel, VENDOR_ITEM_REGULAR), - list("USCM Technical Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel/tech, VENDOR_ITEM_REGULAR), - list("USCM Technical Chestrig", round(scale * 15), /obj/item/storage/backpack/marine/engineerpack/welder_chestrig, VENDOR_ITEM_REGULAR), - list("Medical Satchel", round(scale * 15), /obj/item/storage/backpack/marine/satchel/medic, VENDOR_ITEM_REGULAR), list("Shotgun Scabbard", round(scale * 5), /obj/item/storage/large_holster/m37, VENDOR_ITEM_REGULAR), list("RESTRICTED BACKPACKS", -1, null, null), - list("USCM Technician Welderpack", round(scale * 1.25), /obj/item/storage/backpack/marine/engineerpack, VENDOR_ITEM_REGULAR), - list("Technician Welder-Satchel", round(scale * 2), /obj/item/storage/backpack/marine/engineerpack/satchel, VENDOR_ITEM_REGULAR), list("Radio Telephone Backpack", round(max(1,(scale * 0.5))), /obj/item/storage/backpack/marine/satchel/rto, VENDOR_ITEM_REGULAR), list("BELTS", -1, null, null), list("M276 Pattern Ammo Load Rig", round(scale * 15), /obj/item/storage/belt/marine, VENDOR_ITEM_REGULAR), list("M276 Pattern M40 Grenade Rig", round(scale * 10), /obj/item/storage/belt/grenade, VENDOR_ITEM_REGULAR), - list("M276 Pattern Shotgun Shell Loading Rig", round(scale * 15), /obj/item/storage/belt/shotgun, VENDOR_ITEM_REGULAR), list("M276 Pattern General Pistol Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m4a3, VENDOR_ITEM_REGULAR), - list("M276 Pattern M39 Holster Rig", round(scale * 15), /obj/item/storage/large_holster/m39, VENDOR_ITEM_REGULAR), - list("M276 Pattern M39 Holster Rig And Pouch", round(scale * 10), /obj/item/storage/belt/gun/m39, VENDOR_ITEM_REGULAR), list("M276 Pattern M44 Holster Rig", round(scale * 15), /obj/item/storage/belt/gun/m44, VENDOR_ITEM_REGULAR), list("M276 Pattern M82F Holster Rig", round(scale * 5), /obj/item/storage/belt/gun/flaregun, VENDOR_ITEM_REGULAR), - list("M276 Knife Rig (Full)", round(scale * 15), /obj/item/storage/belt/knifepouch, VENDOR_ITEM_REGULAR), list("M276 G8-A General Utility Pouch", round(scale * 15), /obj/item/storage/backpack/general_belt, VENDOR_ITEM_REGULAR), list("POUCHES", -1, null, null, null), - list("Bayonet Sheath (Full)",round(scale * 15), /obj/item/storage/pouch/bayonet, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Splints, Gauze, Ointment)", round(scale * 15), /obj/item/storage/pouch/firstaid/full/alternate, VENDOR_ITEM_REGULAR), list("First-Aid Pouch (Pill Packets)", round(scale * 15), /obj/item/storage/pouch/firstaid/full/pills, VENDOR_ITEM_REGULAR), list("Flare Pouch (Full)", round(scale * 15), /obj/item/storage/pouch/flare/full, VENDOR_ITEM_REGULAR), @@ -286,15 +273,12 @@ list("MISCELLANEOUS", -1, null, null), list("Engineer Kit", round(scale * 1), /obj/item/storage/toolkit/empty, VENDOR_ITEM_REGULAR), - list("Map", round(scale * 5), /obj/item/map/current_map, VENDOR_ITEM_REGULAR), list("Extinguisher", round(scale * 5), /obj/item/tool/extinguisher, VENDOR_ITEM_REGULAR), list("Fire Extinguisher (Portable)", round(scale * 1), /obj/item/tool/extinguisher/mini, VENDOR_ITEM_REGULAR), list("Roller Bed", round(scale * 1), /obj/item/roller, VENDOR_ITEM_REGULAR), list("Machete Scabbard (Full)", round(scale * 5), /obj/item/storage/large_holster/machete/full, VENDOR_ITEM_REGULAR), list("Binoculars", round(scale * 1), /obj/item/device/binoculars, VENDOR_ITEM_REGULAR), - list("MB-6 Folding Barricades (x3)", round(scale * 2), /obj/item/stack/folding_barricade/three, VENDOR_ITEM_REGULAR), list("Spare PDT/L Battle Buddy Kit", round(scale * 3), /obj/item/storage/box/pdt_kit, VENDOR_ITEM_REGULAR), - list("W-Y brand rechargeable mini-battery", round(scale * 2.5), /obj/item/cell/crap, VENDOR_ITEM_REGULAR) ) //--------------SQUAD ATTACHMENTS VENDOR-------------- diff --git a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm index 9ff84376a7..ec62d27198 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm @@ -155,6 +155,11 @@ desc = "An ammunition case containing 10 M41A magazines." supplies = list(/obj/item/ammo_magazine/rifle = 10) +/obj/structure/largecrate/supply/ammo/m41amk1 + name = "\improper M41A magazine case (x20)" + desc = "An ammunition case containing 20 M41A MK1 magazines." + supplies = list(/obj/item/ammo_magazine/rifle/m41aMK1 = 20) + /obj/structure/largecrate/supply/ammo/m41a_box name = "\improper M41A ammunition box case (x4)" desc = "An ammunition case containing four M41A 600 round boxes of ammunition." diff --git a/code/modules/projectiles/magazines/shotguns.dm b/code/modules/projectiles/magazines/shotguns.dm index 5573ed0242..a35dc727e4 100644 --- a/code/modules/projectiles/magazines/shotguns.dm +++ b/code/modules/projectiles/magazines/shotguns.dm @@ -78,6 +78,11 @@ var/list/shotgun_boxes_12g = list( default_ammo = /datum/ammo/bullet/shotgun/beanbag handful_state = "beanbag_slug" caliber = "20g" + +/obj/item/ammo_magazine/shotgun/buckshot/special + name = "box of buckshot shells, USCM special type" + desc = "A box filled with buckshot spread shotgun shells, USCM special type. 12 Gauge." + default_ammo = /datum/ammo/bullet/shotgun/buckshot/special //------------------------------------------------------- /* diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 1322532bd8..402c6e3977 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -90,6 +90,7 @@ /area/almayer/living/grunt_rnr) "aQ" = ( /obj/structure/surface/rack, +/obj/item/weapon/gun/shotgun/pump/special, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -352,11 +353,6 @@ "eE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, -/obj/item/prop/helmetgarb/riot_shield{ - pixel_x = 3; - pixel_y = 7 - }, -/obj/item/prop/helmetgarb/riot_shield, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -652,10 +648,6 @@ "iy" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply, -/obj/item/storage/pouch/flamertank{ - pixel_x = 5; - pixel_y = 9 - }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/squad_one) "iA" = ( @@ -701,6 +693,23 @@ /area/almayer/hallways/port_hallway) "jg" = ( /obj/structure/surface/rack, +/obj/item/ammo_magazine/flamer_tank{ + current_rounds = 0; + pixel_x = -3; + pixel_y = -6 + }, +/obj/item/ammo_magazine/flamer_tank{ + current_rounds = 0; + pixel_x = -3; + pixel_y = -6 + }, +/obj/item/weapon/gun/flamer{ + current_mag = null + }, +/obj/item/storage/pouch/flamertank{ + pixel_x = 5; + pixel_y = 9 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -720,18 +729,12 @@ }, /area/almayer/living/briefing) "jG" = ( -/obj/structure/surface/table/almayer, -/obj/item/ammo_magazine/flamer_tank{ - current_rounds = 0; - pixel_x = 6 - }, -/obj/item/ammo_magazine/flamer_tank{ - current_rounds = 0; - pixel_x = -3; - pixel_y = -6 +/obj/structure/surface/rack, +/obj/item/weapon/gun/shotgun/pump/special, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha/squad_one) +/area/almayer/squads/alpha/squad_two) "jM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -796,10 +799,6 @@ "ld" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/surface/table/almayer, -/obj/item/ammo_magazine/rifle/m4ra{ - pixel_x = -7; - pixel_y = 10 - }, /obj/item/tool/screwdriver, /turf/open/floor/almayer{ icon_state = "plate" @@ -830,32 +829,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"lD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/almayer, -/obj/item/storage/box/packet/baton_slug{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/storage/box/packet/baton_slug{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/storage/box/packet/baton_slug{ - layer = 3.01; - pixel_x = 15; - pixel_y = 5 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha/squad_one) "lI" = ( /turf/open/floor/almayer/uscm/directional/up_down, /area/almayer/living/briefing) "lQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/alpha, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -954,10 +933,6 @@ /obj/item/tool/wrench{ pixel_y = 7 }, -/obj/item/weapon/gun/rifle/m4ra{ - pixel_x = -15; - pixel_y = 3 - }, /obj/structure/machinery/camera/autoname/almayer{ dir = 8; name = "ship-grade camera" @@ -1174,7 +1149,7 @@ }, /area/almayer/hallways/port_hallway) "qa" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/alpha, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -1196,12 +1171,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/cryo_cells) -"qs" = ( -/obj/structure/largecrate/supply/ammo/m41a_box, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha/squad_two) "qv" = ( /obj/item/frame/camera{ desc = "The Staff Officer insisted he needed to monitor everyone at all times."; @@ -1578,12 +1547,12 @@ }, /area/almayer/living/grunt_rnr) "vp" = ( -/obj/structure/surface/table/almayer, /obj/item/prop/helmetgarb/gunoil{ pixel_x = 7; pixel_y = 6 }, /obj/item/prop/helmetgarb/gunoil, +/obj/structure/surface/table/almayer, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -2874,7 +2843,7 @@ /area/almayer/living/platoon_commander_rooms) "LF" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/alpha, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -3496,9 +3465,6 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 }, -/obj/item/weapon/gun/flamer{ - current_mag = null - }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/squad_one) "TP" = ( @@ -3586,7 +3552,23 @@ }, /area/almayer/living/cryo_cells) "Vp" = ( -/obj/structure/largecrate/supply/ammo/m41a_box, +/obj/structure/surface/rack, +/obj/item/weapon/gun/flamer{ + current_mag = null + }, +/obj/item/ammo_magazine/flamer_tank{ + current_rounds = 0; + pixel_x = 6 + }, +/obj/item/ammo_magazine/flamer_tank{ + current_rounds = 0; + pixel_x = -3; + pixel_y = -6 + }, +/obj/item/storage/pouch/flamertank{ + pixel_x = 5; + pixel_y = 9 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -10669,7 +10651,7 @@ Cr jc ry jg -jg +jG ry jc Cr @@ -10974,7 +10956,7 @@ dl Bh AY zK -qs +pt jc Cr Cr @@ -12190,9 +12172,9 @@ dl dl Iw jc -lQ -lQ -lQ +it +it +it jc Cr Cr @@ -13102,9 +13084,9 @@ uH uH Mv Zk -qa -LF -LF +XI +hQ +hQ Zk Cr Cr @@ -13251,7 +13233,7 @@ qX tr iN uH -lD +eE hQ OG bZ @@ -13710,7 +13692,7 @@ wl bZ bZ jM -jG +mJ eo bZ qa @@ -14318,7 +14300,7 @@ uH yj qK FS -Vp +XI Zk Cr Cr @@ -14620,7 +14602,7 @@ tr wp uH gt -aQ +Vp aQ gt Zk