diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm index 6f15aacdc6..18a61c2be0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm @@ -483,6 +483,18 @@ // H CKEYS +/datum/gear/fluff/mechanic_overalls + path = /obj/item/clothing/under/fluff/mechanic_overalls + display_name = "mechanic overalls" + ckeywhitelist = list("hatterhat") + character_name = list("Harold Robinson") + +/datum/gear/fluff/mechanic_coat + path = /obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic + display_name = "mechanic winter coat" + ckeywhitelist = list("hatterhat") + character_name = list("Harold Robinson") + /datum/gear/fluff/lauren_medal path = /obj/item/clothing/accessory/medal/conduct display_name = "Lauren's Medal" @@ -971,7 +983,7 @@ path = /obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing display_name = "glowing cloak" ckeywhitelist = list("pastelprincedan") - character_name = list("Kiyoshi Maki", "Masumi Maki") + character_name = list("Masumi Maki") /datum/gear/fluff/entchtut_medal path = /obj/item/clothing/accessory/medal/conduct @@ -979,24 +991,6 @@ ckeywhitelist = list("positronicjune") character_name = list("Entchtut Cenein") -/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") - -/datum/gear/fluff/slimecat_rd_plush - path = /obj/item/toy/plushie/fluff/slimeowshi - display_name = "slimecat RD plushie" - ckeywhitelist = list("pastelprincedan") - character_name = list("Kiyoshi Maki", "Masumi Maki") - // Q CKEYS // R CKEYS diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 3ddbb30d61..71c206c271 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2275,7 +2275,7 @@ Departamental Swimsuits, for general use body_parts_covered = CHEST|FEET|ARMS|HANDS -//PastelPrinceDan: Kiyoshi Maki +//PastelPrinceDan: Masumi Maki /obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing name = "glowing cloak" desc = "A fancy cloak with a RGB LED color strip along the trim, cycling through the colors of the rainbow." @@ -2321,7 +2321,7 @@ Departamental Swimsuits, for general use colorswap(usr) -//PastelPrinceDan: Masumi Maki & Hatterhat: Harold Robinson +//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." @@ -2330,7 +2330,7 @@ Departamental Swimsuits, for general use item_state = "mechaoveralls" icon_override = 'icons/vore/custom_onmob_vr.dmi' -//PastelPrinceDan: Masumi Maki & Hatterhat: Harold Robinson +//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." diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 6e91f71723..c918cb3d05 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1474,16 +1474,6 @@ sharp = TRUE edge = TRUE -//PastelPrinceDan - Kiyoshi/Masumi Maki -/obj/item/toy/plushie/fluff/slimeowshi - name = "Slime-Cat " + JOB_RESEARCH_DIRECTOR + " plushie" - desc = "An adorable stuffed toy that resembles a slime. It's pink, and has little cat ears, as well as a tail! Atop its head is a small beret with a " + JOB_RESEARCH_DIRECTOR + "'s insignia." - icon = 'icons/vore/custom_items_vr.dmi' - icon_state = "kimeowshi" - attack_verb = list("blorbled", "slimed", "absorbed", "glomped") - gender = PLURAL // this seems like a good idea but probably prone to changing. todo: ask dan - // the only reason this thought is relevant because the base slimeplush has its gender set to female - //YeCrowbarMan - Lemon Yellow /obj/item/toy/plushie/fluff/lemonplush name = "yellow slime plushie" diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index acea13b831..c952e1e216 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ