From dea3a519cc4879baab9aaf44037e3ac2e2424110 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Sat, 26 May 2012 21:54:20 +0100 Subject: [PATCH 1/5] Traitor objective picking error fix, thanks to @thvortex. Original Message: Hopefully fixes #58 Traitor objective errors I think the issue is in /datum/objective/steal/reagent not having a "weight = " like any of the other steal objectives. GenerateTheft() will use the "weight" var and not the "get_weight" proc when building its list, but the default weight defined in /datum/objective is INFINITY. PickObjectiveFromList() will then call pickweight() which does a sum of all weights stored in the list followed by <= comparisons of the total. Perhaps the total integer var wraps around into negative values. I have no idea if INFINITY is actually MAXINT, or either of the positive or negative floating point infinities. --- code/game/gamemodes/newobjective.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index de5514ddd89..66e71c124a2 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -1086,6 +1086,7 @@ datum reagent + weight = 20 var/target_name New(var/text,var/joba) ..() From 2f303de9b55d5411461116fe4462b72ec2b7f811 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Sat, 26 May 2012 23:58:13 +0100 Subject: [PATCH 2/5] New portalathe sprite, thanks to dezzmont and Furlucis. --- code/WorkInProgress/SkyMarshal/portalathe.dm | 7 ++++--- icons/obj/janitor.dmi | Bin 851 -> 1310 bytes 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/WorkInProgress/SkyMarshal/portalathe.dm b/code/WorkInProgress/SkyMarshal/portalathe.dm index bbd27df919d..083ce09a192 100644 --- a/code/WorkInProgress/SkyMarshal/portalathe.dm +++ b/code/WorkInProgress/SkyMarshal/portalathe.dm @@ -1,8 +1,9 @@ //May expand later, but right now it just repairs lights. /obj/item/device/portalathe - name = "\improper Portable Autolathe" - desc = "It blinks and has an antenna on it. It must be advanced." - icon_state = "t-ray0" + name = "portable autolathe" + desc = "A device which can repair broken lights instantly. Must be advanced." + icon = 'janitor.dmi' + icon_state = "portalathe" afterattack(var/atom/target, mob/user as mob) if(!target || !user) diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index cc38ead24c838de617663fccf97f866d27881f0e..61665fe8a65574a882b2d7e17d43f6d17a313c35 100644 GIT binary patch delta 1144 zcmV-;1c&?62A&EyiBL{Q4GJ0x0000DNk~Le0001h0001B2m=5B0OF*IdjJ3cv`|b` zMZmzoUteF?+1r0j0)>Z*kuOMpHDAV6eA;xE>mD8+wzjsPpP!SHlRP{;A0Hn~OiaIo z6{vI*1qB5)H8n0SE&%`k0Q3L=0RP+G0?cMJ>gwwM|NqJW0L+;)Ha0drJw2Ib0KmY& z3?*IS*0d!JMQvg8b*k%9#0Hu0VSad{Xb7OL8aCB*rz;b_;prV5O zqLRd%#F7jgN=<>HsX2+2AYlU?LkKkBQdV&Fa{&h}01|U!p}<;UAOHXZXGugsRA_`4iLa# zp#B_MAh_p4fIu>Ln| z0GtF3Ajt-%)5&Bq9wPws`_lk34q!f)^SL_!{QZYIf5ri*e0KnR{Rz$S&oF@ephPah z8lY_v#*0O~z}G+Bz>H}?9BWbL2H;V8oGjv45yT7ty9lxLIcPfr`shsq)&TAVZ3V<8 z-sCSZKz$uxuEvlcYPo+3C5xtlm}#K75<2I%D-lUtoq{-l048|r@mlpMU>4y{m6#tw zmjI&M0yILL;5GOc)OCKZm!hSXhwq*L@zdutI9GD>w*!y{S(dd&aK1ml#bp{OWjeya z-vYpe2?&BTO=av4v>UR6RzTFi+9s?lXJf+glNI(JV z8dO&xDS*o~Rhtccj4k=l4=vW9+%!M|=q*>4sfLSX>y8Nc764L~w^ajovYo&L6a~5C zLcYayNJ?q)?^Hfjfz~#{sZ)_ z0MPWhX#fBq-wNOvG(bM#_-`7Z=l7}sw+2`M delta 669 zcmV;O0%HB13eyHJiBL{Q4GJ0x0000DNk~Le0001B0000$2m=5B0MhD$JOBUybx=%H zMZmzoe@z0BI7mESUtieS+l7aV1qB7$-U7^KGwSN<|Ns9rU&d8@+RT|VbeHRyW&qe^ zv1|YU00DGTPE!Ct=GbNc004`T@_&C7mm*~aS3ehU&;S7Bno=i6-1SBP00H$$L_t(o zh3%K&a)K}rgkwuvEGVKhSS?0_`2LUB1cJiU+t6sHV~72rj?w+HcZnv9jT-f@G->1! z@bs+Z5uv89{Lv?Zm)F|}Y=QtmpdMatKqzkn2+Z@__2IA;WK5@1YUrJ@NQ-|WgmEJX zn9b+&83l-IRg%NQ zdH{-~0h~;bWoeo&76_2r0P8hhuiXK;CSZW_cL(Hk1_QO!>_?4ySZy}G{rv(S-G96F z?f>-`{)K1%y8%dl1-Qrm1zG>17;?mS_h*GU8Qewy>!)Z=264Cp1R;d0|M_f#077s` z!0UfN0wG`o%l;aWV1H0@@elhVEe?ACK=W^pmbPVd&;$qn9$*J*bl87i1<10LrKP{I zxdTDKQC#V=lvOFEB1jt`ZwS8x=-Jl^Fd&T09Z30;0MV-FukCC95&)W8qP_!x0BVn! z2>kM9Rkjf%O3>*t1c;viR>`JBvbqt#xi~fnPP{{4rbM{OY`{L_oY(#*< Date: Sat, 26 May 2012 23:58:54 +0100 Subject: [PATCH 3/5] Fixed misnamed CE RIG helmet sprite. --- icons/mob/head.dmi | Bin 110863 -> 110866 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 60ba5259430cbbb2a3f50f5e30e1f1196a79ccc4..2f077b367e8b62fae8add98a4583579a6de170b7 100644 GIT binary patch delta 1558 zcmV+x2I={a;s%o929P8H|B)pmf2Qcgmtun=K$AX#FrvoNL=>r#)H>d$??L_}Z>;4< z*{{EB*Qey$yEPstXUb*}}S22ag|1(e(f0ewVaoJLA zRId~Z2^BRPcBJP7SB(w6w;|hQ`NxOH{NcVi=IdFU)wVt&qrbqIv}ZLq37GU5#-zWI zkzgI9d}0A%+m(Kh_+C4MxTI$Vt9n-8`YK@)!~+AK(s6MI91e$^3g46BsFd$Xaa>GM zkLjI3V0=eYiK4)phIO~8e;u=l5BHAIGFO|5T)W8MrXtrSJGG8X4SbJ#RtudKTIwdg zLEo_bDaZNGc+QhumwHHE-ck?gi(6_^$vdaiq|!G{sY$iVj>g1vq1$B(dbV8XwBvaA zn=@SKa@on8+AehLmd@2Jo-3PL7EYB-ElX$0rWQ_)2UAviR70+6C~S)( zYi$qlF2OAiJIE6q}qw-Gbjnx&(A(v!O4MqWzw_Z^nf1kAVih3ZpTP=zk*6|zY zipFL4nnH0i&Iky^WqT;?5yXIri$ikF5d%72WGXTg?{$qFFg{K7z?D@eLIMlG4(NlI?2tD2;2Sb6RrV0iVqD8>NE@)ZSk z7wbw)J-=mF+S-1`W>$XQDBVqb4jno1@!&XOKoPMqV!p-oP8_i7tN^>s3b4x*^~n7^ zVn{VYy(Te5V{LqhH#8DoY&>K;u|UK&gY%43?q?8rf1NsL;4F<8RC#*42U-gw7Zw z2uYXdnO%XT4p$UOKq;WI7ZlBFLD@43wA{F|E}n>v7$QfZVOInvx{R0iw>VZ2T8xT| z=|O72DCqO}Y1#26_8+|Oos$~)CGE9A!b4|KA{Slqt7uUI$!fwIDx2E(q_`M=W?LxD ze-w}Rcde40rMf|O%!0|>GfH)p=md!&FF@dUL2j*=jzX~)$JlGt6o=*EC&;_>+uHC0 z?SzI0j{W>?3d7Rqv*s0srO{tW-{L^Slw8FI$)_(QQbvT{YDDxxV!xt7Bu`vikhCZ+ zI;9*_ktel`Uz?^nTkHz>5f{0mDO%aHf1CGnpN@+khgOP?f*-2XCA&3UY>2G&tp##P zSzl14Nq`lb!bpDf|M@?Jgl<<#t1F?`lhU(E?uVr}w~{+s>5ZzCCSX!GFQuQA)XYjt zrxSB&Cv~1Ap2x-CXP>@4Wlvu|um1(B&L2_k6cq{p03ZNKL_t(|oa~)@cvDrngE|Jc IItBsNss)Am9{>OV delta 1558 zcmV+x2I={d;s%f629P8H{E;Ojf28QemtuorfhK(fVML9ki6~MfsdcAl&q{!jS(EC37{qrBsU$dt#&&wBfUaZMB*~eej%f(Kr&}5tJ!{c(%u+&W$ z|L}nVXPfL@!@A?}Zn>z$`D~MYTrRebI`-Kn%dfG=Gne1yDyGo*zXz(Kf0Ac3E?bI? z>Xl+4p`vEPj`TgjMPq~SZOArR{^{W{f4FUq`Fas&wXOHa=ua>v?O6>@0w#TgG3jq) zBv=P2A6P)xcBLOAzSoW*F6mjps-6|NzDn2x@xXwmbX?p4hr=PK!uO;&D&>1p92Zm6 zV|qsr7~kGhqA2jHVco52f5&X%!@XfN&(*3T*Us{{s>rp;POT$T1K;D8)l6rFmb!^= z&^K&<%5nZPp7Uhar5=)(x70)W;+C3J^3EwWsq{@#YEtdIqcJg^>2}_N9xZ1&?KmF( z?itQ>IqzgnZD%@mbLZ-2&y`IrGpEX?mbo)!Qwt}@gQ+dxct=32f7=lf)OHkBq%pY_ z>6AE$FG5^2*uDWKJz~fu-|`x`;agr~Vt2myhvlMTP5W$<D<~FfQ5eq>jqqS~IHHZQ0*YGyJcnxpkQVqGPp|CFY zthL?6y9Ad!>>y8ckf%CW7hno-#V5=l%|V{(U|sAQ0q&MdJYoDv@_C~CxEe?DpJ74<-Hw^|f8tm8M( z8I8+sHHG40oDmR+%XU}VJ%|Al7l-7UBL;N5$W&w~-s>7UV0@bDfh((!M&c9(wh&Y0 zwE(%`i3Apa9nc3a*&%K4!8c@Ds_ZVF$4ppQc!(dM6Nx6lt1Y$h6`im%BGJ8WCmM+y zS763|B7rYIe;5OF(FbFoWX@_1;2@`PT)LHTFYo+xRXJT&Ppt$b4{arcy%+-|%V!kW zU92lH_5Cfo(AM^MZ0^e6H%fOCpF>AZd^|Xg7*Is4jF@k6y#ojAIxE0#vjXfgMLlvq zj~G&oP_Ic$(O4TF;suSw7aI@RPAm|y&EPyEmHQDye_p3{8aPWM234NkZh_Xq$i)R~ z$86Ahe+q+_X;D%IR74XtF8rMh&};b42I(|(92|0R4jhp4aDevEfkWbs=#Jt!#DN2j zCfU~K^ zFuN3+f6)a#q=^sID4#K~JZWL`dBaNj8hP5+$l;aswksXG_^(QiAX3%)FgWONolz*| zRThXT2M*~1yYBw4U#_sn_+09-#Dt3aGmFH&dhkHxs|Sx{HLkYM^?4!_M2oGKz6aV+ zKUe^_w5Cc3DWXp#H1evnt}Ys6$Okl`Z`Kc8f8PQ<{A+`R-dUoH9CuNQEmRi|4e`uo z6hhJ^dSO=}slypX5>N`L>WwD)OY3@wI8Hv)QhIA90b}o1&F1f4lpBZqsq`{m@F$QSd{Rx@4E8vkj58zO+Ct zDeDWWGzqX`Qy9sQ{y+bRkkIW)X?6XZvMFt+^yXG_XDhu?mC^)E>gJ{Nvyz%wY3X!g zF72ewlf?75`1|bh*Qf01%k%Odrt2S18IzxJ001BWNkl Date: Sat, 26 May 2012 23:59:31 +0100 Subject: [PATCH 4/5] Fixes PDA light not turning off when exploded by a detomax. --- code/game/objects/devices/PDA/PDA.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 1293cfce2b1..82b5235c2c4 100755 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -905,7 +905,10 @@ if (ismob(loc)) var/mob/M = loc M.show_message("\red Your [src] explodes!", 1) - + if (src in M.contents) + if(fon) + fon = 0 + M.total_luminosity -= f_lum if(T) T.hotspot_expose(700,125) From c7a910942cca71ea75b4fab582eda01d34eedd5a Mon Sep 17 00:00:00 2001 From: Erthilo Date: Sun, 27 May 2012 00:01:17 +0100 Subject: [PATCH 5/5] Fixes food not disappearing from hands when finished. --- code/modules/chemical/Chemistry-Tools.dm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index a3bcaabcc38..5135238bab6 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -1580,9 +1580,9 @@ if(!reagents.total_volume) if(M == user) user << "\red You finish eating [src]." else user << "\red [M] finishes eating [src]." + del(src) spawn(5) user.update_clothing() - del(src) playsound(M.loc,'eatfood.ogg', rand(10,50), 1) return 1 else if(istype(M, /mob/living/simple_animal/livestock)) @@ -1979,14 +1979,7 @@ attackby(var/obj/D, mob/user as mob) if(isprox(D)) - var/obj/item/weapon/bucket_sensor/B = new /obj/item/weapon/bucket_sensor - B.loc = user - if (user.r_hand == D) - user.u_equip(D) - user.r_hand = B - else - user.u_equip(D) - user.l_hand = B + var/obj/item/weapon/bucket_sensor/B = new /obj/item/weapon/bucket_sensor(user.loc) B.layer = 20 user << "You add the sensor to the bucket" del(D)