Merge pull request #2903 from Aurorablade/OrganRefactor

[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
This commit is contained in:
Fox McCloud
2016-03-04 19:51:50 -05:00
138 changed files with 4384 additions and 2426 deletions
+31
View File
@@ -0,0 +1,31 @@
/obj/item/weapon/gun/energy/advtaser/mounted
name = "mounted taser"
desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots."
icon_state = "armcannonstun"
item_state = "armcannonstun"
modifystate = "armcannonstun"
force = 5
self_recharge = 1
flags = NODROP
slot_flags = null
w_class = 5.0
can_flashlight = 0
/obj/item/weapon/gun/energy/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"
desc = "An arm mounted cannon that fires lethal lasers. Doesn't come with a charge beam."
icon_state = "armcannonlase"
item_state = "armcannonlase"
modifystate = "armcannonlase"
force = 5
self_recharge = 1
flags = NODROP
slot_flags = null
w_class = 5.0
materials = null
/obj/item/weapon/gun/energy/laser/mounted/dropped()
src.loc = null