From 5e1b4719251b450f313b25ed014511dd587b0441 Mon Sep 17 00:00:00 2001 From: Braiden Date: Wed, 9 Sep 2020 19:43:50 -0500 Subject: [PATCH] A gift for Jeanne and an upgrade for Strix --- code/game/objects/items/toys/toys_yw.dm | 19 ++++++++++++++++++ .../loadout/loadout_fluffitems_yw.dm | 6 ++++++ icons/obj/toy_yw.dmi | Bin 762 -> 533 bytes icons/vore/custom_items_yw.dmi | Bin 25774 -> 26842 bytes 4 files changed, 25 insertions(+) diff --git a/code/game/objects/items/toys/toys_yw.dm b/code/game/objects/items/toys/toys_yw.dm index c79b27c3e8..cc1389de48 100644 --- a/code/game/objects/items/toys/toys_yw.dm +++ b/code/game/objects/items/toys/toys_yw.dm @@ -15,4 +15,23 @@ if(src && !M.stat && in_range(M,src)) to_chat(M, "You cannot rename Strix Hades! You hug him anyway.") + return 1 + +/obj/item/toy/plushie/teshari/eili + name = "Eili" + desc = "This is a plushie that resembles an Avali named Eili. The ammount of detail makes it almost look lifelike! Looks like he is sleeping. Shhh!" + icon_state = "jeans_eiliplush" + pokephrase = "Weh!" + icon = 'icons/vore/custom_items_yw.dmi' + + rename_plushie() + set name = "Name Plushie" + set category = "Object" + set desc = "Give your plushie a cute name!" + var/mob/M = usr + if(!M.mind) + return 0 + + if(src && !M.stat && in_range(M,src)) + to_chat(M, "You cannot rename Eili! You hug her anyway.") return 1 \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm index fc5e3ca082..7cbbe8d07a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_yw.dm @@ -292,6 +292,12 @@ description = "M-M-M-M-MONEY SHOT" ckeywhitelist = list("dopiotl") character_name = list("Jeanne Petite") +/datum/gear/fluff/jeans_eiliplush + path = /obj/item/toy/plushie/teshari/eili + display_name = "Eili Plishi" + description = "My Favorite Pupil" + ckeywhitelist = list("dopiotl","kbraid") + character_name = list("Jeanne Petite","Eili","Braid") //dwaggy90 //Saur Darastrix /datum/gear/fluff/saur_rig diff --git a/icons/obj/toy_yw.dmi b/icons/obj/toy_yw.dmi index f72e8604220250145928cc81f3ac6d49a84347b9..4a1b5ca46cbfd618b1e4d222c9fb2a9987d9fc97 100644 GIT binary patch delta 373 zcmV-*0gC?m1(gJlBwbWcOjJd{z`(@B#3UmlGBGh58X6}iCNM8AARr(yFfbh)9M8|s zr>Cd9yu2J68y_AXEi5ek{rx2*B8pP!$o z{ZR>#$%%ge^+`lQR5*?0k?VGZAPj_4C2kT7H?6k%{_okKwADSQeSys%ILw#K001vr zZ&v@vUDsRvjkpd62Vlsvf~W2t0}`|Ne!Qy+4lx`$Geu5vBS?`#j)?g|(FkNoS2GO3vvj$PRJ3}gOs8FXzdk#U zw+)a{tH%JRMa@T&rZV}2^|Fpg#MYKT$pGBfwTJ;VAJ{V#|C3M6pTjO9zF>A*&#rnU zIBmOaW}8IVh%3NpJ@qA6p5w_ST}RAEKg_|^{zk}!@bbOXJkOtaC+erYWPJe~4hz{s Tg!T=R00000NkvXXu0mjf5<9Z2 delta 604 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 YK3)SMRGgkP+lJu0sTHQ!#O?0?0DxJ-!vFvP