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

adds non-spec ghillie suit type #301

Merged
merged 5 commits into from
Sep 4, 2024
Merged

adds non-spec ghillie suit type #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a5a14b
Update marine_armor.dm
AndroBetel Jun 21, 2024
f092aa0
Merge branch 'master' of https://github.com/cmss13-devs/cmss13-pve in…
AndroBetel Aug 24, 2024
7995f62
1
AndroBetel Aug 24, 2024
e2e0a23
Update marine_armor.dm
AndroBetel Aug 24, 2024
148416b
s
AndroBetel Aug 24, 2024
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
3 changes: 1 addition & 2 deletions code/modules/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,8 +901,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
flags_inventory = BLOCKSHARPOBJ
flags_inv_hide = HIDEEARS|HIDETOPHAIR
flags_marine_helmet = HELMET_GARB_OVERLAY
flags_item = MOB_LOCK_ON_EQUIP
specialty = "M45 ghillie"
specialty = "M10 ghillie"

/obj/item/clothing/head/helmet/marine/CO
name = "\improper M10 pattern commanding officer helmet"
Expand Down
10 changes: 10 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 @@ -514,6 +514,16 @@
/obj/item/clothing/suit/storage/marine/medium
armor_variation = 6

/obj/item/clothing/suit/storage/marine/medium/non_spec_ghillie //doesnt have sniper spec shit associated with it
name = "\improper M40 pattern ghillie armor"
desc = "An older variant of camouflage suit used by snipers and scouts. While cheap to produce and easy to use, this suit of armor doesn't offer same level of stealth as newer M45 with integrated heatsink."
icon_state = "ghillie_armor"
armor_bio = CLOTHING_ARMOR_MEDIUMHIGH
flags_marine_armor = ARMOR_LAMP_OVERLAY
specialty = "M40 pattern ghillie"
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL)
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)

/obj/item/clothing/suit/storage/marine/light
name = "\improper M3-L pattern light armor"
desc = "A lighter, cut down version of the standard M3 pattern armor. It sacrifices durability for more speed."
Expand Down
Loading