Skip to content

Commit

Permalink
External webbing can hold firearms (#4482)
Browse files Browse the repository at this point in the history
# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->
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
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# 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:
  • Loading branch information
QuickLode authored Sep 28, 2023
1 parent 97be59d commit 9484615
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
11 changes: 11 additions & 0 deletions code/modules/clothing/suits/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand All @@ -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
Expand Down
9 changes: 9 additions & 0 deletions code/modules/clothing/suits/marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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,
)
Expand Down
20 changes: 20 additions & 0 deletions code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -282,13 +282,20 @@
/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/tool/pen,
/obj/item/storage/large_holster/machete,
/obj/item/storage/large_holster/katana,
/obj/item/device/motiondetector,
)

Expand All @@ -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,
)

Expand Down Expand Up @@ -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,
Expand All @@ -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
Expand Down

0 comments on commit 9484615

Please sign in to comment.