From 19f06b51147fcbcba6086095f8378a7b2e13d184 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Thu, 20 Apr 2017 22:03:30 -0500 Subject: [PATCH] Fixes armlasers breaking on retract (#498) --- code/modules/projectiles/guns/mounted.dm | 2 -- code/modules/surgery/organs/augments_arms.dm | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm index 9d4a8753b9..6f6100bc55 100644 --- a/code/modules/projectiles/guns/mounted.dm +++ b/code/modules/projectiles/guns/mounted.dm @@ -11,7 +11,6 @@ /obj/item/weapon/gun/energy/e_gun/advtaser/mounted/dropped()//if somebody manages to drop this somehow... ..() - src.loc = null//send it to nullspace to get retrieved by the implant later on. gotta cover those edge cases. /obj/item/weapon/gun/energy/laser/mounted name = "mounted laser" @@ -25,4 +24,3 @@ /obj/item/weapon/gun/energy/laser/mounted/dropped() ..() - src.loc = null \ No newline at end of file diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 153de8d823..1a0932f6e0 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -155,7 +155,7 @@ desc = "A variant of the arm cannon implant that fires lethal laser beams. The cannon emerges from the subject's arm and remains inside when not in use." icon_state = "arm_laser" origin_tech = "materials=4;combat=4;biotech=4;powerstorage=4;syndicate=3" - holder = /obj/item/weapon/gun/energy/laser/mounted + contents = newlist(/obj/item/weapon/gun/energy/laser/mounted) /obj/item/organ/cyberimp/arm/gun/laser/l zone = "l_arm" @@ -166,7 +166,7 @@ desc = "A variant of the arm cannon implant that fires electrodes and disabler shots. The cannon emerges from the subject's arm and remains inside when not in use." icon_state = "arm_taser" origin_tech = "materials=5;combat=5;biotech=4;powerstorage=4" - holder = /obj/item/weapon/gun/energy/e_gun/advtaser/mounted + contents = newlist(/obj/item/weapon/gun/energy/e_gun/advtaser/mounted) /obj/item/organ/cyberimp/arm/gun/taser/l zone = "l_arm"