From a34a1f66cf3eecb96890b119064d5d53fa80f364 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 3 Jan 2015 05:23:44 +1030 Subject: [PATCH 1/4] Fixes #7632 --- code/modules/hydroponics/hydro_tray.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm index e692f294dba..5407615ea06 100644 --- a/code/modules/hydroponics/hydro_tray.dm +++ b/code/modules/hydroponics/hydro_tray.dm @@ -12,8 +12,8 @@ var/draw_warnings = 1 //Set to 0 to stop it from drawing the alert lights. // Plant maintenance vars. - var/waterlevel = 100 // Water (max 100) - var/nutrilevel = 100 // Nutrient (max 100) + var/waterlevel = 10 // Water (max 100) + var/nutrilevel = 10 // Nutrient (max 100) var/pestlevel = 0 // Pests (max 10) var/weedlevel = 0 // Weeds (max 10) From f054d56cc8754b3b1cc7b5c968740f88c5d5c9df Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 3 Jan 2015 05:25:37 +1030 Subject: [PATCH 2/4] Adds a more immersion-friendly icon for rig modules. Fixes #7246 for now. --- icons/obj/rig_modules.dmi | Bin 1103 -> 1176 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/rig_modules.dmi b/icons/obj/rig_modules.dmi index 8e95bc0dccdca0737a67d13f3e4ffc8c178692ae..eb542d07773bf47047b9c9daa14293beb985bf82 100644 GIT binary patch delta 1013 zcmVfFDZ*Bkpc$|%qO$x#=6ol8wDMGs!|F&+VrF3DhP(m^$4@?R#QPI;IEVvW0n;E`= zfoavbAI3>_mr*{ziI%8N>bTiT@g$plF^9br9^`ypP0Bi>$i^Xp$uxgbSmIQYofKEr z0jvIT;5?fp1RX7SW^z@H1aoJ~uj)d8C8KZEJffqB%0*tkHQOpQfK3(n4`@|Cb>Bxm zYa@9R>{BGu00099Nklsq5Q5Cu1ymO|QYv0WR+MEP3Q_0so$yPXN`y2=EK zasRkECM9UFol3l>EPs@r&1PBdH;_e9NWZ~E7Slpbd zF(7^-@Z$L-$&d1cIm0g&D3Q9~#o_~eKFjl?{(Qdt&W#WygcN`DhmW9_cLC&iE5GCn zDDs6YBn?zC1_Qh^$g(^m`4wkSDp9%-mO_<`!2nMNlpxY)BfuP!LQ3y@=AfT%Bbd!; z{Hy^kM5W5IRLZl;2Y8AgJ4LYK4RD2)v{rovz5L%P;^v?oq7(3*MZJ8RA~aah#T(%J zMaeFabNHO5Ae(=q`ij?27MKIfu;8Zf96n#V6rnt??>1A)9|Py{$#RJic;!C@%lSW* zkBEqfi1-Ag*DbssiRqfq_leRgpNh>7!p2+w%bTs--bhdVuXWWzYgV7ib7$Z$&*c`s zfNXg_(E!yge!sb`05}H{5U&0gUIVd3e#`S3jIHkO@9%%_Dr-0gD!j!&{oluHu=rz) zv7jv*LSX%mxd#AiE#9%sMi5m0YtXM?QxsVL(;S1TY-NC-<-q!18(o9T65eWj>NdVh3S?~)qA|fIp zBI4^{_a39@GxXJ7spbf5s^*QvuEBrpPdql&NQd2SZ}+Fcx#n91eC+fX8^BK*w*xi1 z2Av)w4KV5kjzA&CKAZ=K&;mR2KfF^1lT3a;1t38W%?(AAcL0{UV|1NGI-r(?M~_%bb5?6c#G~)(djYD jVEC*FK8zwF{$uV=-0C=2@kj)ChFc5^#$y0>(F8*D;NK5I#zCu}&HCZqzY*s~|-eAF_v)VED2`iP*i$@&kO9X4zT4D5|eqgeW1TpnrS@gS<;1%X)wLiZh_hOPNawR51n@ zcxR9#SwiwF&Y)JJb`jP>)r`Rfo(!l!q|au6H713aKJVFsVZP5GEhv8002@)Mx~`S- zbom9IGDu!CSn&qfp*8iY&tQ=Mvqan;^dUL{@3Ux-?@NRRE4p|C{Cr-sEpiQ?(H0~H zs;_wcsKgpzg#~}Nh1c*|a+G8-SZ4L0dJaYcmMt9(}Ql|Laae2c5A7?||eYgOSj#Q+@TB$bxUsfPjF2fPl|~?Z22>U+t9I zpMguYpVnc!-Pzr1>~5(hHc-1C6t@E{r#HY7?cofxn%v--Y7ajT$K&zzvfn??WN Date: Sat, 3 Jan 2015 05:36:13 +1030 Subject: [PATCH 3/4] Added back sprites for ninja, breachers and merc suits. --- icons/mob/rig_back.dmi | Bin 1272 -> 4595 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/rig_back.dmi b/icons/mob/rig_back.dmi index b8dd64710796efb0c8e64cd515520905fac2c9ae..7e10c55edbdf6c586eb9d3e6740b1403e258fcfb 100644 GIT binary patch literal 4595 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 literal 1272 zcmV005u}0{{R3yb+fl0001lP)t-sz`(#_ zVq$1$Xf`%BK0ZEDQc@fo9BgcCDk>^?cz8}uP9-HJFE1}iNl8jdN>^7`k&%%@Lql3x zT2D_;mzS3{H6}nnFC-)yBqSudy1F|%J0oe(FfcH`001t4_&S*XDJd!60093002vt> zRaI52tgPPN-v9sqtZe|^lmP#{0KmY&Cfm{l00001bW%=J06^y0W&i*HpL$eSbVOxy zV{&P5bZKvH004NLjgYYl!Y~v?=j1CwyNgv<7ip0W_7}<{c_t4`3NKGZzur~{>6YzW zIA^)FId$iLFzuz+59CZ!GDmaRY_)ollQ56{POE_AgZxGo5S+29v~t9G@wK`#L|nM} z3&=9sDMm;Rd1UfMMMisPl2>sM(UFB)v5(19LS#z5s0r`}c5Ag+skP~b_WR)nz0_j= zE$}6)000AbNkluF~{ zPi%%ev}?)MkDU|+0002+S$uhQea+RR5JD7_E3zsAIWlace06=}uk1gRw8JZ*gi>mv z1m#dq#cY;g(YN@%sV4lH{)6Eh&QA`@IaB|t7Q!FuD^=8Drh~hL!>&co1Yyt^^WsVv zTn2~bk~1hK--JIVq=)HD4-OIr{oTx_M9nB8mGo!s$1A-o{h?Rf;ND*M7cnTV;|8xq z#9+6`M)C&N#q#^IShEI|sH)1JiQ25{4aWWT4cfQA!{A)|^(_m{F0rW8jjG5Q{7VMQ zWw9)IgQ~h&+*HvS%!4tQdIsm-U*R2c2DPgEHd86e$?c^EZwZ5`8SMN8hupBbS}Yco zCY@;dYi=Z}dDv#y-_7q&f|J^%m!00000fCwR(%gz5b8>*0z|2;iDars}U#PrQWlb`=J55!P8`QPr> zj?MpeQGL@im*js<^S=D=ls{6bgLQFznB1mzNp*^!zWWKSX*X z<$o!C{{WAg|0VUUJWGy~|E2Zq$oXG}{@D3nmOcOg000000DuH0#CTL8Bmdj)_gwxL zD!KXNe$SV?{BKA4%gFx@^1$SO=6J}@9}h?NR>A-u`2WA7JaYNp@sj-UNGD9A=6`AZ zV%+>MtzV3r|E2YdQS-kH{c-cZ4E Date: Sat, 3 Jan 2015 05:52:29 +1030 Subject: [PATCH 4/4] Addendum to previous commits. --- code/modules/hydroponics/hydro_tray.dm | 4 ++-- icons/mob/rig_back.dmi | Bin 4595 -> 4589 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/hydro_tray.dm b/code/modules/hydroponics/hydro_tray.dm index 5407615ea06..10be361c17e 100644 --- a/code/modules/hydroponics/hydro_tray.dm +++ b/code/modules/hydroponics/hydro_tray.dm @@ -12,8 +12,8 @@ var/draw_warnings = 1 //Set to 0 to stop it from drawing the alert lights. // Plant maintenance vars. - var/waterlevel = 10 // Water (max 100) - var/nutrilevel = 10 // Nutrient (max 100) + var/waterlevel = 10 // Water (max 10) + var/nutrilevel = 10 // Nutrient (max 10) var/pestlevel = 0 // Pests (max 10) var/weedlevel = 0 // Weeds (max 10) diff --git a/icons/mob/rig_back.dmi b/icons/mob/rig_back.dmi index 7e10c55edbdf6c586eb9d3e6740b1403e258fcfb..9082cf9ee848754aaf8bdfaa5d2e6557930f2643 100644 GIT binary patch delta 209 zcmV;?051RYBkd!QB!9emR9JLGWpiV4X>fFDZ*Bkpc$}5cu?oU45XSMjd5XjCVzp}) zsYnNXg>oima$-`sL`9$8!9fJkI3E1|-*7c7SL=QY-KJL;lEh;K4efNMsw>;fFDZ*Bkpc$}TkJqiLb5QgD;bBaNG@n_pK zvLajP6~dT|$%x6yBr1A(i!DSD43-1W`xP^V^=8}eq1*N9Mv{3*prM`3RdZ)o0%%w* zRTGGPDC3a}76J{EiE1261`Vxhj)IXgXjr@fNilYa5tAb^!c4xZ$Yig=