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 a white eyepatch #6042

Closed
wants to merge 3 commits into from
Closed

Adds a white eyepatch #6042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0986276
Adds a white eyepatch
MOONPRINCESS17 Mar 29, 2024
5516f93
Requested changes
MOONPRINCESS17 Mar 30, 2024
23c3ae3
Merge branch 'master' into master
MOONPRINCESS17 Mar 30, 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
4 changes: 4 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 @@ -37,6 +37,10 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name)
display_name = "Eyepatch"
path = /obj/item/clothing/glasses/eyepatch

/datum/gear/eyewear/eyepatch/white
display_name = "White Eyepatch"
path = /obj/item/clothing/glasses/eyepatch/white

/datum/gear/eyewear/rpg_glasses
display_name = "Marine RPG Glasses"
path = /obj/item/clothing/glasses/regular
Expand Down
9 changes: 9 additions & 0 deletions code/modules/clothing/glasses/glasses.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,15 @@
flags_armor_protection = 0
flags_equip_slot = SLOT_EYES|SLOT_FACE

/obj/item/clothing/glasses/eyepatch/white
name = "white eyepatch"
gender = NEUTER
desc = "A white rectangular eyepatch made out of cloth, ostensibly for medical purposes. Still, even while recovering from an injury, do not underestimate the power of the Tyrant Eye!"
icon_state = "eyepatch_white"
item_state = "eyepatch_white"
flags_armor_protection = 0
flags_equip_slot = SLOT_EYES|SLOT_FACE

/obj/item/clothing/glasses/monocle
name = "monocle"
gender = NEUTER
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/clothing/glasses/sunglasses/big = "bigsunglasses",
/obj/item/clothing/glasses/sunglasses/sechud = "sechud",
/obj/item/clothing/glasses/eyepatch = "eyepatch",
/obj/item/clothing/glasses/eyepatch/white = "white eyepatch",
/obj/item/clothing/glasses/regular/hipster = "persc-glasses",

// WALKMAN AND CASSETTES
Expand Down
Binary file modified icons/mob/humans/onmob/eyes.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/glasses.dmi
View file
Open in desktop
Binary file not shown.
Loading