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

Send in the nyarines #452

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions code/game/objects/items/props/helmetgarb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -632,3 +632,9 @@
icon = 'icons/obj/items/spray.dmi'
icon_state = "pestspray"
w_class = SIZE_SMALL

/obj/item/prop/helmetgarb/cat_ears
name = "'tactical' cat ears'"
desc = "A set of magnetic cat-ears capable of being mounted onto a helmet. You're either brave, stupid or really like getting beaten up if you wear these around the barracks."
icon_state = "kitty_coded"
w_class = SIZE_SMALL
4 changes: 4 additions & 0 deletions code/modules/client/preferences_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,10 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
path = /obj/item/prop/helmetgarb/chaplain_patch
allowed_origins = USCM_ORIGINS

/datum/gear/helmet_garb/cat_ears
display_name = "'Tactical' cat ears"
path = /obj/item/prop/helmetgarb/cat_ears

/datum/gear/paperwork
category = "Paperwork"

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 @@ -307,6 +307,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/prop/helmetgarb/family_photo = "family_photo",
/obj/item/prop/helmetgarb/compass = "compass",
/obj/item/prop/helmetgarb/bug_spray = "bug_spray",
/obj/item/prop/helmetgarb/cat_ears = "kitty_coded",

// MISC
/obj/item/tool/pen = "helmet_pen_black",
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