Fixes armlasers breaking on retract (#498)

This commit is contained in:
CitadelStationBot
2017-04-20 22:03:30 -05:00
committed by Poojawa
parent b003b81f10
commit 19f06b5114
2 changed files with 2 additions and 4 deletions
-2
View File
@@ -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
+2 -2
View File
@@ -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"