Merge pull request #431 from Fox-McCloud/Lasers-Tasers

Laser Additions and Taser Nerf
This commit is contained in:
ZomgPonies
2015-02-26 22:49:46 -05:00
13 changed files with 65 additions and 11 deletions
+5
View File
@@ -33,6 +33,11 @@
typepath = /obj/item/weapon/gun/energy/laser/captain
protected_jobs = list("Captain")
/datum/theft_objective/hoslaser
name = "the head of security's recreated antique laser gun"
typepath = /obj/item/weapon/gun/energy/hos
protected_jobs = list("Head Of Security")
/datum/theft_objective/hand_tele
name = "a hand teleporter"
typepath = /obj/item/weapon/hand_tele
@@ -115,9 +115,9 @@
new /obj/item/clothing/mask/gas/sechailer/hos(src)
new /obj/item/weapon/shield/riot(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/energy/advtaser(src)
new /obj/item/weapon/storage/belt/security(src)
new /obj/item/taperoll/police(src)
new /obj/item/weapon/gun/energy/hos(src)
return