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.

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

Helmet Camo Covers #413

Merged
merged 23 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0ac9b91
Da Revolva
Mar 27, 2024
b1f8fc5
Oopsiedaisies
Mar 27, 2024
2803a43
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 30, 2024
e747764
Revert "Oopsiedaisies"
Mar 30, 2024
c3cee8a
Auto stash before revert of "Oopsiedaisies"
Mar 30, 2024
6c995e9
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 31, 2024
763913d
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 3, 2024
0fae340
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 5, 2024
49133af
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 7, 2024
4e9b759
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 8, 2024
807e1ae
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 10, 2024
2aa51ac
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 23, 2024
47fb185
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
May 21, 2024
cd11ccc
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 15, 2024
939b7fa
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 22, 2024
5256522
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 23, 2024
e3d4a54
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 25, 2024
0f33748
Fix
Aug 25, 2024
a54119c
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 25, 2024
09a504a
WIP on soro
Aug 25, 2024
acc9347
Vendor Addition
Aug 25, 2024
1e39245
Fixes
Aug 25, 2024
4c3fac7
Objs
Aug 25, 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
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
list("M1A1 Ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/v2, VENDOR_ITEM_REGULAR),
list("Prescription ballistic goggles", round(scale * 10), /obj/item/clothing/glasses/mgoggles/prescription, VENDOR_ITEM_REGULAR),
list("Marine RPG glasses", round(scale * 10), /obj/item/clothing/glasses/regular, VENDOR_ITEM_REGULAR),
list("M5 Integrated Gas Mask", round(scale * 10), /obj/item/prop/helmetgarb/helmet_gasmask, VENDOR_ITEM_REGULAR),
AndroBetel marked this conversation as resolved.
Show resolved Hide resolved
list("M10 Helmet Camouflage Wrap", round(scale * 10), /obj/item/prop/helmetgarb/camocover, VENDOR_ITEM_REGULAR),
list("M10 Helmet Netting", round(scale * 10), /obj/item/prop/helmetgarb/netting, VENDOR_ITEM_REGULAR),
list("M10 Helmet Rain Cover", round(scale * 10), /obj/item/prop/helmetgarb/raincover, VENDOR_ITEM_REGULAR),
list("Firearm Lubricant", round(scale * 15), /obj/item/prop/helmetgarb/gunoil, VENDOR_ITEM_REGULAR),
Expand Down
9 changes: 9 additions & 0 deletions code/game/objects/items/props/helmetgarb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@
desc = "The standard M10 combat helmet is already water-resistant at depths of up to 10 meters. This makes the top potentially water-proof. At least it's something."
icon_state = "raincover"

/obj/item/prop/helmetgarb/camocover
name = "camocover"
desc = "A cover that goes over the top of an M10 pattern helmet to camoflauge it without needing the use of paints."
icon_state = "camocover"

/obj/item/prop/helmetgarb/camocover/Initialize(mapload, ...)
. = ..()
select_gamemode_skin(/obj/item/prop/helmetgarb/camocover)

/obj/item/prop/helmetgarb/rabbitsfoot
name = "Rabbit's Foot"
desc = "Lucky for you, but not the rabbit, didn't really do it much good."
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/prop/helmetgarb/cartridge = "cartridge",
/obj/item/prop/helmetgarb/prescription_bottle = "prescription_bottle",
/obj/item/prop/helmetgarb/raincover = "raincover",
/obj/item/prop/helmetgarb/camocover = "camocover",
/obj/item/prop/helmetgarb/rabbitsfoot = "rabbitsfoot",
/obj/item/prop/helmetgarb/rosary = "helmet_rosary", // This one was already in the game for some reason, but never had an object
/obj/item/prop/helmetgarb/lucky_feather = "lucky_feather",
Expand Down
Binary file modified icons/mob/humans/onmob/helmet_garb.dmi
Binary file not shown.
Binary file modified icons/obj/items/helmet_garb.dmi
Binary file not shown.
Loading