From 0a5aeb2233f7b16a1766f0484f3be46256fc0e3e Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Wed, 19 Dec 2012 12:37:58 -0800 Subject: [PATCH 1/2] Cane Sprite Fix fixes issue #2017 --- code/defines/obj/weapon.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 5e3a7af556f..b66d93fd6bf 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -789,7 +789,7 @@ desc = "A cane used by a true gentlemen." icon = 'icons/obj/weapons.dmi' icon_state = "cane" - item_state = "cane" + item_state = "stick" flags = FPRINT | TABLEPASS| CONDUCT force = 5.0 throwforce = 7.0 From 980a24079f237a13583ec55ea1a245613169ba09 Mon Sep 17 00:00:00 2001 From: GauHelldragon Date: Wed, 19 Dec 2012 13:00:30 -0800 Subject: [PATCH 2/2] Power draining Anomoly negative charge fix fixes issue #2064 --- .../xenoarchaeology/artifact_effect.dm | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/code/modules/research/xenoarchaeology/artifact_effect.dm b/code/modules/research/xenoarchaeology/artifact_effect.dm index 9bee8176db3..3e40a6a9f3a 100644 --- a/code/modules/research/xenoarchaeology/artifact_effect.dm +++ b/code/modules/research/xenoarchaeology/artifact_effect.dm @@ -215,11 +215,12 @@ if("celldrain") for (var/obj/machinery/power/apc/C in range(src.aurarange,originator)) for (var/obj/item/weapon/cell/B in C.contents) - B.charge -= 10 - for (var/obj/machinery/power/smes/S in range (src.aurarange,originator)) S.charge -= 20 + B.charge = max(B.charge-10,0) + for (var/obj/machinery/power/smes/S in range (src.aurarange,originator)) + S.charge = max(S.charge-20,0) for (var/mob/living/silicon/robot/M in range(src.aurarange,originator)) for (var/obj/item/weapon/cell/D in M.contents) - D.charge -= 10 + D.charge = max(D.charge-10,0) if(prob(10)) M << "\red SYSTEM ALERT: Energy draining field detected!" return 1 if("planthelper") @@ -305,11 +306,12 @@ if("celldrain") for (var/obj/machinery/power/apc/C in range(src.aurarange,originator)) for (var/obj/item/weapon/cell/B in C.contents) - B.charge -= 500 - for (var/obj/machinery/power/smes/S in range (src.aurarange,originator)) S.charge -= 400 + B.charge = max(B.charge-500,0) + for (var/obj/machinery/power/smes/S in range (src.aurarange,originator)) + S.charge = max(S.charge-400,0) for (var/mob/living/silicon/robot/M in range(src.aurarange,originator)) for (var/obj/item/weapon/cell/D in M.contents) - D.charge -= 500 + D.charge = max(D.charge-500,0) M << "\red SYSTEM ALERT: Severe energy drain detected!" return 1 if("planthelper") @@ -407,11 +409,12 @@ if("celldrain") for (var/obj/machinery/power/apc/C in world) for (var/obj/item/weapon/cell/B in C.contents) - B.charge -= 250 - for (var/obj/machinery/power/smes/S in range (src.aurarange,src)) S.charge -= 250 + B.charge = max(B.charge-250,0) + for (var/obj/machinery/power/smes/S in range (src.aurarange,src)) + S.charge = max(S.charge-250,0) for (var/mob/living/silicon/robot/M in world) for (var/obj/item/weapon/cell/D in M.contents) - D.charge -= 250 + D.charge = max(D.charge-250,0) M << "\red SYSTEM ALERT: Energy drain detected!" return 1 if("teleport")