From 948461582412b8544f988c8971f5f811600ce72c Mon Sep 17 00:00:00 2001 From: QuickLode <63271983+QuickLode@users.noreply.github.com> Date: Thu, 28 Sep 2023 00:05:17 -0700 Subject: [PATCH] External webbing can hold firearms (#4482) # About the pull request saw and this revives idea of #3983 #4027 - removes ext webbing from staff officers(Morrow request) - allows ext webbing to hold belts and firearm - jackets that can hold machete scabbard can hold katana scabbard. not dutch because dutch is for dutch # Explain why it's good for the game pr no longer stale Webbings are made to hold things such as holsters, pouches, or indeed even slinging your firearm. It shouldn't prevent you from holding a firearm. For balancing purposes Morrow would like SO Lockers to not hold this ext webbing which makes sense. # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: add: Allows ext webbing to hold firearms. fix: exosuits which can hold scabbards can hold similar scabbards(ie, machete and katana) del: Removes ext webbing from SO Locker /:cl: --- .../closets/secure/cm_closets.dm | 2 -- code/modules/clothing/suits/jobs.dm | 11 ++++++++++ code/modules/clothing/suits/marine_armor.dm | 9 +++++++++ code/modules/clothing/suits/miscellaneous.dm | 20 +++++++++++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm index 0ff7c4317193..ffd993777644 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm @@ -62,8 +62,6 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) new /obj/item/storage/belt/marine(src) new /obj/item/clothing/under/marine/officer/boiler(src) new /obj/item/clothing/under/marine/officer/boiler(src) - new /obj/item/clothing/suit/storage/webbing(src) - new /obj/item/clothing/suit/storage/webbing(src) new /obj/item/clothing/gloves/combat(src) new /obj/item/clothing/gloves/combat(src) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 5dbcf5b7cf81..a28a143f4ff0 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -61,6 +61,7 @@ /obj/item/attachable/bayonet, /obj/item/storage/backpack/general_belt, /obj/item/storage/large_holster/machete, + /obj/item/storage/large_holster/katana, /obj/item/storage/belt/gun/m4a3, /obj/item/storage/belt/gun/m44, /obj/item/storage/belt/gun/smartpistol, @@ -201,6 +202,7 @@ /obj/item/tool/crew_monitor, /obj/item/tool/pen, /obj/item/storage/large_holster/machete, + /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, ) armor_melee = CLOTHING_ARMOR_MEDIUMLOW @@ -260,6 +262,7 @@ /obj/item/tool/crew_monitor, /obj/item/tool/pen, /obj/item/storage/large_holster/machete, + /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, ) armor_melee = CLOTHING_ARMOR_MEDIUMLOW @@ -323,6 +326,7 @@ /obj/item/tool/crew_monitor, /obj/item/tool/pen, /obj/item/storage/large_holster/machete, + /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, ) flags_armor_protection = BODY_FLAG_CHEST @@ -409,6 +413,12 @@ /obj/item/device/binoculars, /obj/item/attachable/bayonet, + /obj/item/storage/belt/gun/m4a3, + /obj/item/storage/belt/gun/m44, + /obj/item/storage/belt/gun/mateba, + /obj/item/storage/belt/gun/smartpistol, + /obj/item/weapon/gun, + /obj/item/device/flashlight, /obj/item/device/healthanalyzer, /obj/item/device/radio, @@ -417,6 +427,7 @@ /obj/item/tool/crew_monitor, /obj/item/tool/pen, /obj/item/storage/large_holster/machete, + /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, ) flags_armor_protection = BODY_FLAG_CHEST|BODY_FLAG_ARMS diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 5e4ea48a43de..008e1c596782 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -1033,9 +1033,13 @@ /obj/item/tool/lighter, /obj/item/explosive/grenade, /obj/item/storage/bible, + /obj/item/tool/crowbar, + /obj/item/storage/large_holster/katana, + /obj/item/storage/large_holster/machete, /obj/item/weapon/claymore/mercsword/machete, /obj/item/attachable/bayonet, /obj/item/device/motiondetector, + /obj/item/tool/crew_monitor, /obj/item/device/walkman, ) uniform_restricted = list(/obj/item/clothing/under/marine/veteran/pmc) @@ -1490,7 +1494,12 @@ /obj/item/tool/crowbar, /obj/item/tool/crew_monitor, /obj/item/tool/pen, + /obj/item/storage/belt/gun/m4a3, + /obj/item/storage/belt/gun/m44, + /obj/item/storage/belt/gun/mateba, + /obj/item/storage/belt/gun/smartpistol, /obj/item/storage/large_holster/machete, + /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, /obj/item/device/walkman, ) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index c51f5f2575ed..2a3cff05ee1e 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -282,6 +282,12 @@ /obj/item/device/binoculars, /obj/item/attachable/bayonet, + /obj/item/storage/belt/gun/m4a3, + /obj/item/storage/belt/gun/m44, + /obj/item/storage/belt/gun/mateba, + /obj/item/storage/belt/gun/smartpistol, + /obj/item/weapon/gun, + /obj/item/device/flashlight, /obj/item/device/healthanalyzer, /obj/item/device/radio, @@ -289,6 +295,7 @@ /obj/item/tool/crew_monitor, /obj/item/tool/pen, /obj/item/storage/large_holster/machete, + /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, ) @@ -303,12 +310,19 @@ /obj/item/device/binoculars, /obj/item/attachable/bayonet, + /obj/item/storage/belt/gun/m4a3, + /obj/item/storage/belt/gun/m44, + /obj/item/storage/belt/gun/mateba, + /obj/item/storage/belt/gun/smartpistol, + /obj/item/weapon/gun, + /obj/item/device/flashlight, /obj/item/device/healthanalyzer, /obj/item/device/radio, /obj/item/tool/crowbar, /obj/item/tool/crew_monitor, /obj/item/storage/large_holster/machete, + /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, ) @@ -433,6 +447,11 @@ /obj/item/device/binoculars, /obj/item/attachable/bayonet, + /obj/item/storage/belt/gun/m4a3, + /obj/item/storage/belt/gun/m44, + /obj/item/storage/belt/gun/mateba, + /obj/item/storage/belt/gun/smartpistol, + /obj/item/weapon/gun, /obj/item/device/flashlight, /obj/item/device/healthanalyzer, @@ -442,6 +461,7 @@ /obj/item/tool/crew_monitor, /obj/item/tool/pen, /obj/item/storage/large_holster/machete, + /obj/item/storage/large_holster/katana, /obj/item/device/motiondetector, ) min_cold_protection_temperature = T0C