From 11e109c37c42418970744371b4330fd2f73bc2a6 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 31 Oct 2023 23:34:32 +0100 Subject: [PATCH] [MIRROR] You cannot store ammo casings (individual bullets) and ammo boxes (like magazines) in your suit storage [MDB IGNORE] (#24691) * You cannot store ammo casings (individual bullets) and ammo boxes (like magazines) in your suit storage (#79311) ## About The Pull Request What it says on the tin. ## Why It's Good For The Game A) This messes with hotkey muscle memory quite significantly. Unless you have something in suit storage when you go to put a magazine back into your other storage (like your belt), you may accidentally place it into your suit storage. B) This may be why people think magnetic holsters are bad/don't work. Operatives sometimes hotswap half clips, and what might happen during a particularly intense combat is that they inadvertently put the magazine they just pulled from their gun into their suit storage because they're hotkeying; denying them their magnetic holster's major upside. Snapping their guns back into their storage and away from prying assistant hands. C) It serves no tactical purpose to put a bullet into your suit storage over the gun itself. Priority should always be to the belt storage. ## Changelog :cl: qol: To avoid poor magazine discipline, most combat-ready personnel have instructed _not_ to put magazines into the gun loops on their armor vests. /:cl: * You cannot store ammo casings (individual bullets) and ammo boxes (like magazines) in your suit storage --------- Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> --- code/__DEFINES/inventory.dm | 6 ----- .../clothing/spacesuits/bountyhunter.dm | 2 +- code/modules/clothing/spacesuits/freedom.dm | 2 +- code/modules/clothing/spacesuits/pirate.dm | 2 +- .../modules/clothing/spacesuits/specialops.dm | 2 +- code/modules/clothing/spacesuits/syndi.dm | 2 +- code/modules/mod/mod_theme.dm | 22 ------------------- 7 files changed, 5 insertions(+), 33 deletions(-) diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 5bf9fd6d807..3e19baa5b8a 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -194,8 +194,6 @@ //Allowed equipment lists for security vests. GLOBAL_LIST_INIT(detective_vest_allowed, list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/detective_scanner, /obj/item/flashlight, /obj/item/gun/ballistic, @@ -216,8 +214,6 @@ GLOBAL_LIST_INIT(detective_vest_allowed, list( )) GLOBAL_LIST_INIT(security_vest_allowed, list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/flashlight, /obj/item/gun/ballistic, /obj/item/gun/energy, @@ -235,8 +231,6 @@ GLOBAL_LIST_INIT(security_vest_allowed, list( )) GLOBAL_LIST_INIT(security_wintercoat_allowed, list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/gun/ballistic, /obj/item/gun/energy, /obj/item/melee/baton, diff --git a/code/modules/clothing/spacesuits/bountyhunter.dm b/code/modules/clothing/spacesuits/bountyhunter.dm index 0c83e1b01d2..9218deb5633 100644 --- a/code/modules/clothing/spacesuits/bountyhunter.dm +++ b/code/modules/clothing/spacesuits/bountyhunter.dm @@ -3,7 +3,7 @@ desc = "A custom version of the MK.II SWAT suit, modified to look rugged and tough. Works as a space suit, if you can find a helmet." icon_state = "hunter" inhand_icon_state = "swat_suit" - allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/knife/combat) + allowed = list(/obj/item/gun, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/knife/combat) armor_type = /datum/armor/space_hunter strip_delay = 130 resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/code/modules/clothing/spacesuits/freedom.dm b/code/modules/clothing/spacesuits/freedom.dm index 73343a82eee..b0a08f4cc73 100644 --- a/code/modules/clothing/spacesuits/freedom.dm +++ b/code/modules/clothing/spacesuits/freedom.dm @@ -25,7 +25,7 @@ desc = "An advanced, light suit, fabricated from a mixture of synthetic feathers and space-resistant material. A gun holster appears to be integrated into the suit and the wings appear to be stuck in 'freedom' mode." icon_state = "freedom" inhand_icon_state = null - allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals) + allowed = list(/obj/item/gun, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals) armor_type = /datum/armor/space_freedom strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT diff --git a/code/modules/clothing/spacesuits/pirate.dm b/code/modules/clothing/spacesuits/pirate.dm index 34a495b4dbe..946c0c2b66f 100644 --- a/code/modules/clothing/spacesuits/pirate.dm +++ b/code/modules/clothing/spacesuits/pirate.dm @@ -25,7 +25,7 @@ desc = "A modified suit to allow space pirates to board shuttles and stations while avoiding the maw of the void. Comes with additional protection and is lighter to move in." icon_state = "spacepirate" w_class = WEIGHT_CLASS_NORMAL - allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/cup/glass/bottle/rum) + allowed = list(/obj/item/gun, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/cup/glass/bottle/rum) slowdown = 0 armor_type = /datum/armor/space_pirate strip_delay = 40 diff --git a/code/modules/clothing/spacesuits/specialops.dm b/code/modules/clothing/spacesuits/specialops.dm index 3634066e72f..cf8fc2a475c 100644 --- a/code/modules/clothing/spacesuits/specialops.dm +++ b/code/modules/clothing/spacesuits/specialops.dm @@ -35,7 +35,7 @@ slowdown = 0 flags_inv = 0 w_class = WEIGHT_CLASS_NORMAL - allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals) + allowed = list(/obj/item/gun, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals) armor_type = /datum/armor/space_officer strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index d9939a46621..cbacf064052 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -38,7 +38,7 @@ GLOBAL_LIST_INIT(syndicate_space_suits_to_helmets,list( inhand_icon_state = "space_suit_syndicate" desc = "Has a tag on it: Totally not property of an enemy corporation, honest!" w_class = WEIGHT_CLASS_NORMAL - allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals) + allowed = list(/obj/item/gun, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals) armor_type = /datum/armor/space_syndicate cell = /obj/item/stock_parts/cell/hyper var/helmet_type = /obj/item/clothing/head/helmet/space/syndicate diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index 9adaaf4f146..c8611ab7bd0 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -702,8 +702,6 @@ slowdown_inactive = 1 slowdown_active = 0.5 allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/reagent_containers/spray/pepper, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, @@ -765,8 +763,6 @@ slowdown_inactive = 0.75 slowdown_active = 0.25 allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/reagent_containers/spray/pepper, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, @@ -832,8 +828,6 @@ slowdown_inactive = 0.75 slowdown_active = 0.25 allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, /obj/item/melee/baton, @@ -958,8 +952,6 @@ resistance_flags = FIRE_PROOF inbuilt_modules = list(/obj/item/mod/module/armor_booster) allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, /obj/item/melee/baton, @@ -1051,8 +1043,6 @@ ui_theme = "syndicate" inbuilt_modules = list(/obj/item/mod/module/armor_booster) allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, /obj/item/melee/baton, @@ -1120,8 +1110,6 @@ slot_flags = ITEM_SLOT_BELT inbuilt_modules = list(/obj/item/mod/module/infiltrator, /obj/item/mod/module/storage/belt, /obj/item/mod/module/demoralizer) allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, /obj/item/melee/baton, @@ -1185,8 +1173,6 @@ slowdown_active = -0.5 inbuilt_modules = list(/obj/item/mod/module/quick_carry/advanced, /obj/item/mod/module/organ_thrower) allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/assembly/flash, /obj/item/healthanalyzer, /obj/item/melee/baton, @@ -1329,8 +1315,6 @@ inbuilt_modules = list(/obj/item/mod/module/welding/camera_vision, /obj/item/mod/module/hacker, /obj/item/mod/module/weapon_recall, /obj/item/mod/module/adrenaline_boost, /obj/item/mod/module/energy_net) allowed_suit_storage = list( /obj/item/gun, - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, ) @@ -1454,8 +1438,6 @@ slowdown_inactive = 0.5 slowdown_active = 0 allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, /obj/item/melee/baton, @@ -1540,8 +1522,6 @@ siemens_coefficient = 0 complexity_max = DEFAULT_MAX_COMPLEXITY + 10 allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, /obj/item/melee/baton, @@ -1604,8 +1584,6 @@ slowdown_inactive = 0.5 slowdown_active = 0 allowed_suit_storage = list( - /obj/item/ammo_box, - /obj/item/ammo_casing, /obj/item/restraints/handcuffs, /obj/item/assembly/flash, /obj/item/melee/baton,