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

fix skull facepaint, masks #5091

Merged
merged 4 commits into from
Dec 2, 2023
Merged

fix skull facepaint, masks #5091

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed892d8
i fucked up bad
irakligabunia Dec 1, 2023
850d44d
Update code/modules/client/preferences_gear.dm
irakligabunia Dec 2, 2023
9e9f7be
Update code/modules/client/preferences_gear.dm
irakligabunia Dec 2, 2023
30b7084
Update code/modules/client/preferences_gear.dm
irakligabunia Dec 2, 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
12 changes: 6 additions & 6 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,14 +161,14 @@ 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"
/datum/gear/mask/uscm/skull_balaclava_blue
display_name = "USCM balaclava, blue skull"
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"
/datum/gear/mask/uscm/skull_balaclava_black
display_name = "USCM balaclava, black skull"
path = /obj/item/clothing/mask/rebreather/skull/black
cost = 4
slot = WEAR_FACE
Expand Down Expand Up @@ -888,8 +888,8 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
display_name = "Facepaint, black"
path = /obj/item/facepaint/black

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

Expand Down