diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 028d531f17..b0d1a1e15f 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -5636,6 +5636,7 @@ "akL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/meter, +/obj/structure/closet/firecloset, /turf/open/floor/plating, /area/maintenance/fore) "akM" = ( @@ -7654,14 +7655,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/power/apc{ - areastring = "/area/commons/fitness"; - name = "Fitness Room APC"; - pixel_y = -24 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "apv" = ( @@ -11734,6 +11727,14 @@ /area/commons/dorms) "aAo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/power/apc{ + areastring = "/area/commons/fitness"; + name = "Fitness Room APC"; + pixel_y = -24 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plasteel/dark, /area/commons/dorms) "aAp" = ( @@ -11743,6 +11744,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/open/floor/plasteel, /area/commons/dorms) "aAr" = ( @@ -13044,6 +13048,10 @@ /obj/machinery/door/firedoor, /turf/open/floor/mineral/titanium/blue, /area/commons/toilet) +"aDW" = ( +/obj/structure/loot_pile/maint, +/turf/open/floor/plasteel, +/area/cargo/warehouse) "aDZ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -16620,10 +16628,10 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aOg" = ( -/obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/structure/closet/firecloset, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aOh" = ( @@ -21423,10 +21431,10 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "baF" = ( -/obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/structure/closet/firecloset, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "baG" = ( @@ -23427,8 +23435,8 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "bgg" = ( -/obj/structure/closet/emcloset, /obj/effect/turf_decal/stripes/line, +/obj/structure/closet/firecloset, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "bgh" = ( @@ -25073,11 +25081,11 @@ /turf/open/floor/plasteel/white, /area/science/research) "bkj" = ( -/obj/structure/closet/emcloset, /obj/machinery/airalarm{ pixel_y = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/closet/firecloset, /turf/open/floor/plasteel, /area/cargo/storage) "bkk" = ( @@ -25803,6 +25811,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/maintenance/starboard/aft) "blR" = ( @@ -33256,11 +33265,7 @@ /turf/open/floor/engine, /area/science/storage) "bDg" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 3; - name = "3maintenance loot spawner" - }, +/obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/maintenance/starboard) "bDh" = ( @@ -35075,6 +35080,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/aft) "bHp" = ( @@ -46846,8 +46852,7 @@ /turf/open/floor/plating, /area/maintenance/aft) "cmo" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cmq" = ( @@ -50917,6 +50922,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/maintenance/aft) "cBE" = ( @@ -51909,6 +51915,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"cPO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/port/fore) "cQw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -52419,7 +52432,6 @@ /turf/open/floor/plasteel, /area/engineering/atmos) "dbb" = ( -/obj/structure/lattice, /obj/machinery/atmospherics/components/unary/relief_valve/atmos/atmos_waste{ dir = 1 }, @@ -52866,6 +52878,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/maintenance/fore) "dPs" = ( @@ -55457,6 +55470,10 @@ }, /turf/closed/wall, /area/commons/dorms) +"hmT" = ( +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/port) "hnc" = ( /obj/structure/chair/pew/left{ dir = 4 @@ -55579,6 +55596,10 @@ /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plating, /area/engineering/atmos) +"hyY" = ( +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/starboard/fore) "hzs" = ( /obj/effect/turf_decal/bot, /obj/machinery/plate_press, @@ -56988,6 +57009,13 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"jNT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/aft) "jOB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -57171,6 +57199,13 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"kbO" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/structure/closet/firecloset, +/turf/open/floor/plasteel, +/area/hallway/primary/fore) "kcx" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/dark/visible, @@ -59356,6 +59391,7 @@ /obj/structure/sign/poster/official/fruit_bowl{ pixel_y = 32 }, +/obj/structure/closet/firecloset, /turf/open/floor/plasteel/white/corner{ dir = 1 }, @@ -59640,11 +59676,7 @@ /turf/open/floor/plasteel/dark, /area/security/prison/cells) "nkP" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 8; - name = "8maintenance loot spawner" - }, +/obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/maintenance/port/aft) "nmZ" = ( @@ -59821,6 +59853,14 @@ }, /turf/closed/wall, /area/maintenance/disposal/incinerator) +"nzX" = ( +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 8; + name = "8maintenance loot spawner" + }, +/obj/structure/rack, +/turf/open/floor/plating, +/area/maintenance/port/aft) "nBI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -60155,6 +60195,10 @@ /obj/machinery/vending/kink, /turf/open/floor/plating, /area/maintenance/bar) +"odV" = ( +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "ofj" = ( /obj/machinery/smartfridge/organ/preloaded, /turf/closed/wall, @@ -60729,6 +60773,10 @@ "pgf" = ( /turf/open/floor/mineral/titanium/blue, /area/commons/dorms) +"pgl" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "pgn" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -62140,6 +62188,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/processing) +"rla" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/closet/firecloset, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "rmN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -64398,6 +64451,9 @@ /obj/structure/disposalpipe/sorting/mail{ sortType = 26 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/commons/dorms) "uys" = ( @@ -65387,6 +65443,10 @@ /obj/machinery/atmospherics/pipe/simple/dark/visible, /turf/open/space, /area/space/nearstation) +"vPd" = ( +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/port/fore) "vPs" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -65577,6 +65637,13 @@ /obj/item/assembly/signaler, /turf/open/floor/plating, /area/maintenance/bar) +"wgo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/structure/closet/firecloset, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "wgu" = ( /obj/machinery/door/airlock/maintenance{ name = "Permabrig Maintenance"; @@ -65594,6 +65661,11 @@ }, /turf/open/floor/plasteel, /area/commons/fitness/pool) +"wiR" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/port/fore) "wjd" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/table, @@ -77093,7 +77165,7 @@ awW awZ aym azz -aAF +wgo awW aaa aaa @@ -77326,7 +77398,7 @@ apJ awZ aIK ayl -aAE +rla awW aaa aaa @@ -82463,7 +82535,7 @@ cCs ann ann hCn -arH +cwS ayh azi aAx @@ -82481,7 +82553,7 @@ aPz aPz aPz aPz -aSg +hmT aWj aXP aZr @@ -83485,7 +83557,7 @@ anH oCF amC anJ -aFJ +wiR alU axK azG @@ -84803,7 +84875,7 @@ aQN fRe qSo aPA -bgt +hmT bhS bjk aPz @@ -85290,7 +85362,7 @@ alU alU alU alU -ntt +cPO amC avW gYo @@ -87587,7 +87659,7 @@ aaa ali aoo avY -amC +vPd gsM sCa aoX @@ -88179,7 +88251,7 @@ bCq bVE bWz bHE -bHE +nkP bLu bCq bLu @@ -88909,7 +88981,7 @@ aTJ aPK aWA aWC -baS +aDW aZI baS cCn @@ -89930,7 +90002,7 @@ aKc aLp aMV aOy -aLE +pgl aPQ aRV aSW @@ -90481,7 +90553,7 @@ bHD bJe bCq nkP -bHE +nzX bHE bHE bHE @@ -91963,7 +92035,7 @@ nbY aiX iRj anz -aov +kbO cCi apU ajd @@ -101722,7 +101794,7 @@ uhm ahn aiA ahn -grc +odV anE aod ahn @@ -107955,7 +108027,7 @@ bFH bHb bIw bBN -bKT +jNT bMb bNd bOt @@ -110989,7 +111061,7 @@ alP anf anf alP -anf +hyY anf apE anf @@ -115438,7 +115510,7 @@ clt cQw cCt cOe -cOe +cmo cNW aaa aaS @@ -116696,7 +116768,7 @@ bKc cNW bMB bNA -cOe +cmo bSl bUq flc diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 904b8958af..3c522e5ee6 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -3715,6 +3715,7 @@ "alM" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, +/obj/structure/loot_pile/maint, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "alN" = ( @@ -8243,6 +8244,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plasteel, /area/maintenance/port/fore) "aCE" = ( @@ -13713,8 +13715,8 @@ }, /turf/open/floor/plating{ initial_gas_mix = "o2=0.01;n2=0.01"; - luminosity = 2; - initial_temperature = 2.7 + initial_temperature = 2.7; + luminosity = 2 }, /area/security/prison) "ban" = ( @@ -14376,8 +14378,8 @@ }, /turf/open/floor/plating{ initial_gas_mix = "o2=0.01;n2=0.01"; - luminosity = 2; - initial_temperature = 2.7 + initial_temperature = 2.7; + luminosity = 2 }, /area/security/prison) "bdo" = ( @@ -31965,6 +31967,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plasteel, /area/maintenance/starboard) "clv" = ( @@ -35124,6 +35127,7 @@ "cuI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, +/obj/structure/loot_pile/maint, /turf/open/floor/plasteel, /area/maintenance/starboard) "cuJ" = ( @@ -36310,6 +36314,12 @@ }, /turf/open/floor/plasteel, /area/maintenance/port) +"cCK" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/port/aft) "cCM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -38007,6 +38017,7 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/maintenance/port) "cLM" = ( @@ -38752,6 +38763,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plasteel, /area/maintenance/starboard/aft) "cNJ" = ( @@ -57355,6 +57367,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/maintenance/port) "dAv" = ( @@ -59204,6 +59217,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -62652,6 +62666,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plasteel, /area/maintenance/aft) "dLj" = ( @@ -62702,6 +62717,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plasteel, /area/maintenance/starboard/aft) "dLn" = ( @@ -63084,6 +63100,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/loot_pile/maint, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -79161,6 +79178,10 @@ "gWu" = ( /turf/closed/wall, /area/cargo/warehouse) +"gWF" = ( +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/port/fore) "gXc" = ( /obj/structure/sign/painting/library{ pixel_y = 32 @@ -95240,6 +95261,11 @@ }, /turf/open/floor/plasteel, /area/service/library/abandoned) +"mpB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/port) "mqb" = ( /obj/structure/cable{ icon_state = "1-2" @@ -97242,6 +97268,17 @@ }, /turf/closed/wall/r_wall, /area/science/circuit) +"mYR" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/loot_pile/maint, +/turf/open/floor/plasteel, +/area/maintenance/starboard/aft) "mYT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/cardboard, @@ -109909,6 +109946,7 @@ "rCr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/loot_pile/maint, /turf/open/floor/plating, /area/cargo/warehouse) "rCv" = ( @@ -109944,6 +109982,11 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) +"rCR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/port/aft) "rDp" = ( /obj/structure/table/glass, /obj/structure/cable/white{ @@ -114162,6 +114205,13 @@ }, /turf/open/floor/carpet, /area/commons/vacant_room/office) +"sWQ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/port/aft) "sWY" = ( /obj/machinery/door/firedoor, /obj/structure/cable/white{ @@ -119197,6 +119247,10 @@ }, /turf/open/floor/plasteel, /area/command/heads_quarters/hos) +"uIT" = ( +/obj/structure/loot_pile/maint, +/turf/open/floor/plating, +/area/maintenance/port) "uJd" = ( /obj/item/kirbyplants/random, /obj/item/radio/intercom{ @@ -128561,6 +128615,21 @@ }, /turf/open/floor/plasteel, /area/cargo/storage) +"yia" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/loot_pile/maint, +/turf/open/floor/plasteel{ + heat_capacity = 1e+006 + }, +/area/maintenance/starboard/aft) "yiq" = ( /obj/structure/reflector/single/anchored{ dir = 6 @@ -150094,7 +150163,7 @@ opi xbs qjg qjg -ceb +mpB cLv cMQ cOq @@ -157015,7 +157084,7 @@ caE cdY cfR chI -ceb +mpB cfU cmi cnI @@ -158117,7 +158186,7 @@ dOl ean dLW dZg -dLW +rCR ecv edf edl @@ -158756,7 +158825,7 @@ lxH odN quN asF -alg +gWF avq awo axJ @@ -159295,7 +159364,7 @@ qOV ary aKj bbQ -alg +gWF beK bgj alf @@ -159345,7 +159414,7 @@ ojB roP uhj cCO -cea +uIT cJZ cLI cNg @@ -160932,7 +161001,7 @@ dPG dQz dRy dSx -dOS +cCK dUg dUX dVL @@ -164529,7 +164598,7 @@ dOY dPR dfm dRK -dOl +sWQ pPz sBt vSo @@ -180428,7 +180497,7 @@ hYQ jjL pzu fzU -cYj +yia cZV dbC ddr @@ -181206,7 +181275,7 @@ ddt ddt aaB dbD -diW +mYR aaR dbA dnU diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm index 58cd0f4fa9..9e5d80248d 100644 --- a/code/game/objects/effects/spawners/bundle.dm +++ b/code/game/objects/effects/spawners/bundle.dm @@ -169,14 +169,21 @@ /obj/item/clothing/mask/gas/mime/sexy, /obj/item/clothing/under/rank/civilian/mime/sexy) +/obj/effect/spawner/bundle/crate + var/pickone = FALSE + /obj/effect/spawner/bundle/crate/Initialize(mapload) SHOULD_CALL_PARENT(FALSE) if(items && items.len) var/turf/T = get_turf(src) var/obj/structure/closet/LC = locate(/obj/structure/closet) in T if(LC) - for(var/path in items) - new path(LC) + if(pickone) + var/tospawn = pick(items) + new tospawn(LC) + else + for(var/path in items) + new path(LC) return INITIALIZE_HINT_QDEL /obj/effect/spawner/bundle/crate/mosin @@ -192,3 +199,29 @@ /obj/item/gun/ballistic/automatic/surplus, /obj/item/ammo_box/magazine/m10mm/rifle ) + +/obj/effect/spawner/bundle/crate/levergun + name = "lever-action rifle spawner" + items = list( + /obj/item/gun/ballistic/shotgun/leveraction, + /obj/item/ammo_box/c38/pouch + ) + +/obj/effect/spawner/bundle/crate/cowboyhat + name = "cowboy hat spawner" + pickone = TRUE + items = list( + /obj/item/clothing/head/cowboyhat, + /obj/item/clothing/head/cowboyhat/black, + /obj/item/clothing/head/cowboyhat/white, + /obj/item/clothing/head/cowboyhat/pink, + /obj/item/clothing/head/cowboyhat/sec + ) + +/obj/effect/spawner/bundle/crate/cowboyboots + name = "cowboy boots spawner" + pickone = TRUE + items = list( + /obj/item/clothing/shoes/cowboyboots, + /obj/item/clothing/shoes/cowboyboots/black + ) diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index de3e657386..3bd4515698 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -183,6 +183,29 @@ var/item = pick(contains) new item(C) +/datum/supply_pack/security/armory/frontier + name = "Old West Surplus Crate" + desc = "Do you have a fauna problem? Do you want to live out your frontier-taming fantasies on a state-of-the-art plasma research and mining station? Do you want to pretend you lived in the Old West of Earthen fame? Well, this box - and its many hats - may be for you." + cost = 7500 + contraband = TRUE + contains = list(/obj/effect/spawner/bundle/crate/cowboyhat, + /obj/effect/spawner/bundle/crate/cowboyboots, + /obj/item/clothing/under/pants/chaps, + /obj/item/reagent_containers/food/snacks/butterbiscuit, + /obj/item/reagent_containers/food/snacks/butterbiscuit, + /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit, + /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit, + /obj/item/ammo_box/c38/pouch, + /obj/item/ammo_box/c38/pouch, + /obj/item/ammo_box/c38/pouch, + /obj/effect/spawner/bundle/crate/levergun + ) + +/datum/supply_pack/security/armory/frontier/fill(obj/structure/closet/crate/C) + for(var/i in 1 to 5) + var/item = pick(contains) + new item(C) + /datum/supply_pack/security/armory/swat name = "SWAT Crate" desc = "Contains two fullbody sets of tough, fireproof, pressurized suits designed in a joint effort by IS-ERI and Nanotrasen. Each set contains a suit, helmet, mask, combat belt, and combat gloves. Requires Armory access to open." diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm index 8f4d8eac67..a9bfe21102 100644 --- a/code/modules/projectiles/ammunition/ballistic/revolver.dm +++ b/code/modules/projectiles/ammunition/ballistic/revolver.dm @@ -39,7 +39,7 @@ /obj/item/ammo_casing/c38/lethal name = ".38 bullet casing" - desc = "A .38 bullet casing" + desc = "A .38 bullet casing." projectile_type = /obj/item/projectile/bullet/c38 /obj/item/ammo_casing/c38/trac diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 1f1cc10459..f07ad0bc39 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -60,6 +60,13 @@ desc = "Designed to quickly reload revolvers. These rounds are manufactured within extremely tight tolerances, making them easy to show off trickshots with." ammo_type = /obj/item/ammo_casing/c38/match +/obj/item/ammo_box/c38/pouch + name = "ammo packet (.38)" + desc = "A small ammunition packet made of synthleather. Not particularly useful for speedily reloading, but can hold a bit more." + multiload = FALSE + max_ammo = 8 + icon_state = "38pch" + /obj/item/ammo_box/g4570 name = "ammo box (.45-70 GOVT)" desc = "Brought to you at great expense,this box contains 10 more .45-70 GOVT bullets." diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm index 12f4e1f1c5..4aa8b917b5 100644 --- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm @@ -61,3 +61,7 @@ ammo_type = /obj/item/ammo_casing/c38 // they're rubber by default, i guess caliber = "38" max_ammo = 7 + +/obj/item/ammo_box/magazine/internal/shot/levergun/brush + name = "brush gun internal magazine" + ammo_type = /obj/item/ammo_casing/g4570 diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index a3985c8f42..9388ca214a 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -122,7 +122,7 @@ icon_state = "c20r[magazine ? "-[CEILING(get_ammo(0)/4, 1)*4]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]" /obj/item/gun/ballistic/automatic/wt550 - name = "security semi-auto smg" + name = "security semi-auto PDW" desc = "An outdated personal defence weapon. Uses 4.6x30mm rounds and is designated the WT-550 Semi-Automatic SMG." icon_state = "wt550" item_state = "arg" diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 6ba2f49791..f84ed9cd8d 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -11,6 +11,7 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot casing_ejector = FALSE var/recentpump = 0 // to prevent spammage + var/clip_delay = CLICK_CD_MELEE weapon_weight = WEAPON_HEAVY sawn_item_state = "sawnshotgun" @@ -24,7 +25,8 @@ playsound(user, 'sound/weapons/shotguninsert.ogg', 60, 1) A.update_icon() update_icon() - user.SetNextAction(CLICK_CD_MELEE) + if(istype(A, /obj/item/ammo_box)) + user.SetNextAction(clip_delay) /obj/item/gun/ballistic/shotgun/process_chamber(mob/living/user, empty_chamber = 0) return ..() //changed argument value @@ -359,9 +361,13 @@ icon_state = "levercarabine" item_state = "leveraction" sawn_item_state = "maresleg" + var/can_cut = TRUE /obj/item/gun/ballistic/shotgun/leveraction/attackby(obj/item/A, mob/user, params) ..() + if(!can_cut) + to_chat(user, "You can't cut \the [src] down!") + return if(A.tool_behaviour == TOOL_SAW || istype(A, /obj/item/gun/energy/plasmacutter)) sawoff(user) if(istype(A, /obj/item/melee/transforming/energy)) @@ -377,3 +383,11 @@ icon_state = "[unique_reskin[current_skin]][sawn_off ? "-sawn" : ""][chambered ? "" : "-e"]" else icon_state = "[initial(icon_state)][sawn_off ? "-sawn" : ""][chambered ? "" : "-e"]" + +/obj/item/gun/ballistic/shotgun/leveraction/brush + name = "brush gun" + desc = "While lever-actions have been horribly out of date for hundreds of years now, \ + putting a nicely sized hole in a man-sized target with a .45-70 round has stayed relatively timeless." + icon_state = "brushgun" + can_cut = FALSE + mag_type = /obj/item/ammo_box/magazine/internal/shot/levergun/brush diff --git a/html/changelog.html b/html/changelog.html index d85bd6b47a..51b4091b78 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,17 @@ -->
+

13 October 2021

+

Hatterhat updated:

+ +

MrJWhit updated:

+ +

30 September 2021

Hatterhat updated:

GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 3bce254157..1f74ec90d2 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -30120,3 +30120,10 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. to outbreaks, theoretically. Putnam3145: - rscdel: Minesweeper's "play on same board" +2021-10-13: + Hatterhat: + - rscadd: Contraband dealers are now embracing their inner Old Space Westerner. + Look for the Old West Surplus Crate on your mildly-hacked cargo console today. + MrJWhit: + - rscadd: Adds more fire-saftey closets and trashpiles to boxstation + - rscadd: Adds trashpiles to delta. diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index e1caad8279..eb642648af 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 9d9279f148..1504b9f0c7 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ