Merge pull request #3583 from Fox-McCloud/permit-refactor

Refactors Bot Weapon Identification
This commit is contained in:
TheDZD
2016-02-13 18:23:12 -05:00
8 changed files with 16 additions and 26 deletions
+1
View File
@@ -19,6 +19,7 @@
throw_range = 5
force = 5.0
origin_tech = "combat=1"
needs_permit = 1
attack_verb = list("struck", "hit", "bashed")
var/fire_sound = 'sound/weapons/Gunshot.ogg'
@@ -15,6 +15,7 @@
desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
projectile_type = "/obj/item/projectile/practice"
clumsy_check = 0
needs_permit = 0
obj/item/weapon/gun/energy/laser/retro
name ="retro laser gun"
@@ -107,6 +108,7 @@ obj/item/weapon/gun/energy/laser/retro
projectile_type = "/obj/item/projectile/lasertag/blue"
origin_tech = "combat=1;magnets=2"
clumsy_check = 0
needs_permit = 0
self_recharge = 1
@@ -124,6 +126,7 @@ obj/item/weapon/gun/energy/laser/retro
projectile_type = "/obj/item/projectile/lasertag/red"
origin_tech = "combat=1;magnets=2"
clumsy_check = 0
needs_permit = 0
self_recharge = 1
@@ -41,6 +41,7 @@
origin_tech = "materials=2;biotech=3;powerstorage=3"
modifystate = "floramut"
var/mode = 0 //0 = mutate, 1 = yield boost
needs_permit = 0
self_recharge = 1
@@ -202,6 +203,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
fire_sound = 'sound/weapons/Kenetic_accel.ogg'
charge_cost = 5000
cell_type = "/obj/item/weapon/stock_parts/cell/emproof"
needs_permit = 0 // Aparently these are safe to carry? I'm sure Golliaths would disagree.
fire_delay = 16 //Because guncode is bad and you can bug the reload for rapid fire otherwise.
var/recently_fired = 0