mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 02:34:00 +00:00
[MIRROR] VerySoft Fluff Item! (#7133)
Co-authored-by: Casey <a.roaming.shadow@gmail.com> Co-authored-by: Nadyr <41974248+Darlantanis@users.noreply.github.com>
This commit is contained in:
@@ -1326,15 +1326,9 @@
|
|||||||
|
|
||||||
/datum/gear/fluff/harmony_id
|
/datum/gear/fluff/harmony_id
|
||||||
path = /obj/item/weapon/card/id/event/polymorphic/itg
|
path = /obj/item/weapon/card/id/event/polymorphic/itg
|
||||||
display_name = "Harmony's ITG-ID card"
|
display_name = "ITG-ID card"
|
||||||
ckeywhitelist = list("verysoft")
|
ckeywhitelist = list("verysoft")
|
||||||
character_name = list("Harmony")
|
character_name = null
|
||||||
|
|
||||||
/datum/gear/fluff/shinerunner_id
|
|
||||||
path = /obj/item/weapon/card/id/event/polymorphic/itg
|
|
||||||
display_name = "Shine-Runner's ITG-ID card"
|
|
||||||
ckeywhitelist = list("verysoft")
|
|
||||||
character_name = list("Shine-Runner")
|
|
||||||
|
|
||||||
/datum/gear/fluff/dessa_hat
|
/datum/gear/fluff/dessa_hat
|
||||||
path = /obj/item/clothing/head/fluff/giantbow/dessa
|
path = /obj/item/clothing/head/fluff/giantbow/dessa
|
||||||
@@ -1347,6 +1341,13 @@
|
|||||||
..()
|
..()
|
||||||
gear_tweaks += gear_tweak_free_color_choice
|
gear_tweaks += gear_tweak_free_color_choice
|
||||||
|
|
||||||
|
/datum/gear/fluff/casey_glasses
|
||||||
|
path = /obj/item/clothing/glasses/big_round
|
||||||
|
display_name = "Big Round Glasses"
|
||||||
|
slot = slot_glasses
|
||||||
|
ckeywhitelist = list("verysoft")
|
||||||
|
character_name = null
|
||||||
|
|
||||||
// W CKEYS
|
// W CKEYS
|
||||||
/datum/gear/fluff/sthasha_bracer
|
/datum/gear/fluff/sthasha_bracer
|
||||||
path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha
|
path = /obj/item/clothing/accessory/bracer/fluff/xander_sthasha
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ BLIND // can't see anything
|
|||||||
SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi',
|
SPECIES_TESHARI = 'icons/inventory/eyes/mob_teshari.dmi',
|
||||||
SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi'
|
SPECIES_VOX = 'icons/inventory/eyes/mob_vox.dmi'
|
||||||
)
|
)
|
||||||
|
var/glasses_layer_above = FALSE
|
||||||
|
|
||||||
/obj/item/clothing/glasses/update_clothing_icon()
|
/obj/item/clothing/glasses/update_clothing_icon()
|
||||||
if (ismob(src.loc))
|
if (ismob(src.loc))
|
||||||
|
|||||||
@@ -87,20 +87,21 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
|
|||||||
#define EARS_LAYER 24 //Both ear-slot items (combined image)
|
#define EARS_LAYER 24 //Both ear-slot items (combined image)
|
||||||
#define EYES_LAYER 25 //Mob's eyes (used for glowing eyes)
|
#define EYES_LAYER 25 //Mob's eyes (used for glowing eyes)
|
||||||
#define FACEMASK_LAYER 26 //Mask-slot item
|
#define FACEMASK_LAYER 26 //Mask-slot item
|
||||||
#define HEAD_LAYER 27 //Head-slot item
|
#define GLASSES_LAYER_ALT 27 //So some glasses can appear on top of hair and things
|
||||||
#define HANDCUFF_LAYER 28 //Handcuffs, if the human is handcuffed, in a secret inv slot
|
#define HEAD_LAYER 28 //Head-slot item
|
||||||
#define LEGCUFF_LAYER 29 //Same as handcuffs, for legcuffs
|
#define HANDCUFF_LAYER 29 //Handcuffs, if the human is handcuffed, in a secret inv slot
|
||||||
#define L_HAND_LAYER 30 //Left-hand item
|
#define LEGCUFF_LAYER 30 //Same as handcuffs, for legcuffs
|
||||||
#define R_HAND_LAYER 31 //Right-hand item
|
#define L_HAND_LAYER 31 //Left-hand item
|
||||||
#define WING_LAYER 32 //Wings or protrusions over the suit.
|
#define R_HAND_LAYER 32 //Right-hand item
|
||||||
#define VORE_BELLY_LAYER 33 //CHOMPStation edit - Move this and everything after up if things are added.
|
#define WING_LAYER 33 //Wings or protrusions over the suit.
|
||||||
#define VORE_TAIL_LAYER 34 //CHOMPStation edit - Move this and everything after up if things are added.
|
#define VORE_BELLY_LAYER 34 //CHOMPStation edit - Move this and everything after up if things are added.
|
||||||
#define TAIL_UPPER_LAYER_ALT 35 //Modified tail-sprite layer. Tend to be larger.
|
#define VORE_TAIL_LAYER 35 //CHOMPStation edit - Move this and everything after up if things are added.
|
||||||
#define MODIFIER_EFFECTS_LAYER 36 //Effects drawn by modifiers
|
#define TAIL_UPPER_LAYER_ALT 36 //Modified tail-sprite layer. Tend to be larger.
|
||||||
#define FIRE_LAYER 37 //'Mob on fire' overlay layer
|
#define MODIFIER_EFFECTS_LAYER 37 //Effects drawn by modifiers
|
||||||
#define MOB_WATER_LAYER 38 //'Mob submerged' overlay layer
|
#define FIRE_LAYER 38 //'Mob on fire' overlay layer
|
||||||
#define TARGETED_LAYER 39 //'Aimed at' overlay layer
|
#define MOB_WATER_LAYER 39 //'Mob submerged' overlay layer
|
||||||
#define TOTAL_LAYERS 39 //CHOMPStation edit. <---- KEEP THIS UPDATED, should always equal the highest number here, used to initialize a list.
|
#define TARGETED_LAYER 40 //'Aimed at' overlay layer
|
||||||
|
#define TOTAL_LAYERS 40 //CHOMPStation edit. <---- KEEP THIS UPDATED, should always equal the highest number here, used to initialize a list.
|
||||||
//////////////////////////////////
|
//////////////////////////////////
|
||||||
|
|
||||||
//These two are only used for gargoyles currently
|
//These two are only used for gargoyles currently
|
||||||
@@ -774,13 +775,20 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
|
|||||||
return
|
return
|
||||||
|
|
||||||
remove_layer(GLASSES_LAYER)
|
remove_layer(GLASSES_LAYER)
|
||||||
|
remove_layer(GLASSES_LAYER_ALT)
|
||||||
|
|
||||||
if(!glasses || hide_glasses) // CHOMPEdit - Add "|| hide_glasses" for glasses hiding
|
if(!glasses || hide_glasses) // CHOMPEdit - Add "|| hide_glasses" for glasses hiding
|
||||||
return //Not wearing glasses, no need to update anything.
|
return //Not wearing glasses, no need to update anything.
|
||||||
|
|
||||||
overlays_standing[GLASSES_LAYER] = glasses.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_gloves_str, default_icon = INV_EYES_DEF_ICON, default_layer = GLASSES_LAYER)
|
var/glasses_layer = GLASSES_LAYER
|
||||||
|
if(istype(glasses, /obj/item/clothing/glasses))
|
||||||
|
var/obj/item/clothing/glasses/our_glasses = glasses
|
||||||
|
if(our_glasses.glasses_layer_above)
|
||||||
|
glasses_layer = GLASSES_LAYER_ALT
|
||||||
|
|
||||||
apply_layer(GLASSES_LAYER)
|
overlays_standing[glasses_layer] = glasses.make_worn_icon(body_type = species.get_bodytype(src), slot_name = slot_gloves_str, default_icon = INV_EYES_DEF_ICON, default_layer = glasses_layer)
|
||||||
|
|
||||||
|
apply_layer(glasses_layer)
|
||||||
|
|
||||||
/mob/living/carbon/human/update_inv_ears()
|
/mob/living/carbon/human/update_inv_ears()
|
||||||
if(QDESTROYING(src))
|
if(QDESTROYING(src))
|
||||||
|
|||||||
@@ -2683,4 +2683,14 @@ End CHOMP Removal*/
|
|||||||
/obj/item/clothing/suit/storage/toggle/labcoat/fluff/parrizjacket
|
/obj/item/clothing/suit/storage/toggle/labcoat/fluff/parrizjacket
|
||||||
name = "pink crop bomber"
|
name = "pink crop bomber"
|
||||||
desc = "A pink crop bomber jacket that is just barely able to zip up at the front. It has a small Virgo Orbital Research Establishment patch on each shoulder."
|
desc = "A pink crop bomber jacket that is just barely able to zip up at the front. It has a small Virgo Orbital Research Establishment patch on each shoulder."
|
||||||
icon_state = "parriz_jacket" */ //Chomp REMOVE END
|
icon_state = "parriz_jacket"
|
||||||
|
|
||||||
|
//verysoft: Casey Brown
|
||||||
|
/obj/item/clothing/glasses/big_round
|
||||||
|
name = "big round blue glasses"
|
||||||
|
desc = "A set of glasses! They are big, round, and very reflective, catching the light and obscuring the eyes!"
|
||||||
|
icon = 'icons/inventory/eyes/item_vr.dmi'
|
||||||
|
icon_override = 'icons/inventory/eyes/mob_vr.dmi'
|
||||||
|
icon_state = "bigroundglasses"
|
||||||
|
slot_flags = SLOT_EYES | SLOT_EARS
|
||||||
|
glasses_layer_above = TRUE */ //Chomp REMOVE END
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 6.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 10 KiB |
Reference in New Issue
Block a user