From 062635f3da4e7bc0bf4f30974359311f70c16bb4 Mon Sep 17 00:00:00 2001 From: caelaislinn Date: Fri, 6 Jul 2012 11:51:47 +1000 Subject: [PATCH] tweaks and fixes for shielding, relating to building and useability Signed-off-by: caelaislinn --- .../Cael_Aislinn/shield_capacitor.dm | 4 ++++ .../WorkInProgress/Cael_Aislinn/shield_gen.dm | 15 ++++++--------- .../WorkInProgress/Cael_Aislinn/shielding.dmi | Bin 2412 -> 2427 bytes 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm b/code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm index ebe512c08b6..98485e6907c 100644 --- a/code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm +++ b/code/WorkInProgress/Cael_Aislinn/shield_capacitor.dm @@ -108,6 +108,10 @@ else user << "\red Access denied." + else if(istype(W, /obj/item/weapon/wrench)) + src.anchored = !src.anchored + src.visible_message("\blue \icon[src] [src] has been [anchored ? "bolted to the floor" : "unbolted from the floor"] by [user].") + else src.add_fingerprint(user) user << "\red You hit the [src.name] with your [W.name]!" diff --git a/code/WorkInProgress/Cael_Aislinn/shield_gen.dm b/code/WorkInProgress/Cael_Aislinn/shield_gen.dm index 46f1f4c6abb..9eacb37d7b8 100644 --- a/code/WorkInProgress/Cael_Aislinn/shield_gen.dm +++ b/code/WorkInProgress/Cael_Aislinn/shield_gen.dm @@ -25,7 +25,7 @@ var/max_field_strength = 10 var/time_since_fail = 100 var/energy_conversion_rate = 0.01 //how many renwicks per watt? - var/flicker_shield_glitch = 1 //shield is slightly faulty, and flickers + var/flicker_shield_glitch = 1 //shield is slightly faulty and flickers - don't think this is working as intended // use_power = 1 //0 use nothing //1 use idle power @@ -129,15 +129,8 @@ if(E.strength < target_field_strength) E.strength += strengthen_rate - retry: if(stored_renwicks - E.strength < 0) - if(owned_capacitor.stored_charge > 0) - var/emergency_renwicks = min(E.strength, owned_capacitor.stored_charge * energy_conversion_rate) - owned_capacitor.stored_charge -= emergency_renwicks / energy_conversion_rate - stored_renwicks += emergency_renwicks - goto retry - else - E.strength = stored_renwicks + E.strength = stored_renwicks stored_renwicks -= E.strength average_field_strength += E.strength @@ -175,6 +168,10 @@ else user << "\red Access denied." + else if(istype(W, /obj/item/weapon/wrench)) + src.anchored = !src.anchored + src.visible_message("\blue \icon[src] [src] has been [anchored?"bolted to the floor":"unbolted from the floor"] by [user].") + else src.add_fingerprint(user) user << "\red You hit the [src.name] with your [W.name]!" diff --git a/code/WorkInProgress/Cael_Aislinn/shielding.dmi b/code/WorkInProgress/Cael_Aislinn/shielding.dmi index 99eadeba4d79cdebec99f18423063e5ab67c5559..58dd98641bc84cce5694e643c9645881dfe14678 100644 GIT binary patch delta 2127 zcmV-V2(b6;68jRcEdhTyNklDeuU1NN3NJw1qq?WF& zdKsFd1z3Pcya#azf}sBbf)YPKe^6va{at2uGXa%Zv;U6-?9 zDPVj-z$0b~l)V@q1+^T(2I%?j@v8w4UksMFHCKU6pmHc;bf@wMHehi$F25K6@|ytg zqnku}+bM(TtY(43DBz|IkUxWOz`{@Z2HyabUlr;$FROnNhz$eo0xfX(Q3CpD3d!N_ z8L;pQ9A>jTq!44&GcxZt_ z3lQgF#yB5LeikSl{@?Jh46yh(nF&k7C}8a0NuXF(RPlH`$N!#>p_c}KTllBL|Nfc= z*nEr@Y}bDmG;0(v%6p6g#UfxBgzCQM<2i1RH~zfwgT;^XAHNtM)tiYUaGN03DWLbJ zr{Sr#$18s|`4gMxXy|}X?jLBWWiK;sMzsL>>IXFjdV3~~y^hHbTpky@0qOV9a9mbe z_VaPT5OBYr?xKIaw7_+@Z1Hy{@9Os*J~H#U#~^<>_18G*O#!FV{Uly`ciGQV+U0v5 zzqEI7K2S%>19fcPMnHA9>ak70bU>WW2U7EQh<~woOe3L=VdMG?Opol{m;$fq-`7j1 z_7#7J`7?*tZ4qISfN^AY+0P*fL%@u)(EK;XO9qc=igcKGcKMpuua_r4s-vaU{R#62 znqPnV&}}z2w73~ygykF@)ZrLq=Y0;vSI6gv*Bcu4LCFgWHz{;54k5-hlZRNF_Oe5J zqNuQFLkx){0BXIroTui9`TCHZ+8`{>9srf)!%d3Ag zA~hdWZ^4_~N@5lyKRbZ?1U(Csm~x^^^|)9m;Ftm4hJuOYfn))7FtPH08PMm6@vSdB zvA_s0AIA=R%E)hh&7WDDo`eHC(@_Po5i2PtEE3`(qcA?aScdzsQx*7<&_)V}Od1** z8o21Z4aTg_NknEh)EA8u2mGugO>@HX56cBt1>b;734j1;YmV=shKXq{N{f-c9ESD z#55-fvjg3E)gkGDwylfOS1h@!OpjD_qZ-5BbYfgadjZv`+ zu*7;lelr9VNR+e{^S0Yxex85wz}5@Sfy6HcmkNLTsmr;&E(leACp{TsMeZ)+~Ki=5QZS?`@jq zKalr3;dR@OMf_Tr@3()QDB2NWa5y87(|i&-^iO8hdC%1+oa%@#M^mXtr4e~+{1hd* z=&}V#o_eeMe9zdUZ~92q|Ax3C=Hl#xJx=rq_Y2+|NP);MSS>y8gCkJv>JxhgDsTMj zeUXa!LuzE5<~I;rjYDIf>G7g|zfi1^qLq^gH5zGXcq8QXX5fGNrq@FiL^FUulp9NN z`o#?(!XCw)erW^num}Erpe$q=0Evkah~$m3F~k6?;qv(h%0$!o2HY%gny>SIprEjH1M;!+2r#8FBU%y2Gl2Jv zH)C=fOTRnCeK-N@lbQ$|f4EbG0^5M{bDZ~(#?|8)P;UW#j{)WHRgi}N@Caa!_nQo0 z136;i4z`>Dz-BIfJM7)`Lcim(G88iaaK|a{2lDRP*OL(P>*}gehqMC;s2@$+JMKdn zL%Oe>4aj~!&|3@$Exy_Qb?+&Zjb^~!_;>>v8X6iJ{wDVM-}e;6LA6l4W;fVJjZfW6TS*c%_enfv(dbVEZ!L&N_X{{iu`e4wM_1u*~s002ovPDHLk FV1oG~7;yjq delta 2115 zcmV-J2)y_E66_MNEdhTjNklNzw=51;`CTYD0xAPD*|ASm$-^an*&)Zb-hHxp2qHT(Ze@Qz|HyOkj11}k~{1oJ00 z@5?)XoWo;a3G}i%2~vD&^riws|0l$s*gP~}&OzE!92|kEeQke1KU{VJkbaYg^us(j zU%D{urghH0X8E~&q1)dD!1^J96i>|;n1%~``$59|qR-*~ zDPVj-z$0b~l!KTa1+^T(2I%?j@tXkjTq!44&Gd}x6} z3lNua!89LCei0}g{@?hp46yh(nF&k7Bw*^_S)f=~RPlKHPXGNr#z7kVZRLL*{^!Ru zz~*DLV7q_5pjnfEN#0`;C{_XEC{*|TK7Oa|@y=g%ezf>W{^JMZqk1!O1a33LHU;$F zv>$)f_ITsJOulFH91R`t$^8Q@weDr6&8QY2pTnreKyS~avDY#Ak;~&^cOd;98jkBm z%V9YV7y|D1{w{{+Qw!X7%NBoU@~(d0;UhDjdklY)bAL^f-W1UH_g*~p?s8bBw95}X zer@mMe4vh$C+gU|kAUiK)nmJW`G7c|52WVr5dUQHm_|Y!!^Z6ym>=1@F$JFUzt5*o z?JNEc^A`@U+akgu0prN*a#%tVhJXbZq4`gYmkb`$6zMSW?DDy+Ur$efR7Xpx`xE9* zG{1lLq1$e5XmK~d2+KJ*slzeKF8dscua5T*uQxOtgOV2%Zc^xA972q1CJ(VT?PZ7d zL{VWy%Sgsj9!L6W_ASsAEuVfaCO1=2y&Wt9HWk-_3ENq_JG~id(8TOTt^(k>gH#LU zt}y}#l1Jbplp8t7rOZjnfuzrKc3pg5R8oITO0Do{lJ}o`R<7HNa_j6`QKfG_0<~mO zHT$kDuf9k-uHaeSt#O_loH)8dZueqS5v$-FF1D35qwIkOGA8(1wO8D@SqQ9!WDjw- zAmB}Xgo|-u+7+=D#>3k*>Ax(yQg^FfBcY`1M&SDExtLJ>wOY-tH?*xIQ}cnemREmg zL~1^$-hwx|mBg$_es%!&33?VNG37*;>T$7Bz%c{74Fwa)1IY^NU}EI~Goa5C<6B>N zVu2B0K8_vsl#$>1T0XNjJqZVPrlSgEBUVyQSR}+nMqzw-u?+WNrz-Fzp^X#{nKU#s zG;q;*AKnb>T2gEKywsjnY+pAzH(`HGH-f=wZScT7yrSQ}PF~Ho8WK63fjHJPwzz>U z1XWlgWGAB!pe*4XtO+;+GFsp*P^b$Tv+zoE)5d;K86sg=&KZHaejo|FYljYst7Y4A zbW|iaXcjq~>{B`S5R)EG+^Q&)2QL#Y&A3>@iQ zh-pp|W(T_SszcHPZDH961L0y@w{aJus~3Jp!t#N(;Q9>%Eh%UJmkVYwKdwdvuw33t z=SRS7fSnm}0pit@2&=1N9#F&|#N5!Iiu=w2*Dtgu32+gnK&w!J-T)D<*PH;^8>3{5*fCkOrG6bZ;H(n%wi`Uapqg40d6GxYE&~!Fv7nBK)~PL_;#(ek_lEnlimm zt?e^kN96C*{c@ZUh+Ns|`-Sj5vkUl(6cH7WNVs2!LZz)ZqYv_8c!__whC?^N{X&!< zptkd>+Rjgo0e352$q#g|I~P~m55DMJymeI33kp`t31z?-43Jdme!)h~#kbb|f>}KC zp-U)R^nT%#IReb)&D9vaU%(q-((4ERLY8wJr)RLrVEc6@xNZ=+tXcc4%;7$u-rF=S ze<1I7!t1sli}ChRca{R%06X8!s3k`2hm!6U$w#*Ao1AkP5aH{OiN zaW4Jtl-G^`C-#%02pE4#ZPwTZ95u%y>v0XJw*bG!fb#b$Si^sJ1hB{Z<<9^C2`Ug&pRR)%5*0PZ;D{XpJb`*spSeqCKP>X3FI0rjJ4N5_3AV@UUPumRcc z2YQJCp~W}bzaBk>ve67U8gFkvLqkJD!{5X)|NEYTxV`%d*$g*08qI*C(F`~m&48oP t3^*FifTQvD2E6@tx}l+=q2Ygx{{XU{eMp-~yt)7Y002ovPDHLkV1ld03^M=#