Space Ninja Spawn and Stealth Glove Fix

This commit is contained in:
SamCroswell
2013-12-23 19:39:50 -05:00
parent 436d0e1f6b
commit 11949f1b0f
13 changed files with 11761 additions and 11686 deletions
-2
View File
@@ -95,8 +95,6 @@
drain("MECHA",A,suit)
return 1
/*
Commented out for further tweaks, at the moment it instantly drains everything the cell
has with no regard for how large the cell in your suit is. This is silly.
if(istype(A,/obj/item/weapon/cell))
A.add_fingerprint(H)
drain("CELL",A,suit)
+20 -5
View File
@@ -2336,17 +2336,32 @@ ________________________________________________________________________________
if("CELL")
var/obj/item/weapon/cell/A = target
var/drainrate
if(A.charge)
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, A.loc)
if (G.candrain&&do_after(U,30))
U << "\blue Gained <B>[A.charge]</B> energy from the cell."
if(S.cell.charge+A.charge>S.cell.maxcharge)
S.cell.charge=S.cell.maxcharge
drain = rand(G.mindrain,G.maxdrain)
if(S.cell.charge+A.charge<S.cell.maxcharge)
while(S.cell.charge!=S.cell.maxcharge)
while(S.cell.maxcharge-S.cell.charge > drain)
S.cell.charge+=drain
totaldrain+=drain
A.charge-=drain
spark_system.start()
playsound(A.loc, "sparks", 50, 1)
S.cell.charge = S.cell.maxcharge
else
S.cell.charge+=A.charge
A.charge = 0
while(A.charge)
S.cell.charge+=drain
totaldrain+=drain
A.charge-=drain
spark_system.start()
playsound(A.loc, "sparks", 50, 1)
G.draining = 0
A.corrupt()
A.updateicon()
U << "\blue Gained <B>[totaldrain]</B> energy from the cell."
else
U << "\red Procedure interrupted. Protocol terminated."
else