From dd2a46281e95de81f0cf81eee0c9423154ff67c7 Mon Sep 17 00:00:00 2001 From: Heroman3003 Date: Thu, 12 Apr 2018 19:33:40 +1000 Subject: [PATCH] Added fuzzy legcuffs --- code/datums/supplypacks/recreation_vr.dm | 2 +- .../objects/items/weapons/handcuffs_vr.dm | 5 +++++ code/game/objects/random/random.dm | 2 +- icons/obj/items_vr.dmi | Bin 1042 -> 1649 bytes maps/tether/tether-02-surface2.dmm | 2 +- vorestation.dme | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 code/game/objects/items/weapons/handcuffs_vr.dm diff --git a/code/datums/supplypacks/recreation_vr.dm b/code/datums/supplypacks/recreation_vr.dm index 8f0d775797..cf12b4815b 100644 --- a/code/datums/supplypacks/recreation_vr.dm +++ b/code/datums/supplypacks/recreation_vr.dm @@ -18,7 +18,7 @@ /obj/item/stack/cable_coil/random, /obj/item/clothing/accessory/collar/shock, /obj/item/clothing/suit/straight_jacket, - /obj/item/weapon/handcuffs/legcuffs, + /obj/item/weapon/handcuffs/legcuffs/fuzzy, /obj/item/weapon/melee/fluff/holochain/mass, /obj/item/weapon/material/twohanded/fluff/riding_crop, /obj/item/clothing/under/fluff/latexmaid diff --git a/code/game/objects/items/weapons/handcuffs_vr.dm b/code/game/objects/items/weapons/handcuffs_vr.dm new file mode 100644 index 0000000000..ecafc8b6c3 --- /dev/null +++ b/code/game/objects/items/weapons/handcuffs_vr.dm @@ -0,0 +1,5 @@ +/obj/item/weapon/handcuffs/legcuffs/fuzzy + name = "fuzzy legcuffs" + desc = "Use this to keep... 'prisoners' in line." + icon = 'icons/obj/items_vr.dmi' + icon_state = "fuzzylegcuff" \ No newline at end of file diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index c83e96ad04..19a83c8e40 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -274,7 +274,7 @@ prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc, prob(1);/obj/item/weapon/beartrap, prob(1);/obj/item/weapon/handcuffs/fuzzy, - prob(1);/obj/item/weapon/handcuffs/legcuffs, + prob(1);/obj/item/weapon/handcuffs/legcuffs/fuzzy, prob(2);/obj/item/weapon/reagent_containers/syringe/drugs, prob(1);/obj/item/weapon/reagent_containers/syringe/steroid, prob(4);/obj/item/device/radio_jammer, diff --git a/icons/obj/items_vr.dmi b/icons/obj/items_vr.dmi index 312f2691c1f0ac852b1d3bc9ca0ce0272aa6902b..46276e7f7cf9743a161781b832c09db56dd4e5b7 100644 GIT binary patch delta 1645 zcmV-z29o)b2=NS%7k@wq1^@s6s%dfF0001vdQ@0+L}hbha%pgMX>V=-0C=2*%DoDM zFcgO2Ik}1t-An)0EF~ft^d3TUVh&n`BpT|~cM!UjZtn|EjYrd(9=bDfqnLP^p>RK) zr6}xjfWqx6MIatRJ|<}jzMjWVo&eBy?wqhGRuvHI3UIo;-AMQF z?#4#CJ3DDUaRPvAEiJ~_*jQdf7#bQfd_Et`%geN$Jby_j6e1W3@!Qp_ymS0GSFT-S zU|=BYcdskJ*TchUC+qL+HBNPP0bmku$&(0yK!ExAc@#zA>B0hjzaNLgfh^0+JbZ}X z@29J)%eZ*)Vpi|Yxdu#5O#v$r^VZR$xlXwzLZJ{&r<00`3jBUQ%gf6wEiG~6@L~LZ zKcXn2s(&gS9UW;SHxZU=z@_u&joAke%;Ci3)Kt0ExiWz)%aoOsVHgJEWdUX?8)-P^;*C?UaqrLH_s>p905sIsTb*)41cO1Us;Ur0kv)6% zpePEOrlIRP;c%FRg#`@5D2xCXZq68Qx1R+dq<`q_d-DX>fBcdUKK$7D_KQ#QQUpx_ znwpxBWtme=5x%;kaC)zk3;(E8S6Acn`LdqZk^mD|enNDJ0NkG#2VnZI>&Q!sR;J4s zx~`*X8iF98$pPMdNkI>mqw6}NC{k8dMko}@YR;?$`25#DjI#sZ0Pxti%>L$M0Nnhg z5r2U8kIosxpZ4Y@3UpmZQ54?W6($^t@WYIQ_jmbef3=d~d%C4LbLs*OFIMOBxFu+s zh87BP>5fY0?l8mmE6~F-x^9C2g@&rCL?RKspLJ4RUe3H6Mi2zPdsImz63My%f`t@V zoW0B4C(&H5d!drbioABeB&e#&;^HFJ)qm9}io(yn8XOLtNF;)$X@wCWEC=F$&--O+ zs-8?0*0=l2A=_-Ys#wY{{J55ZdC!1Qv`_4!nMGBVcVyGVCB2P&VSy| z;)f2;*S-S4($nbKK)&_?`GO?@wi32|3T%4;Y+nkuw6xgz{%s!tI|A5kfZf>k0&G|W z-BoS_ptZj>;|WLmMgi~!yd|+9T2la%I5(o>(Z11)2)V1=1~-6aaR2Q#XfA#sR;56k zM2tu_@CLjB%?Z!mND#9~kt9H(2Y-P$k!-w}Bti)wEr2 z=KWlA*L+@*q|!)%*8bMG$5Y9BJRVCV+S=NTk&%(oDS~Tx-Q)2XJv}{w$Kx@w5uy~x zL&|x8Nj7zClF38>Ns9hXAXD;oZ-$a;fa&Q(5{aY}#n~!YRRmK>N|MCL$bX1XDj}UM z((VP!C@@7Rgi(b=Mw=nC4jejkDBt!J92p5N;8xwn!JdQhvCHKmb)8^#iSF)h!z44f zcW`BrG)rr{1=#phxCU-@+<)TCzh{`7oMd`>I_a`0Mt66&;c~fv82Q%|ZnChgE+p2i z0g1cA!6Spo|4+ft(2y|NH@ZUpHh9at0=J2di}+k1{r3VfZ(eS@oPM_0z1{=SaQ7bY z3U0MHiJMq60^;6J^yYl*;+-_!oQoZY5&N72>NeTxO+?x@nCMMj-e%ywfLEXwt}mVB+Cs9T|JGSi^lS rtSf*?!rh#?H%k#|+u&9torwPdkp87<2F+;C00000NkvXXu0mjfsg5OF delta 1034 zcmV+l1oivz43Y?t7k?lK1^@s6qMd$(0001idQ@0+L}hbha%pgMX>V=-0C=2r%CQQA zFce1NIrk}kbT6&#nx#Y}gT6x`x6Q>iLT)gx-$8Keb`E?!p5x>fxY^UrMP<}uxMsy#F)5+ZfO@ItVks>VX}}%? zFW!Q(G+|Fdy$LQ-BB&P$p)D!O`T=^?gLtr%EFKC)j2_ITl(Z)ONQ%2VJG-5odEa^G z^$=36H6}CD*?*xXztb+u`^>Ws|Bs#7Oub%bCu5{-AZ>O7NZUZ#>;{mwfwb8TAZ-I_ zlZ|uuRJE#y1_xPPTLa*|>FLY^an(mQ4d6t%thYM6e|VU;rlvSFJ`TYA*qE-@>xqOg zJ3Ff_%c9fi@apm7xUNgjb@}1K1ztIJjPvvJ%*@P$zJKgdn5N0-=qN%6eBVbYh39!Rn@zOV{R!aArDgqc`6K|YP&|Kl zoQq$d<;}O>)t`U-ej-C~BY=^S5gf;1VkF>`%YT9s&t*CDo1|1KVOdsa-ADl}p8p2Z zFafx}xB$TKzh1;?x1z{x8>JM!?~}=7@SQHNJtEScKxQM+D1c@9dY5J10?QW69KU#?`y=kqiik4z@R7q^N8 zK@fTXLWCA*tz6~m+Ip|=eXK~akm&Zi2Pq}3R*O=pgb;#ntvwiqA_xL}-|tTVp3}Yi zx?wx)8F=JglRYQ2iR~h##ImeN(|$8z-G2=AliD_Znnxj00M4EDDlp6}xBjtqHrC_A zLaZSeDE~qENR5YT3nW447SKu}dv^d(zPRsm`;XQ5uKGx<3NW+%TY*Wj<69sT<-ftH z>W6n9Iz0NsQvkGYuRj||>OLSTA_ee&V#l|@jt}5Z9Ik5ATW=4-00000NkvXXt^-0~ Eg3`tBs{jB1 diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 13729ba275..30b84ecbd6 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -373,7 +373,7 @@ /obj/structure/closet/wardrobe/pjs, /obj/item/weapon/handcuffs/fuzzy, /obj/item/weapon/handcuffs/fuzzy, -/obj/item/weapon/handcuffs/legcuffs, +/obj/item/weapon/handcuffs/legcuffs/fuzzy, /obj/item/weapon/handcuffs/fuzzy, /obj/item/clothing/mask/balaclava, /obj/item/clothing/gloves/combat{ diff --git a/vorestation.dme b/vorestation.dme index 5445f1b708..9ae00b7ce1 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1016,6 +1016,7 @@ #include "code\game\objects\items\weapons\flamethrower.dm" #include "code\game\objects\items\weapons\gift_wrappaper.dm" #include "code\game\objects\items\weapons\handcuffs.dm" +#include "code\game\objects\items\weapons\handcuffs_vr.dm" #include "code\game\objects\items\weapons\improvised_components.dm" #include "code\game\objects\items\weapons\manuals.dm" #include "code\game\objects\items\weapons\manuals_vr.dm"