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

Readds skull facemask and facepaint #5042

Merged
merged 6 commits into from
Nov 27, 2023
Merged

Readds skull facemask and facepaint #5042

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
caba888
Update smgs.dm
irakligabunia Oct 10, 2023
0cd1c5a
Update smgs.dm
irakligabunia Oct 10, 2023
6d4bb12
amiretarded
irakligabunia Oct 10, 2023
1231832
Merge branch 'cmss13-devs:master' into master
irakligabunia Nov 26, 2023
30023c0
skull facepaint
irakligabunia Nov 26, 2023
1e3fbab
skull mask
irakligabunia Nov 26, 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
17 changes: 17 additions & 0 deletions code/modules/client/preferences_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,18 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
display_name = "USCM balaclava, tan"
path = /obj/item/clothing/mask/rebreather/scarf/tan

/datum/gear/skull_balaclava_blue
display_name = "Blue Skull Balaclava"
path = /obj/item/clothing/mask/rebreather/skull
cost = 4 //same as skull facepaint
slot = WEAR_FACE

/datum/gear/skull_balaclava_black
display_name = "Black Skull Balaclava"
path = /obj/item/clothing/mask/rebreather/skull/black
cost = 4
slot = WEAR_FACE

/datum/gear/headwear
category = "Headwear"
cost = 3
Expand Down Expand Up @@ -876,6 +888,11 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
display_name = "Facepaint, black"
path = /obj/item/facepaint/black

/datum/gear/skullfacepaint
display_name = "Skull Facepaint"
path = /obj/item/facepaint/skull
cost = 3

/datum/gear/misc/facepaint_body
display_name = "Fullbody paint"
path = /obj/item/facepaint/sniper
Expand Down
Loading