From 2da40e8ad0416236e1078d07adcf46faa7f3b854 Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Mon, 7 Mar 2016 20:24:45 -0500 Subject: [PATCH 1/3] Xeno issue fix. --- .../objects/structures/stool_bed_chair_nest/alien_nests.dm | 4 ++-- code/modules/surgery/organs/subtypes/xenos.dm | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index feafebd26f8..2c81fd09af3 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -50,9 +50,9 @@ if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai) ) return - if(M.get_int_organ(/obj/item/organ/internal/alien/plasmavessel)) + if(M.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel)) return - if(!user.get_int_organ(/obj/item/organ/internal/alien/plasmavessel)) + if(!user.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel)) return unbuckle_mob() diff --git a/code/modules/surgery/organs/subtypes/xenos.dm b/code/modules/surgery/organs/subtypes/xenos.dm index b94d58d91bf..d3e72386827 100644 --- a/code/modules/surgery/organs/subtypes/xenos.dm +++ b/code/modules/surgery/organs/subtypes/xenos.dm @@ -98,6 +98,8 @@ 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) ..() @@ -114,6 +116,7 @@ /obj/item/organ/internal/xenos/acidgland name = "xeno acid gland" + icon_state = "acid" parent_organ = "head" slot = "acid" origin_tech = "biotech=5;materials=2;combat=2" @@ -122,6 +125,7 @@ /obj/item/organ/internal/xenos/hivenode name = "xeno hive node" + icon_state = "hivenode" parent_organ = "head" slot = "hivenode" origin_tech = "biotech=5;magnets=4;bluespace=3" From c407b3ee9e2eb5651343532bde28cc646dca9f1e Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Tue, 8 Mar 2016 01:34:09 -0500 Subject: [PATCH 2/3] fixes recharger and no drop --- code/game/machinery/recharger.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index d625c4211d7..0b54aa0c4bc 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -16,6 +16,9 @@ /obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob, params) if(istype(user,/mob/living/silicon)) return + + if(G.flags & NODROP) + user << "you can drop it to charge it!" 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 From 7ccad08ee2e2468a8441f59ae5e8978e8f32bf3f Mon Sep 17 00:00:00 2001 From: Aurorablade Date: Tue, 8 Mar 2016 06:26:37 -0500 Subject: [PATCH 3/3] 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) ..()