From d13d3d92fe17d8b203f4570e8420f1d9246ec467 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Sun, 19 Apr 2020 18:49:24 -0400 Subject: [PATCH] Ports some plushies from Cit --- code/datums/supplypacks/misc.dm | 13 +++++-- code/game/machinery/vending.dm | 24 +++++++++++-- code/game/objects/items/toys_vr.dm | 53 +++++++++++++++++++++++++++++ code/game/objects/random/misc.dm | 13 ++++++- icons/obj/toy_vr.dmi | Bin 0 -> 1935 bytes vorestation.dme | 1 + 6 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 code/game/objects/items/toys_vr.dm create mode 100644 icons/obj/toy_vr.dmi diff --git a/code/datums/supplypacks/misc.dm b/code/datums/supplypacks/misc.dm index 7f4f0362db..cb420cd056 100644 --- a/code/datums/supplypacks/misc.dm +++ b/code/datums/supplypacks/misc.dm @@ -74,8 +74,17 @@ /obj/item/toy/plushie/squid/blue, /obj/item/toy/plushie/squid/orange, /obj/item/toy/plushie/squid/yellow, - /obj/item/toy/plushie/squid/pink - ) + /obj/item/toy/plushie/squid/pink, + //VOREStation Add Start + /obj/item/toy/plushie/lizardplushie/kobold, + /obj/item/toy/plushie/slimeplushie, + /obj/item/toy/plushie/box, + /obj/item/toy/plushie/borgplushie, + /obj/item/toy/plushie/borgplushie/medihound, + /obj/item/toy/plushie/borgplushie/scrubpuppy, + /obj/item/toy/plushie/foxbear, + /obj/item/toy/plushie/nukeplushie) + //VOREStation Add End name = "Plushies Crate" cost = 15 containertype = /obj/structure/closet/crate diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 8e92dcee6f..edb2b18a3e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1124,7 +1124,17 @@ /obj/item/toy/plushie/carp = 1, /obj/item/toy/plushie/deer = 1, /obj/item/toy/plushie/tabby_cat = 1, - /obj/item/device/threadneedle = 3) + /obj/item/device/threadneedle = 3, + //VOREStation Add Start + /obj/item/toy/plushie/lizardplushie/kobold = 1, + /obj/item/toy/plushie/slimeplushie = 1, + /obj/item/toy/plushie/box = 1, + /obj/item/toy/plushie/borgplushie = 1, + /obj/item/toy/plushie/borgplushie/medihound = 1, + /obj/item/toy/plushie/borgplushie/scrubpuppy = 1, + /obj/item/toy/plushie/foxbear = 1, + /obj/item/toy/plushie/nukeplushie = 1) + //VOREStation Add End premium = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne = 1, /obj/item/weapon/storage/trinketbox = 2) prices = list(/obj/item/weapon/storage/fancy/heartbox = 15, @@ -1153,7 +1163,17 @@ /obj/item/toy/plushie/carp = 50, /obj/item/toy/plushie/deer = 50, /obj/item/toy/plushie/tabby_cat = 50, - /obj/item/device/threadneedle = 2) + /obj/item/device/threadneedle = 2, + //VOREStation Add Start + /obj/item/toy/plushie/lizardplushie/kobold = 50, + /obj/item/toy/plushie/slimeplushie = 50, + /obj/item/toy/plushie/box = 50, + /obj/item/toy/plushie/borgplushie = 50, + /obj/item/toy/plushie/borgplushie/medihound = 50, + /obj/item/toy/plushie/borgplushie/scrubpuppy = 50, + /obj/item/toy/plushie/foxbear = 50, + /obj/item/toy/plushie/nukeplushie = 50) + //VOREStation Add End /obj/machinery/vending/fishing name = "Loot Trawler" diff --git a/code/game/objects/items/toys_vr.dm b/code/game/objects/items/toys_vr.dm new file mode 100644 index 0000000000..1b456393db --- /dev/null +++ b/code/game/objects/items/toys_vr.dm @@ -0,0 +1,53 @@ +/obj/item/toy/plushie/lizardplushie + name = "lizard plushie" + desc = "An adorable stuffed toy that resembles a lizardperson." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "plushie_lizard" + attack_verb = list("clawed", "hissed", "tail slapped") + +/obj/item/toy/plushie/lizardplushie/kobold + name = "kobold plushie" + desc = "An adorable stuffed toy that resembles a kobold." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "kobold" + +/obj/item/toy/plushie/slimeplushie + name = "slime plushie" + desc = "An adorable stuffed toy that resembles a slime. It is practically just a hacky sack." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "plushie_slime" + attack_verb = list("blorbled", "slimed", "absorbed", "glomped") + gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy + +/obj/item/toy/plushie/box + name = "cardboard plushie" + desc = "A toy box plushie, it holds cotten. Only a baddie would place a bomb through the postal system..." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "box" + attack_verb = list("open", "closed", "packed", "hidden", "rigged", "bombed", "sent", "gave") + +/obj/item/toy/plushie/borgplushie + name = "robot plushie" + desc = "An adorable stuffed toy of a robot." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "securityk9" + attack_verb = list("beeped", "booped", "pinged") + +/obj/item/toy/plushie/borgplushie/medihound + icon_state = "medihound" + +/obj/item/toy/plushie/borgplushie/scrubpuppy + icon_state = "scrubpuppy" + +/obj/item/toy/plushie/foxbear + name = "toy fox" + desc = "Issa fox!" + icon = 'icons/obj/toy_vr.dmi' + icon_state = "fox" + +/obj/item/toy/plushie/nukeplushie + name = "operative plushie" + desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "plushie_nuke" + attack_verb = list("shot", "nuked", "detonated") diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 4e29ac66ec..db3a89bf1b 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -469,7 +469,18 @@ /obj/item/toy/plushie/spider, /obj/item/toy/plushie/tabby_cat, /obj/item/toy/plushie/tuxedo_cat, - /obj/item/toy/plushie/white_cat) + /obj/item/toy/plushie/white_cat, + //VOREStation Add Start + /obj/item/toy/plushie/lizardplushie, + /obj/item/toy/plushie/lizardplushie/kobold, + /obj/item/toy/plushie/slimeplushie, + /obj/item/toy/plushie/box, + /obj/item/toy/plushie/borgplushie, + /obj/item/toy/plushie/borgplushie/medihound, + /obj/item/toy/plushie/borgplushie/scrubpuppy, + /obj/item/toy/plushie/foxbear, + /obj/item/toy/plushie/nukeplushie) + //VOREStation Add End /obj/random/plushielarge name = "random large plushie" diff --git a/icons/obj/toy_vr.dmi b/icons/obj/toy_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4b7d00de027df262d4cf60153722019f6e832f2f GIT binary patch literal 1935 zcmV;A2XOd_P)w2~Bg-EF;za1gWCMr^(H_{^-P*70rs8AmtAJmaM z?#Gu^5fow+7aO-U85tSw*uCp1M5-qyB_$@uL zn&C!9Mlmrl7ZnvPDJd%_Co{AEFP`RhIsh2mNW_9JE-EUlhgXr6n|^?U-{0TJ$jGgf zEQ)m_)x24TLzjLukTWwgS-ts8P*?!}Le0(1pP!#b9Z_OpVn;+oJw89bzrV{{TRc2G zSXfwSD0ley_*#~`iKe|{kFcP;&OACiH8L`gkSA(^lOkWF6hClLcF+_bETV+NLI3~& z0d!JMQvg8b*k%9#0IzyfSad{Xb7OL8aCB*JZU6vyoQ=`V4uUWY2k`Uu6bsyqUl$Kv z48(AdS1`beYuMPbZYn;#M2^PHTmR`VZIkBWRGzC^6qkzM!4uk19L0XM=Intos5$Jm zoGHMY3QM5S1enXr=|~FUs`1r$nQ#vzRfy67=X!y!or z+ghDIwztouF(6UdIHspj=VR-lb5oMGzZd7Ctc%a5-VlF&piL-E$V1dhR);5ff)o(Er0Ht^Xi##UGJrcs7>jrEHZ=%^7?tDc}*)$_Nv1bRdtvX2Ch7Lplw?Cl3&G_xj0tiv@Pif9Uw}Zuy;7@IdS>pW<;)X2VeVqZq{~ ze(bO;>j7`ycdidCYiD=IV)u1eZVkU&Gk=@-lmhOJ*VMguFZLg#?}JP01EYb+ji$Bx z{rtKtsJWI)mTv3?$BEzQ=PT<6i7yNG-I`nL%V6(gaQr~#%L17%31EMJ9}T?>_CEd@ z96x9_b`Ge^UZCy{eo%ltM#H{K>jR(vS702PjVAKDVunDA0W+=_&|KD z5REquag+J%gNXOup{@#!LJ~%%=ueqo0>DigGKA`avym9;RkRM(& zmGSx|ZUMn3=?c!T+;jKJ=GWJizyEQS$BFY+3+rTm{_^>vanVu)^~=jaCE_0c`pUk( zxw%1u1mL{gZjpfmUoKj0ji9eYc>fX~Tg=xtuC8h}^50bObKpI)^R?4zt#7njwh&ZM zCcS530+;;)sRJA*QDp=0=Yo5ma5_nXua%8ftKFvYZ}d?XNKKX!q&I6ZQQ!KuAfI)3 zha__cs7mgD^#KVw-Z&1-Kp#4+K`;n2ic$Or<6q&E VMXSacqz3>1002ovPDHLkV1l;jnuq`Z literal 0 HcmV?d00001 diff --git a/vorestation.dme b/vorestation.dme index a7b4957d8b..e77ce5048a 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1060,6 +1060,7 @@ #include "code\game\objects\items\shooting_range.dm" #include "code\game\objects\items\tailoring.dm" #include "code\game\objects\items\toys.dm" +#include "code\game\objects\items\toys_vr.dm" #include "code\game\objects\items\trash.dm" #include "code\game\objects\items\trash_material.dm" #include "code\game\objects\items\trash_vr.dm"