Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

External webbing can hold firearms #4482

Merged
merged 7 commits into from
Sep 28, 2023
Merged

External webbing can hold firearms #4482

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6dce3fb
external webbing can web over belts
QuickLode Sep 23, 2023
a02293e
consistency
QuickLode Sep 23, 2023
590670f
scabbard on m4syn
QuickLode Sep 23, 2023
e1af468
conssitency
QuickLode Sep 23, 2023
0eb129c
fx
QuickLode Sep 23, 2023
0c89251
fix pace
QuickLode Sep 28, 2023
4791ad6
Merge branch 'master' into externalwebbing
QuickLode Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm
View file
Open in desktop
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/command(src)
new /obj/item/clothing/under/marine/officer/command(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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,9 +1074,13 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150
/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 @@ -1529,7 +1533,12 @@ var/list/squad_colors_chat = list(rgb(230,125,125), rgb(255,230,80), rgb(255,150
/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
View file
Open in desktop
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,
QuickLode marked this conversation as resolved.
Show resolved Hide resolved
/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