cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 20:57:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3259 from CHOMPStation2/upstream-merge-11947

Browse Source 
[MIRROR] pastelprincedan & hatterhat fluff items
This commit is contained in:
Razgriz
2021-12-10 13:23:35 -07:00
committed by GitHub
parent f623ad7005 197aa24703
commit 3b86cb45c7
4 changed files with 74 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+12 -5
View File
@@ -326,6 +326,7 @@
// G CKEYS
// H CKEYS
/datum/gear/fluff/lauren_medal
path = /obj/item/clothing/accessory/medal/conduct
display_name = "Lauren's Medal"
@@ -759,11 +760,17 @@
ckeywhitelist = list("pastelprincedan")
character_name = list("Kiyoshi Maki", "Masumi Maki")
/datum/gear/fluff/masumi_overalls
path = /obj/item/clothing/under/fluff/masumi_overalls
display_name = "white and blue overalls"
ckeywhitelist = list("pastelprincedan")
character_name = list("Masumi Maki")
/datum/gear/fluff/mechanic_overalls
path = /obj/item/clothing/under/fluff/mechanic_overalls
display_name = "mechanic overalls"
ckeywhitelist = list("pastelprincedan", "hatterhat")
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
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+62 -5
View File
@@ -2297,15 +2297,72 @@ Departamental Swimsuits, for general use
colorswap(usr)
//PastelPrinceDan: Masumi Maki
/obj/item/clothing/under/fluff/masumi_overalls
name = "white and blue overalls"
//PastelPrinceDan: Masumi Maki & Hatterhat: Harold Robinson
/obj/item/clothing/under/fluff/mechanic_overalls
name = "mechanic overalls"
desc = "A set of white and blue overalls, paired with a yellow shirt."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "masumioveralls"
item_state = "masumioveralls"
icon_state = "mechaoveralls"
item_state = "mechaoveralls"
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
/obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn
name = "warden's navy winter coat"