mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
Merge pull request #11947 from PastelPrinceDan/fwuff
pastelprincedan & hatterhat fluff items
This commit is contained in:
@@ -320,6 +320,7 @@
|
|||||||
// G CKEYS
|
// G CKEYS
|
||||||
|
|
||||||
// H CKEYS
|
// H CKEYS
|
||||||
|
|
||||||
/datum/gear/fluff/lauren_medal
|
/datum/gear/fluff/lauren_medal
|
||||||
path = /obj/item/clothing/accessory/medal/conduct
|
path = /obj/item/clothing/accessory/medal/conduct
|
||||||
display_name = "Lauren's Medal"
|
display_name = "Lauren's Medal"
|
||||||
@@ -747,11 +748,17 @@
|
|||||||
ckeywhitelist = list("pastelprincedan")
|
ckeywhitelist = list("pastelprincedan")
|
||||||
character_name = list("Kiyoshi Maki", "Masumi Maki")
|
character_name = list("Kiyoshi Maki", "Masumi Maki")
|
||||||
|
|
||||||
/datum/gear/fluff/masumi_overalls
|
/datum/gear/fluff/mechanic_overalls
|
||||||
path = /obj/item/clothing/under/fluff/masumi_overalls
|
path = /obj/item/clothing/under/fluff/mechanic_overalls
|
||||||
display_name = "white and blue overalls"
|
display_name = "mechanic overalls"
|
||||||
ckeywhitelist = list("pastelprincedan")
|
ckeywhitelist = list("pastelprincedan", "hatterhat")
|
||||||
character_name = list("Masumi Maki")
|
character_name = list("Masumi Maki", "Harold Robinson")
|
||||||
|
|
||||||
|
/datum/gear/fluff/mechanic_coat
|
||||||
|
path = /obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic
|
||||||
|
display_name = "mechanic winter coat"
|
||||||
|
ckeywhitelist = list("pastelprincedan", "hatterhat")
|
||||||
|
character_name = list("Masumi Maki", "Harold Robinson")
|
||||||
|
|
||||||
// Q CKEYS
|
// Q CKEYS
|
||||||
|
|
||||||
|
|||||||
@@ -2297,15 +2297,72 @@ Departamental Swimsuits, for general use
|
|||||||
|
|
||||||
colorswap(usr)
|
colorswap(usr)
|
||||||
|
|
||||||
//PastelPrinceDan: Masumi Maki
|
//PastelPrinceDan: Masumi Maki & Hatterhat: Harold Robinson
|
||||||
/obj/item/clothing/under/fluff/masumi_overalls
|
/obj/item/clothing/under/fluff/mechanic_overalls
|
||||||
name = "white and blue overalls"
|
name = "mechanic overalls"
|
||||||
desc = "A set of white and blue overalls, paired with a yellow shirt."
|
desc = "A set of white and blue overalls, paired with a yellow shirt."
|
||||||
icon = 'icons/vore/custom_clothes_vr.dmi'
|
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||||
icon_state = "masumioveralls"
|
icon_state = "mechaoveralls"
|
||||||
item_state = "masumioveralls"
|
item_state = "mechaoveralls"
|
||||||
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||||
|
|
||||||
|
//PastelPrinceDan: Masumi Maki & Hatterhat: Harold Robinson
|
||||||
|
/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic
|
||||||
|
name = "mechanic winter coat"
|
||||||
|
desc = "A blue and yellow winter coat, worn only by overachievers."
|
||||||
|
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||||
|
icon_state = "mechacoat"
|
||||||
|
|
||||||
|
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||||
|
item_state = "mechacoat_mob"
|
||||||
|
hoodtype = /obj/item/clothing/head/hood/winter/fluff/mechanic
|
||||||
|
|
||||||
|
/obj/item/clothing/head/hood/winter/fluff/mechanic
|
||||||
|
name = "mechanic winter hood"
|
||||||
|
desc = "A blue and yellow winter coat's hood."
|
||||||
|
icon = 'icons/vore/custom_clothes_vr.dmi'
|
||||||
|
icon_state = "mechahood"
|
||||||
|
|
||||||
|
icon_override = 'icons/vore/custom_onmob_vr.dmi'
|
||||||
|
item_state = "mechahood_mob"
|
||||||
|
|
||||||
|
/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/ui_action_click()
|
||||||
|
ToggleHood_mechacoat()
|
||||||
|
|
||||||
|
/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/equipped(mob/user, slot)
|
||||||
|
if(slot != slot_wear_suit)
|
||||||
|
RemoveHood_mechacoat()
|
||||||
|
..()
|
||||||
|
|
||||||
|
/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/proc/RemoveHood_mechacoat()
|
||||||
|
icon_state = "mechacoat"
|
||||||
|
item_state = "mechacoat_mob"
|
||||||
|
hood_up = 0
|
||||||
|
if(ishuman(hood.loc))
|
||||||
|
var/mob/living/carbon/H = hood.loc
|
||||||
|
H.unEquip(hood, 1)
|
||||||
|
H.update_inv_wear_suit()
|
||||||
|
hood.loc = src
|
||||||
|
|
||||||
|
/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/proc/ToggleHood_mechacoat()
|
||||||
|
if(!hood_up)
|
||||||
|
if(ishuman(loc))
|
||||||
|
var/mob/living/carbon/human/H = loc
|
||||||
|
if(H.wear_suit != src)
|
||||||
|
to_chat(H, "<span class='warning'>You must be wearing [src] to put up the hood!</span>")
|
||||||
|
return
|
||||||
|
if(H.head)
|
||||||
|
to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
|
||||||
|
return
|
||||||
|
else
|
||||||
|
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
|
||||||
|
hood_up = 1
|
||||||
|
icon_state = "mechacoat_t"
|
||||||
|
item_state = "mechacoat_mob_t"
|
||||||
|
H.update_inv_wear_suit()
|
||||||
|
else
|
||||||
|
RemoveHood_mechacoat()
|
||||||
|
|
||||||
//Pandora029 : Evelyn Tareen
|
//Pandora029 : Evelyn Tareen
|
||||||
/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn
|
/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn
|
||||||
name = "warden's navy winter coat"
|
name = "warden's navy winter coat"
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 193 KiB After Width: | Height: | Size: 197 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 30 KiB |
Reference in New Issue
Block a user