From 539fc8ea4e09b5084af16d88e5a28abedb446fc7 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 24 Jun 2019 13:45:12 -0300 Subject: [PATCH] Ports makeshift splints (#6603) This pr ports makeshift splints from polaris. You can make them with rods and duct tape, they can only splint arms and legs. --- code/game/objects/items/stacks/medical.dm | 11 ++++++++++- code/game/objects/items/stacks/rods.dm | 10 ++++++++++ html/changelogs/alberyk-splint.yml | 6 ++++++ icons/obj/stacks/medical.dmi | Bin 4434 -> 4763 bytes 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/alberyk-splint.yml diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index ce63ce7e439..acfc63db39c 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -340,11 +340,13 @@ Contains: /obj/item/stack/medical/splint name = "medical splints" + desc = "Modular splints capable of supporting and immobilizing bones in both limbs and appendages." singular_name = "medical splint" icon_state = "splint" amount = 5 max_amount = 5 drop_sound = 'sound/items/drop/hat.ogg' + var/list/splintable_organs = list("l_arm","r_arm","l_leg","r_leg", "l_hand", "r_hand", "r_foot", "l_foot") /obj/item/stack/medical/splint/attack(mob/living/carbon/M as mob, mob/user as mob) if(..()) @@ -354,7 +356,7 @@ Contains: var/mob/living/carbon/human/H = M var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting) var/limb = affecting.name - if(!(affecting.limb_name in list("l_arm","r_arm","l_leg","r_leg", "l_hand", "r_hand", "r_foot", "l_foot"))) + if(!(affecting.limb_name in splintable_organs)) to_chat(user, "You can't apply a splint there!") return if(affecting.status & ORGAN_SPLINTED) @@ -381,3 +383,10 @@ Contains: return +/obj/item/stack/medical/splint/makeshift + name = "makeshift splints" + singular_name = "makeshift splint" + desc = "For holding your limbs in place with duct tape and scrap metal." + icon_state = "tape-splint" + amount = 1 + splintable_organs = list("l_arm","r_arm","l_leg","r_leg") \ No newline at end of file diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 85301a1834d..5c5798246bb 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -71,4 +71,14 @@ var/global/list/datum/stack_recipe/rod_recipes = list( if (!R && replace) user.put_in_hands(new_item) return + + if (istype(W, /obj/item/weapon/tape_roll)) + var/obj/item/stack/medical/splint/makeshift/new_splint = new(user.loc) + new_splint.add_fingerprint(user) + + user.visible_message("\The [user] constructs \a [new_splint] out of a [singular_name].", \ + "You use make \a [new_splint] out of a [singular_name].") + use(1) + return + ..() diff --git a/html/changelogs/alberyk-splint.yml b/html/changelogs/alberyk-splint.yml new file mode 100644 index 00000000000..09a19d06a0d --- /dev/null +++ b/html/changelogs/alberyk-splint.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - rscadd: "Ported makeshift splints, you can make them with rods and duct tape." \ No newline at end of file diff --git a/icons/obj/stacks/medical.dmi b/icons/obj/stacks/medical.dmi index 94c2d94989f014485a93340863b528997ed5dc9e..d77b105ee2af438c93f1954383fdb0799282832b 100644 GIT binary patch literal 4763 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 Pn*bwyGrbz9Yuvv8mUko< literal 4434 zcmZWtcQD*-wEnGKtQM<8535D5A-Y|n6FpI5)gaL#dR;Y0^crQg2tu;DMDKjbCkXQC zHDLu=oekFY-MRP9y>tIK?=xrSojGTod7ksmc@vEdwP`5XC;!_T(Q?O`#iqC^K*m zV)A2ys>dtw@Fp{<#osIE1O@Rpn_w)P;IAaa1a^)M=A%-iFz;u?3mv)hRcoqW=e!|< z4+2W0Tr$X~{~EGu0rOeiS^XJ(e(~&wi>33crn&Lx_&H_F%X z%K!k=*VRxn4=UU(3iV;o#te6>+zBC2#1BFaKl7g)_(I9)wG=qB^Z1(osz?$|a`o<>7IxMqg}eN8y-}o{l$6wg|MKO_gYF^A zdD?S`QHpNq>yR4&oXt$F@J4ND6NAl@$v+(PbGz}2Vyjt6JR^B>*_5n80GcuJ1=uSA z1VKVLzvgVGwH4tMmTU8&8()K20iU%acNtmP)xFhzH#fJ0*U+YhF->1devIcO@9xrf zBT%hKQ_K>7U2(E3Cvm=R3Eh?59f-FRw0ZN;%^kr5612Lq%-w7r zSB0IMtfCWWYu6y`Rs<`FTRr)TW3t$4{d?c_$z_h14h3C#qOA;@zb*k|HsE3@PJP_oG^bDzrIc=o(A5yvPTH*x{$ z*?J3;kM=WMT&UU}5z3HKDmE2rdhU*;D(nHfcRXpq^I1=M+yw(IW6kICk>|EXazVoi z=DP!uS>dyU7qna{zZM**0KlV@o^#|I7>ap1%fUmf+K#d(ded_J7Lg-X7(Ks4 zV~CB}*2;a?;v%p!*G$D+S$jC!`c|A~esiwgV^-Q@;UnF+F+}fNZ&O=|CqV}QB*o1D z=nJHn$uM1000{Bd{o$|i1?d+c!km82 z5mZ9V<*-zT%NEjVq(j;?dc>Z=glKc2_}iwO;(B|T3w}E)&qeYZVoCi!sV&gUn~?Z_ z>SPztgL~2SZ!oV|XSW!BB%G)#`vgz{sn983Exwb{$Bn`#JSjkwAUe z>sJ=~L1ZtU3e8ZXF^OM~kB`q&SYGa0!&fC*0;pyMHU2qQw!C%Hy@5$FKP7&7O;38q z^M5wg+)?Kw!!ZY#HkkJ*@|VB6BTDOa-rzSv#0j~<00|rd5=g855zmgXYWrYEfofK2 zs-~ttYw{9~f^nt+69Mdt0^)oR^j|U4F}K;r))z;?eQNLVZi01+PLNfhNC5pilR5Jn z>;HDw|MglGq}>}6E7MUQd)JR;Z*ntd4rg=|HVh6MUkTJi`LNTWBpB9ZCpQraI|_6rYBU9oSfX$)RZ;k=zi2`5H+aI zH4nkx)+SM4JL5vNIIwym2)Y{S@LG<4i(gXQq$GbCPPm{Q)gQcfXbJ)bvxD89Jn5@_ zeFsb&J6QhBkH=$4R@mvt3`|T+igU1hIXuu-BZGi*QYNZL;e6R2R5SEi&Bmv-O}Cs1 zkp1=lSt7_Ov5mx75hb3tb1^hDl$TJ_*-|dt4_sM0Egtzq!ZKy+n^bWRK34q_F z;<*$G+x3cQJSS-V*w|RZ)jQ?MKEHiz^lHrk^zULMcTG*r zYrhSD;Vpx(EOgZ^jN@1yi~X1vjCyvtGLm>8&J$zuk&ORJIA z;I!_7;D*W^rMnJg^%pnLe5vZ-Pr7t_yg@%2p$<0+I|M{iVa9U_Qv?szef}3wVPwp`)#s1{~3pU-huHq4!=_mYhh+sDL zN3$^r(aYi38hk=G{Sfs2XlT0xUCJHGXvrVL3YfGoA>6jdfzC$=<1xl+nu2y*`+LTfq8WMU7#xKXAqJn!i^Xvkb9$P~-&4c9OLp-7KUKA0j znzlwC9Z|zb7JhZaiHt6nZp|Z{KHr-}%9E%ABsa)nC}Mr;0t0)$2ZPISWTfyUuR=s1 zyh%Z}LTl(nG|?~BU>Q*@mXBA~2C017HE}eG#*}X=D|#O{_U zYxC(`XY;tr{Vu|Kh;Rvvqsv*Xp+sUak7sKLkuyZz)@XF`L)Q($h579f(0-M3s72 zs=-wnkBW+lbneTReIiJ|H7dTLTXuHvQi5Ao+|L$EN{(I+ev@awA}3B;pO7>?JuN6C z)Qg)aPcJG;o+#HYuc#o!b`wMRD);G)fqjDr9=avssW1R2k8w+QXS};H@|9D3u_GAV zxcPT4vp;I(sM>6to!X~8)Ik#0Ll>Qx`4-M;ViG{Cdr*TeQYu$`VZa5dD!wSBX_s83 z#BOv3BB8xA_3P$=XjAlE8@ai;ImxSi^_iW3Fhck7IQ!AKuJRjs4NX?;VHD_PNh&a< z6A@3#6(!}wHJ~4Ps=u?;DOPLDoU+$)<;9-mbiggF1WyBuiWTD$8E&tPm-g$t;a*KH zQj+qR7G5w`BGJgdU`ZzP;pj~(?N2KzqUqZgBuqcN7{&*#=3do}KeFw3SoQw>?y2KB z!%|mLc)lV$4|wkDyNBY6NC?s#L^idy@+v9KZ(p38oK%fXYXhr%2t_qCp9u?fh;s$a zaNdMd&!O_SZ_>|7w`!dT5=@JK&Wo`uRyH;@V02%f`dl$oodUm8+&!@XDuv9F)0C(&@ywHZUJZj95UtM{O0VxTdHYA7rLu;BG#U%5^NjR`xAlE*iAoqnLwlwaK!y}hsODdg)maG7*M4DRgkj_P0ZwMOhzQp!ejA3BD_Q;2lU@4Tq?E%qKADK;oMs1=eI;_SKhg0{#ZF`0 zT)1_#Y)wQ&u({z^OB27+#>tJFD}yhY_b!jOS%R0tp-n~^ws4M3hMSGrDMzVEX?!Na zp*8WDyYUP+ouZ6DOk&mp(^FGAz}_78pCe`B8G}}*9c`;%6pTa-HaI5zJJU8ZUCO@F0ti?*^UDV=}Tj(SL@oKRL{;3e)oYi#yA5A6Jx#*ko6!aLK=UFh=}cl(aju!cgAHybnOUhXQ^{W@CG8!*)>1y4VhGx(7Lepc&=!3E zKpk@N>O$FjO2^p}l7PNHuNPj}Q zCr<-S0XM)zKI5;xZvN-~RaK$XGx2mqjUuq+`-dTG0~Al1tr@zC&A`E&_QcFF$Lk0| z;BglsxU| z0y*y?Q4%phnMu;P$8+C9Ubi&cz0E$?+p5kSj`o_ri`7pWVR?4L_|c=?a6vU)-Ne&X z$o0&#&XN#(Sd-mmD-LjSD_=4+Sq%G1Ig(C6jm{<8@ptsi*O{Owx6;5}uj^0G3X zUjojtU#@W~D|h{MB?bVR?xOnMHj8xLi6Q%&n}H`$y{1O>0&mn&yxe#QJW(yNhyU&FHH1+K9Y3fo87Z*fz&XN~3#txJteCdvniCa$jYi(-W*TPgn>J4Cq*MYsk{VJeKYA$kRw+ zxUNV^hie%e(y2ErP?F7@f=J33qYkoY$WufUc&Y#s_u#=>Gr? Ci)R!7