From 9b3654e4ffbffff862a21c845fdba65b6a6a3e76 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Sun, 29 Dec 2019 23:26:53 +0800 Subject: [PATCH] telescopic IVs --- code/game/machinery/iv_drip.dm | 17 +++++++++++++++++ .../research/designs/medical_designs.dm | 10 ++++++++++ code/modules/research/techweb/all_nodes.dm | 2 +- icons/obj/iv_drip.dmi | Bin 1458 -> 2306 bytes tgstation.dme | 1 + 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index aee1cf4f69..b9e4826faf 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -222,5 +222,22 @@ . += "\t[attached ? attached : "No one"] is attached." +/obj/machinery/iv_drip/telescopic + name = "telescopic IV drip" + desc = "An IV drip with an advanced infusion pump that can both drain blood into and inject liquids from attached containers. Blood packs are processed at an accelerated rate. This one is telescopic, and can be picked up and put down." + icon_state = "iv_drip" + +/obj/machinery/iv_drip/telescopic/update_icon() + ..() + icon_state = icon_state + "_tele" + +/obj/machinery/iv_drip/telescopic/AltClick(mob/user) + if (attached) + return ..() + if (beaker) + return ..() + new /obj/item/tele_iv(get_turf(src)) + qdel(src) + #undef IV_TAKING #undef IV_INJECTING \ No newline at end of file diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index e70362553c..16b71bbb66 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -152,6 +152,16 @@ category = list("Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL +/datum/design/crewpinpointer + name = "Telescopic IV Drip" + desc = "An IV drip with an advanced infusion pump that can both drain blood into and inject liquids from attached containers. Blood packs are processed at an accelerated rate. This one is telescopic, and can be picked up and put down." + id = "telescopiciv" + build_type = PROTOLATHE + materials = list(MAT_METAL = 5000, MAT_GLASS = 3500, MAT_SILVER = 1000) + build_path = /obj/item/tele_iv + category = list("Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + /datum/design/holobarrier_med name = "PENLITE holobarrier projector" desc = "PENLITE holobarriers, a device that halts individuals with malicious diseases." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 6877ba71f6..5f3fc0e85e 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -71,7 +71,7 @@ display_name = "Biological Technology" description = "What makes us tick." //the MC, silly! prereq_ids = list("base") - design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen") + design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) export_price = 5000 diff --git a/icons/obj/iv_drip.dmi b/icons/obj/iv_drip.dmi index f530688da71e4ebae429e79ceb9e1394041ee2e7..ddd22dea899b6ebf935cc486f201257574a43404 100644 GIT binary patch literal 2306 zcmb_edpOf=AOCG@jme=JDRbzcG|C<+!m^1-(nuxcl$28rIZT-y94m*^lN^$bYCNGx zr9zXHLqg?Uj*Sw=EQXn}&9i#0_r0$7pZBl#kNf`I*Z2FmuJ7mme81Oy-B_R8=L zZ~y?54?5Vo%8~wSDXf(5X`SbH$YJubn|qY4f27~V!0@QRuuuSqEx7ynjWY|qYUNPm z4B|_SUFi;|@K$Ja{^cI8B9pX(7{_a_WoyGaiyTHM8abzo;+exNW^#_SXfG~4WYRY9 z$Hs)j=B37b!?^K=H~ak$+aoRVQeE&0$dK5e`0t$=y9>J%R2+jjYe*j@UZ?9mo-|Kk z`uk^;=r9{_mqdo6saJSMt!d)ICj{}v;;d`0*StRJffE>61x8%ojz5VwS*QT9JBg#Q zX97#IErlJ9_0?`uANCg&dKAvo7cBL|1KS$^82FgyC^M{$awCkoF5e+3Ege-BR#gpN z%h^UVd|*5T0I*L7ZEDHtA-Bn&JcO$Nf|GPL6x$Oh@O_xG=?v6b{0bs5B(8pA@^ZWEu6Joe$5#2Fc z;&194x=d2*dzDGflq|5zIzMX#vp5trBaW{%=*9(SsF-p0nRdT)DlrlA!R=gmc;QXS z$r+kENV~VAFOyF^%*lP~QK13Q*+ISx6Tg?sy1*W-JM&jkh3S&0mu!D7=FSLIBi^- zXvLZQw5zcU zDTAKW#G5@p=0j|RIQ7_&x#ltI_Zii)29iSv(5rsMlgfIC-6}()!p}fj9$_cp$m38G zL8=RNtrj*0dgg?WkaD)?7mW?M>3c#i26|l8A;pv0qi((fLw7!)=7zxH>_CYB31G5@ zWP)vIMV27}{1zh8m~0`TqJ~&uI(E$1Qz3(^x3CG2fX}k9m z=T}U{M4c)7;4d;{!x7;1Q?pINCI9%quRC{Y?Ba>`5BcW`A4J#U4dgAR3Rq91EO&1Y z>*JS(NueQ3Z!j$#t@0-*x7y`^;7EkP4_NStAFnZ5l&YCihSBROd$sJ65>a$|G2EbZ z#Xg1g(Fi2$US>kCISgD50iF-4Qmqy9Fqcz4^Q_Tvb4DM=hV!m^D94qR<(9GyWGWHy^75?kATVEOwV7w4rEnjca8%~(cgva_#|NDFfsG25=`0D`l8`Qu zrwqE=jxVQKD{NcgJC&I#CX1&ro0;cWTM7&sHA=kI(Qm947OC2EX4%)%yg^RryUt_o zsx8yr5kd;?N{Fp-oDDaRzbnp(e7t9h2a*=+pud&MM|DO_?C~!KcJ(=N&$_{AL zW3wMVtE>Bf7fB4ey3=*`gH}0^NBolUJj(jF@ivS|#D+1&qR^)*xwwMJVTzeLFht(c zWW%GZK<&!zI#OsA2$sO#$|acbC|kM3_W{#ATK2%B+Au#i>+{+jFAWT?l8#{^`AUbE z1jEg@9^{JKW@Ada#-+8yDkLvbq3v;371)GJ+58A)PQJw93=YBobFzi0_nysU72id5 zEbW%@ZT{?7Cj@xpRo_=D{dCXX7&r|sR>t`=J}Z%y)26bvFu~l!nRie4Ap`H7-s#N$ zBn%om)zvLXJN*Zw777BYB{8GD>6BKFqSr0;(yHFd0#X}4Vo<~1TJyO#Y@_1YprDBg z_*(m^b;;hfJ~%sd{O_rT;_-?^M8R!w)J&w5it@=H?P~25#;FWdio;K=8e`=x@`M)b z%5jWwB*|>H}Ol-Js`$HdpH>EB>kzA^o<~*Bba5dvkQl7m;wv>_-+sbDe1evI9UHq zXeKabhrN-gIx@DH0SU0sdW$%xx{}hD2&T_dDB{jA zB(|$pk5L(ij#14Y*HJ^$RL?suZwmM#IXEcufZd`^bX(Aiym=H4*!{&`OaLRU!L)q8 z{#V)@|8X={{1>SLvY|K{TLE#EPU@I;Vf1|V>2}CV>{0nux&re4h!CdY@3vDNvo|t9YUh*f6 i*Zu3|=&D+gy$tAIr&Bo9feG?Y4RFxT+4hl*Pr~1PRatTX literal 1458 zcmeAS@N?(olHy`uVBq!ia0vp^3xK$RgAGXbBqvD&sZ&)U5hX6E#mPmP1tppJc?=8{ zbEcl#$k${b!1iEgZ5Q{NV*yiMTsrE&!@Q@-@@3?z2%k)YeS4YJtTJ?N$A0?zKbB{A zQv9_E;i~c{d6#WhNZjjVv0M6S^n?vwmf0s?T=PHu;G(cc$C-+Nb9a=^O(|sd5STMp zCN6W<{d4nHemwT-z0p&jz;^x#3S#nxSEJ|5uaXUx{rlJZtC%h8MdgRBcX+yb&673W zUC0#j{50L#$@kj%1-BD+o^(nTyEBumyz9Za`37x^&MB_<`p5EP!#V4g@aG*23@nR1 zT^vIy=DfXYm@Qo{bL``DuQmy$GIsr|0{MF#d1r9_67v!i$+DWV#_$U(i`6R|u}@4) zFE6N;WbEm@v^^k8I7&XEP3(^2)&tD~EKd{*VplELHLaw4*KT*KT6+Z#k)QLp>%Q!^ z_WWmU;pxY+W6$$@j5*t?EBC$l^uuW8zuyHGSN=`@yI@AFQvKvl;(iA_Z#?~&YP9pM z>>JiX8ShDtEUp2i6Mo%SefhO~{bbA8zP*2{p6kzPsAjJ|s8VwA@v`z=E7G5=`7`;q z{L11Ft^58f2i%_W|M^~bse9j_^e^_9@AWHml2xwvzjaGKPWri$?_l?-?Qb4`&RJht zyzKE~m$kDaE;)PGea>BUW6FL}*IzqtUb(h^@`;J{u?}_XiVuVqR5MwATCQGjHP2tc z{ofasbJ@Av7Wqt}Q|+^v!V~YYtkSB##&Rwxm;1#$hj*MYS6HId_IGgZ*~VJpukf8k zFN;Zca{LjNxZ6y-)F)Ik74v001F1V>xnO2B(@u4R=M8D^IG@ZrP-@Bk4YnIO-oQvdl=vx#@H z4^z5iuiO9K?_cu!bN@c6^Xc{M`I$^|cJ@4OizfmR-+Xzt$^ZSMzHU|Vf$nbZ z-28m+No>srcia2>+&7o&e_!LK)BNYxv*lJS%&8AkB_aYHKxm_#!kP$qfv}b9n%+mr z>;3w+{>k4D6WjLQ7p?tl5b@Yc57<(tDk&0I2HrFQ0=DYNE>eqS+ri}l;yv*(q* zpEkI=IPX%9ndtG2GXEpX|LNRa{H|Ut|LX5&=gw<=Zx;+pOl5d}OXKsOyYFh0JmpLJ z>uw(Tqf;baAR5M2u&%c$$$&BOC`(J|yY2~<;Ri!!l#9MG+bK{G%dq3~<`aMYJYGNZ znZN(9@7md$mA+0}ZT}s~nY~JPXv9{+v2h?tv;JelOZGvpvgt*(RTH!ZW z)jU>L-BTNX@2xGLe0+Q2in#UW-wXAt^~*2kO=h|l6YAe$z*Af+%j%*i=6f{qhfMtZIn0ZMHm_@%*|35|SimeY?!I^T>ICF~ zTf@(xeT}_E^fmLLuCGAnoHoD`^IFRrmU~Gxw|)H^S#Ebpb7@1boAckg{XM?RPs^JK zmGARADy+~N#C7BS_p2Eur*4@1%v^I(aK)BlhvzIx_vh5Fy5g>IkGoAY{2&&y@h3H8 z*;_yEPr1Ss^)B{Ch7UOMAxQw4oVv|reRb;vc5(i7bANg)pHuE+H|_8Cuzf#2oLyHf lzd@oM>~~}xB(eW8+lWUxX9q9)1uTRaJYD@<);T3K0RXZ!zXbpQ diff --git a/tgstation.dme b/tgstation.dme index 5526e5eaf0..252cd8ab3e 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -882,6 +882,7 @@ #include "code\game\objects\items\taster.dm" #include "code\game\objects\items\teleportation.dm" #include "code\game\objects\items\teleprod.dm" +#include "code\game\objects\items\telescopic_iv.dm" #include "code\game\objects\items\theft_tools.dm" #include "code\game\objects\items\toys.dm" #include "code\game\objects\items\trash.dm"