Skip to content

Commit

Permalink
[READY] CatEarHeadphones Donor item (#148)
Browse files Browse the repository at this point in the history 
* CatEarHeadphones

* Forgot to give the configs a name.

* Moved code to donator_items.dm

* Fixed runtime errors

* Added holographic tail, activated by altclick

* Removed backups

* CatEarHeadphones

* Forgot to give the configs a name.

* Moved code to donator_items.dm

* Fixed runtime errors

* Added holographic tail, activated by altclick

* Removed backups

* Adding a comment.

* removing comment

---------

Co-authored-by: dtfe3 <[email protected]>
Co-authored-by: dtfe <[email protected]>
  • Loading branch information
@Steals-The-PRs @dtfe3 @dtfe
3 people authored Oct 19, 2023
1 parent 22c0ffc commit 808ab72
Show file tree
Hide file tree
Showing 9 changed files with 262 additions and 0 deletions.
22 changes: 22 additions & 0 deletions modular_skyrat/modules/GAGS/greyscale_configs.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,28 @@
/datum/greyscale_config/standalone_hood/worn/oldvox
icon_file = 'modular_skyrat/modules/GAGS/icons/head/head_oldvox.dmi'

// CATEAR HEADPHONES

/datum/greyscale_config/catear_headphone
name = "Cat-ear Headphones"
icon_file = 'modular_skyrat/modules/GAGS/icons/head/catear_headphone.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/head/catear_headphone/catear_headphone.json'

/datum/greyscale_config/catear_headphone/worn
name = "Cat-ear Headphones (Worn)"
icon_file = 'modular_skyrat/modules/GAGS/icons/head/catear_headphone.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/head/catear_headphone/catear_headphone_worn.json'

/datum/greyscale_config/catear_headphone_inhand_left
name = "Cat-ear Headphones (Inhand Left)"
icon_file = 'modular_skyrat/modules/GAGS/icons/head/catear_headphone_inhand.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/head/catear_headphone/catear_headphone_worn_inhand_left.json'

/datum/greyscale_config/catear_headphone_inhand_right
name = "Cat-ear Headphones (Inhand Right)"
icon_file = 'modular_skyrat/modules/GAGS/icons/head/catear_headphone_inhand.dmi'
json_config = 'modular_skyrat/modules/GAGS/json_configs/head/catear_headphone/catear_headphone_worn_inhand_right.json'

/*
* MASKS
*/
Expand Down
Binary file added modular_skyrat/modules/GAGS/icons/head/catear_headphone.dmi
View file
Binary file not shown.
Binary file added modular_skyrat/modules/GAGS/icons/head/catear_headphone_inhand.dmi
View file
Binary file not shown.
58 changes: 58 additions & 0 deletions modular_skyrat/modules/GAGS/json_configs/head/catear_headphone/catear_headphone.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"catear_headphone": [
{
"type": "icon_state",
"icon_state": "catearphones_obj_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catearphones_obj_lights",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
],
"catear_headphone_on": [
{
"type": "icon_state",
"icon_state": "catearphones_obj_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catearphones_obj_lights",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
],
"catear_headphone_tail": [
{
"type": "icon_state",
"icon_state": "catearphones_obj_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catearphones_obj_lights",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
],
"catear_headphone_tail_on": [
{
"type": "icon_state",
"icon_state": "catearphones_obj_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catearphones_obj_lights",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
71 changes: 71 additions & 0 deletions modular_skyrat/modules/GAGS/json_configs/head/catear_headphone/catear_headphone_worn.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
"catear_headphone": [
{
"type": "icon_state",
"icon_state": "catearphones_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catearphones_off",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
],
"catear_headphone_on":[
{
"type": "icon_state",
"icon_state": "catearphones_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catearphones_on",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}

],
"catear_headphone_tail": [
{
"type": "icon_state",
"icon_state": "catearphones_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catearphones_off",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "catearphones_tail_on",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
],
"catear_headphone_tail_on": [
{
"type": "icon_state",
"icon_state": "catearphones_base",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catearphones_on",
"blend_mode": "overlay",
"color_ids": [ 2 ]
},
{
"type": "icon_state",
"icon_state": "catearphones_tail_on",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
]
}
31 changes: 31 additions & 0 deletions ...at/modules/GAGS/json_configs/head/catear_headphone/catear_headphone_worn_inhand_left.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"catear_headphone": [
{
"type": "icon_state",
"icon_state": "catear_headphones_left",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catear_headphones_left_color",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
],
"catear_headphone_on":[
{
"type": "icon_state",
"icon_state": "catear_headphones_left",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catear_headphones_left_color",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}

]
}
31 changes: 31 additions & 0 deletions ...t/modules/GAGS/json_configs/head/catear_headphone/catear_headphone_worn_inhand_right.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"catear_headphone": [
{
"type": "icon_state",
"icon_state": "catear_headphones_right",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catear_headphones_right_color",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}
],
"catear_headphone_on":[
{
"type": "icon_state",
"icon_state": "catear_headphones_right",
"blend_mode": "overlay",
"color_ids": [ 1 ]
},
{
"type": "icon_state",
"icon_state": "catear_headphones_right_color",
"blend_mode": "overlay",
"color_ids": [ 2 ]
}

]
}
44 changes: 44 additions & 0 deletions modular_skyrat/modules/customization/modules/clothing/~donator/donator_items.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,47 @@
. = ..()
. += span_notice("<i>Etched underneath the handle is the following message:</i>\n")
. += span_smallnoticeital("\"I told you I would find a way to make it all easier.\" - A.H.")

/obj/item/instrument/piano_synth/headphones/catear_headphone
name = "Cat-Ear Headphones"
desc = "Merch of their Electric Guitarist Demi Galgan from the Singularity Shredders. It's heavily customizable and even comes with a holographic tail!"
icon_state = "catear_headphone"
worn_icon = 'modular_skyrat/modules/GAGS/icons/head/catear_headphone.dmi'
lefthand_file = 'modular_skyrat/modules/GAGS/icons/head/catear_headphone_inhand.dmi'
righthand_file = 'modular_skyrat/modules/GAGS/icons/head/catear_headphone_inhand.dmi'
inhand_icon_state = "catear_headphone"
slot_flags = ITEM_SLOT_EARS | ITEM_SLOT_HEAD | ITEM_SLOT_NECK
var/catTailToggled = FALSE
instrument_range = 1
greyscale_colors = "#FFFFFF#FFFFFF"
greyscale_config = /datum/greyscale_config/catear_headphone
greyscale_config_worn = /datum/greyscale_config/catear_headphone/worn
greyscale_config_inhand_left = /datum/greyscale_config/catear_headphone_inhand_left
greyscale_config_inhand_right = /datum/greyscale_config/catear_headphone_inhand_right
flags_1 = IS_PLAYER_COLORABLE_1


/obj/item/instrument/piano_synth/headphones/catear_headphone/Initialize(mapload)
. = ..()
AddElement(/datum/element/gags_recolorable)
update_icon(UPDATE_OVERLAYS)

/obj/item/instrument/piano_synth/headphones/catear_headphone/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
. = ..()
if(!isinhands)
. += emissive_appearance('modular_skyrat/modules/GAGS/icons/head/catear_headphone.dmi', "catearphones_[song?.playing ? "on" : "off"]_emissive", src, alpha = src.alpha)
if(catTailToggled)
. += emissive_appearance('modular_skyrat/modules/GAGS/icons/head/catear_headphone.dmi', "catearphones_tail_on_emissive", src, alpha = src.alpha)
icon_state = "catear_headphone_tail[song?.playing ? "_on" : null]"
else
icon_state = "catear_headphone[song?.playing ? "_on" : null]"

/obj/item/instrument/piano_synth/headphones/catear_headphone/AltClick(mob/user)
. = ..()
catTailToggled = !catTailToggled
user.update_worn_head()
update_icon(UPDATE_OVERLAYS)

/obj/item/instrument/piano_synth/headphones/catear_headphone/update_overlays()
. = ..()
. += emissive_appearance('modular_skyrat/modules/GAGS/icons/head/catear_headphone.dmi', "catearphones_obj_lights_emissive", src, alpha = src.alpha)
5 changes: 5 additions & 0 deletions modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,3 +724,8 @@
name = "Nobility Dresscoat"
item_path = /obj/item/clothing/suit/toggle/labcoat/medical/vic_dresscoat_donator
ckeywhitelist = list("nikotheguydude")

/datum/loadout_item/head/catear_headphone
name = "Cat-Ear Headphones"
item_path = /obj/item/instrument/piano_synth/headphones/catear_headphone
ckeywhitelist = list("dtfe")

0 comments on commit 808ab72

Please sign in to comment.