From 800c207e2d91a5569dfd0d4777da208104bf4776 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 29 Jun 2016 19:34:35 -0300 Subject: [PATCH] Fix #460 (#501) No more lethal syringe invisible sprite. This should fix #460 . --- .../reagents/reagent_containers/syringes.dm | 6 +-- html/changelogs/alberyk-PR-501.yml | 36 ++++++++++++++++++ icons/obj/syringe.dmi | Bin 3325 -> 3961 bytes 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/alberyk-PR-501.yml diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 2682426be7b..01f642096f7 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -280,8 +280,8 @@ /obj/item/weapon/reagent_containers/syringe/ld50_syringe name = "Lethal Injection Syringe" desc = "A syringe used for lethal injections." - amount_per_transfer_from_this = 50 - volume = 50 + amount_per_transfer_from_this = 60 + volume = 60 visible_name = "a giant syringe" time = 300 @@ -338,6 +338,6 @@ /obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral New() ..() - reagents.add_reagent("chloralhydrate", 50) + reagents.add_reagent("chloralhydrate", 60) mode = SYRINGE_INJECT update_icon() diff --git a/html/changelogs/alberyk-PR-501.yml b/html/changelogs/alberyk-PR-501.yml new file mode 100644 index 00000000000..8d99a6829a2 --- /dev/null +++ b/html/changelogs/alberyk-PR-501.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Alberyk + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "The lethal injection syringe should have a proper sprite now." diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi index a9a46f6046d6b471476a2bdd78e9fcd50c0beb12..96f1b0e1f13f6f4b73311769563e04f72bf1bf61 100644 GIT binary patch literal 3961 zcmai1cT`hbvp)$f!o`3fMFc_zLBT>5NrZ^>uF?dgC>`l2hD0v{f=U+@=}p8?LlMM) z5hWl}gdj<%p(ss|P&9;m@qK^1b=Q4sy+6*`XV1*uGkf;@X68JwvAW35dxRGN0De;w zq#b+gWIsg^ZuZ+*+3PBMn7!@b7=iQ&_X_j78Q~Wa3;;3DAARZIeWxM7v#xt9xwJ<1 zgSu;jNlL`vm9!D0P`8_@b$3g&a#G4<(1E?M9i^Oy9`-@Y=d#+J;f8BM%^ufIKK0+S zD3Eo`9l#~aF0Y$uh{u~1^179 zkSQYHq1f}D>LyeOWU5L~KA7_Xt=j0Vz(OO0_sCDfQzb;7cswAt~+FFNY0Kh>zQ{;Jv znCGkcs6dH%$&dKYE~VuAt@j0ZGL%up=Bj*_hXckN$}H0pdgJv5&y<&zq?jOw4+nyL zd{ubQIA5$*QMr7#{1soUjOPny5(xYt`(A_A1y833YQ>;G9@K0H*Kkm>Yj> zqO2+ot=a>A@0x=sSwT5{?Gy57+&jNQaE}fy_>6!vcsMS?2Jk~P=-p*9nRaIuMaB)d(iD3X zT*|BpE+5skkd%63%^>IM2nFgBrMPiy{Y{Uiwd#AeRRGyDfndSnKNi{mNMB|4ye-x6 z%*dFzBx6Ul!>96#%5m3Ln;m2vUK)$Vh7Noa%rJ}K@@RG(v~jQfOENp_i6zQf_pHbT*NI}V+EE8^l7H^gS4H(RwgDkMamn} zo4GPe0Rg(ro_AcljYcbYggo8V&sDX>9jA2Cw^AQH;@XRg8kj7*ie5+AP~bFbK^@Dz zg&T5$i$W&<v zYJDUIPXMB8xA%>yoD}F=s6WGbN9Ho)IYiEoU<;EyBMb;0;l)7sxe)OQV3?s1NZ=oS z{1^KZELPASO`k;y)l802Dp0i5#dvdv22&o^`Vxx2);nXxL8WKDxy-7)H#-_}C#O$= zxX3?A3WJz4s#XI|5r(3T?wG-#VsuC9s$+fsbsqOC~KHONi zZmSShDwdQ-7+i{}4k?-JuS9vR*t6qkSDEu4z7d+0B>S>JaPY5Can;jakYu*O=YDW>HJ?orH^p5e7iq`*vfj&12ZI8Y5Zf?|JUOJ#kQOt zICPBRL)bJ5C}k3aGW-qQl1`H0`Z87VD0Z;RXd-kTZbPjh8qC{exA9o)@r4EYE6$>^ z5!*ze42$Phl@5-M5TKRl*>$*9)T+|{r)#@78vPOqtP?Tu^AZOyC?q=_U}OANYdE6K z&lB7kv2X>Q8n-QOAfAib$ppj1y9oJTUdOt{8Bl|@F%p`cIdXCUCVi;dY;WGSKpP1d zGZK}MDfqyuT;k~<5DL)UjE;=#&Z-n{QU1g7*22AAzn7JnlbF7_SpQ=_$Lq5_oey~` zgG_cVpMKOt=h1;8PNh|RFeWL5Xy^5CFbe3P55ieg`hc`*2x+9# zziD=^%05){t|8}tkuPmmiKG>F)YMp+;m~oq=Z1C{t#PO=bn$#43yyN?JO)%_7zrV! zFPPJeqGmi^ov(UM`cNR8%0zFt=VURx$5RtlsIC^4R$#zF(cYC%D__?Eflsk`~szyG@v2-5@QG0H&?`CUbN1prl$R^rjTXTg>v&BRf++6$?cn zk=%ZrTT8-jar1{ia|qO@$seE@xKkI40TW}H=os4f-Iwgo4>E8tDlSGRSmw`}Tg&SN z7C+|`{?7k6Yaq(@*yFA*mFb!Jk50QkqA8*Eld+bTC!t)S!b#po|0ufoMTztp_=EU7 z#D7!ezaTCE%+^5958Om{z1Wg@cBu~Qc}f?xwK?mNzGNoj1Tw;8d8cRZ^HrJf$Rr3{2F^*N zl^61|T2FKebgQ_;ba8|}cSXqZQY421OSo`XQO>^oNy{MwX_}3HL zF%c!6U^Q~@K8NX*EUP*O6rBweEp;!3hIznX1dh%C#tw~;3MZW#YI}KX@AvCPAYLo) z#2fd!eeLV+Ku9CO&Ob_X780S-m(8MdPqXf9E+p;$nu`6=ftgZwYsK*W zxH7#Zgij)0eDmdd)*ZJHlNfd+M6G-+j@_%d+FsVxbzXiL-l2Egd6@&()TFX#fn!dy z&Ih>%X*+FSIPV8$?*Gi+UC->>^&!&zDP85eY=h!A2kJV)X_Xy>kzmrP=7fvSh@^)WM)lU?|FsefH^sUbA_Z6#Ggm70P$5U+0r75K20& zjmHKine^hsbyC;gAf8@v*ZiSTjW3xNu$4vxyN1*A&;H1Aqu`~pM@JQbn>t5_%ZXqG ztMh9LxR#dFjhPSSt6#r<9j(Q~p62m}sTYU4r7uIN<2P#2SbJJp6+& z^>fQ7HJh}MW<~ADc=@MlKyHuf#qjX(A5XBypBdWh@UunbQ?;#k^{Y%3WK3lP`bbYE zuSCP^KP+#RguC}0IVafDQ_k|D?3jg}PD-;-sQyC)d_zLqX*YFlpWSJCbt{nJW+_-l zR|eo)H>{$R-T?@6YxvI)s>k&+b{UwY@n2yj>V7=!AI%!Yi zM3##q7ce?g)f%*r4ujnO>#xAm6SxBt6BCCfO1=@EPXE>UJ;Ka=Y82yQ9RUC$PS`qU z?Cva8SK;x%A_tH)8OqZT9zGM*9vbZ~t##oA2w8aGI)BsbU>^J$<_r@k`fD1^!X>RpZ3akS(D7>|Dw{q=u$$)g1tK zR$Fu`M!&Va7TR~?8RBEAwCFY~1!+72M5A^XIz!P8&su{8Ya}V7qdqUO*zA$F&KECU zJbbN(lM%+O>`$20o&61LnBPgq=5NILV(>Aszq{Q;yo5R;2v3ps> zBV+uzt-&Yf2U^U4^{xAvcBZD{Qs_!hVsKwKhp5uVFmq;gfNQ8nwob%?;ng4_Jnc^k z0;N`rkw|72E?fY;n}*nUzvG3u{4~i9&;|pyA4hNi$Hs!+FEva!X2lB5vzm@w^Ji0O z>AgWQ9ZK6xUOOw}a#hVBz(r~jGYW5&uI_un{dMZ~ayG^*TAz|Mn%6S3TWH@H6?Cjl zMA&2I;TM;IuZ~IP&q_*U*_Wi|)W8|sA|WX$`DxEqpq^U{zjAOqy70}t73y;9-e^nb zPl;K`b#HI6?(+Iy2XFuWUYRZ7c=hUWN!HF;F>&z^?=L~AO0_Vh9|=s!0j(u6ezf_N zBI7&K-m4TB*3BEEFQw-4_9#0DTE`EGRbsLI4lXXL$DJD9=OV8wU*pp7X?SKum*oG3 z=s>;TGg6}76rJ}Bq`N%)Bu&z9Zd$I2m)Bt5sikYj#=)PI#5N83Qwhc2%gvQY+L@r(h|8Zwehy3x z4aq1NaxM+KuR)^M0!{{vlS_1zeS?Fa^!D|gJagv#HcQPU7F5Pje?os~aL{9EZS9Fx zFjXu%;S;gX=+-UW{YvL}8CO-nfVnpU1>suH=3iFB+G3R%#8S^>q!tv(yxADewP z1uY!-s5q!r44mSu9!=hKk9%+c51&r=1-_C;-+*bSH#!K;umxy=q+&XIgZPb&&^x?Epw5(BH>T}}#m$+O@y0tKMebdl2=1b| zzJTJ<o>rU<+^_s#p}&G*gs=KZmIW>48ucF#Gx@fKzVyxb?b0RZ4NGSstV z!XD-*;bdpdwsNixOhCMEWfP!x=dP>2hi`y~4+a229wm=Aa=%iAvM*k|mr(AIsMZS3 zQ5=&LB?TLrs$KOqKBn}tOBZGT1#@L_xm#R$=rgg9&POUGtMHfYo;M@}OS{#K4@E@b z`t#Jkd5#Cg8%eVsJD2WP=@17)`37;VJGbrL$RfD=E^$`$#=~B7>KrX?l!0P1WYngj z2J%NkB%#a#$*&PTR41I zd!W|bZ<|ZXDp2BR^y0+;SDww$UC3v7aZ%^jLk|FeXVFLxWfk&hvk>hqFnD6{kPNS- z=97@8KBS{>p0S89v+n26cR8F$51$QQO6wXI$mS=|Kr zv$%A@%LD;FJw#U88{VVh#=T8*x1!&4^b)gGbI%jitJXL|r$a+u1d~H&HAW6)3o*f% zpyHWX+Q@LT$_P=};W?YmZRx&s7O0D~0Fa)qSi^(F&(AwLM>|xFdt}Zbz-f|S=ez72 zDEGV8pHFXChfi0EtR&xdC@^Du1zEDM=y@o_+&l@42b2dkquq-UNaK-2PD-`vG7%w0&x=-fS#uub6uILqc$;}xGXCAr2T8q zi~h04S4@M|w6u~RK75$_eU&f6!~~q?)?Qxv(y=SR%HA^KeF2;mplDl14VSq!_%A~y ze!YXEbsQWDZJzl{KUA`-tP~a!diB}2q_b1=jGvs2$wOf8)s2QHAVbQw$P9Z%_^%;P zys1iLr7>iYsjp&07>10FkLL<}R#n9j85tR8jZe_h>X(*YojGWFUUc)v5dik?YLtP( zDFU6A=-23Tz38@RcRKnOh5CKIOJs|Y6PqgamAXepc^$@t`g}SF9~VO|aJRL!*`Djn z`#~#d!IMXd;qT#0pE7052kiCxix6|0L5T_1WQW@mGjYv3QXAA{Z`J|c#j!}A59H)# z-2S~$68sY6BZ-`>DyiPdtydAl0<+WwLH{ju%yT};jW^^4BmXxUe=$qWg_L@;$Z)K6 z%`;(4F3Ubngl<|=;c33brL=x@^fqDIgAhQOc^Bm)Z z8m?Bf)LQi|Csa6C{^a57wE$A5V?AZZew3O`xz>m1D;swHA-hrNzS-*59C})0x^#hWb1_73dDx!WSEZf zoV`96D=U>Z$^o+h2l3t7cM-V&(O7yGhVB}azu|p>(K%M*4 z4*jT&(`6dDyq|y49=x@YpP&0P+kcleH#>HlChUeiaKG1G$qojCS2w<=dTaWAjd{8ZG!%?DIi)J0=cM5hdd$Lc- zYrmceBkUeh7QR<+#5aj^<;~1&jSK^T_XRtX9Mm;T7|^^^;etI7$2_v59?LB%GO@)T zOvBgD4SxJBN7v63gMkLcQ)(Zb0veMKLGv6i5B+Pd<#NjM58nUT2jAHlonA;SA57Us z0O>puY+@#61D)dB_zJ;LoFIgWVl;wB=algFIqct2qez&M1rDJ806F2aL32 zd3*;#{&I5V>R8JfJ@EW0YZ_3SFD`jZc1q5v1Ksy{7x%YalE?51--Yw?^5m_3b(T;z z;w8_Y+uDEoW~P6W)98{jSoPAmj3j@k3zr0Vbbm;8DRR7O+aIU(E3DfB(bd%jTF@`P zEec39LVX1do&1VxYOQjn>u#1SJAM16Z)%!Me_FDsL}&j?7XA1TX(>3#CC2D;VgszY z_GReo>?~(Afk&&WJ%hzzp3lp9t*xo=5B7nGSku$uPkZ;9x-UybSS6UNEdK(UO1XQ! z|KxeB-W{@CMru;XrU|#UIxp`!b@)mw{`{EEmxOI$ud3TWw{(0P({5)%$D-Dlt%2C? zQ@lpufQSkFZWwOZ`{I)gE}V)cTCiqpaK*9KqDei5vVTa(86(gS*8jKR~_1C(li zNQrXN6w}7nT5zG0XZ*^_S+gf6F95#J?3dGq3;Hw{<3(+hp z5`B@+8(p%;YpzrWc z%c#2@&<4K&AemJ#`rXR=}~J6 z=}f6NnD##M?&o=vFe8j3s8VLI_pP}QKURL;WvbrECy=iq#_z%ZJWBq*&dMzG@+$aG zip6i<@0=wn8*$33008wva5qN+UMiyDZq%Iwzt$yQ2&A;5L!kbVSI>;#OvvXCN9JkU z+i9~5H2AC*LTitRd50@Q0zKgdbUi;mc}H3U$gTLp08jb(5Hf9)QYAJ^qh2^GT>+fy z?;zNBgMm@p+7Y0{e_tpoN9!`KEiAQRRFM@3@}5oF z`L3P1Gv)&(YWr^4^t3VN-SzHmVz38QUxpp7jO8?F^+YmUQ5&u}{x`#6Nem}#mg^&l zx+7a#&;;YMM9~(v5wX^ly1F`{;=^U#BM^x5`sY6e=rU>9=Y7H#M3O5h#s0O)ZxQK{ zX)If_+}_i5VM3}DL~t9AlY>YfF~R#&*DhzD`H>Tt*|9xad+ywV75-}w@&f8_7V*B- z@tF<{PfR$qeY+6?1O^6{5eS@D9xC?!_|f8l7$BQ#TOK5<_S0JZ73(<{DVwu|r%%;~ z$H&K6aoB^Hn3#q;e~CCxW$f_ZsY>A2xOg$Xsp(um!EmmJK=C1Uds*@rA9TZzCI*|k zc=xX)V$+?(YEB}n%@x~E9ENT>)?qGM|KW)LNq&C_x^Ly%oB!2di20uZj4qq$)#==d F_y_f#Dp&vj