From 7ccad08ee2e2468a8441f59ae5e8978e8f32bf3f Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Tue, 8 Mar 2016 06:26:37 -0500 Subject: [PATCH] removes a palsma thing --- code/game/machinery/recharger.dm | 1 + code/modules/surgery/organs/subtypes/xenos.dm | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 0b54aa0c4bc..d02bc2ca794 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -19,6 +19,7 @@ if(G.flags & NODROP) user << "you can drop it to charge it!" + return if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G,/obj/item/device/laptop) || istype(G, /obj/item/weapon/rcs)) if(charging) return diff --git a/code/modules/surgery/organs/subtypes/xenos.dm b/code/modules/surgery/organs/subtypes/xenos.dm index d3e72386827..133634bf489 100644 --- a/code/modules/surgery/organs/subtypes/xenos.dm +++ b/code/modules/surgery/organs/subtypes/xenos.dm @@ -98,8 +98,6 @@ owner.adjustFireLoss(-heal_amt) owner.adjustOxyLoss(-heal_amt) owner.adjustCloneLoss(-heal_amt) - else//still should regen some plasma - owner.adjustPlasma(plasma_rate-5)//but at a lower rate /obj/item/organ/internal/xenos/plasmavessel/insert(mob/living/carbon/M, special = 0) ..()