Merge pull request #6132 from Michiyamenotehifunana/gimme-da-blasta

Adds Particle Blasters to armories
2018-04-01 19:49:27 -05:00
parent 57ed2fcb70 8e620324a8
commit 77a4b58c60
5 changed files with 8 additions and 0 deletions
@@ -52947,6 +52947,8 @@
 /obj/item/gun/energy/e_gun/dragnet,
 /obj/item/gun/energy/e_gun/dragnet,
 /obj/effect/turf_decal/bot_white,
+/obj/item/gun/energy/pumpaction/blaster,
+/obj/item/gun/energy/pumpaction/blaster,
 /turf/open/floor/plasteel/dark,
 /area/security/armory)
 "ipA" = (
@@ -47348,6 +47348,7 @@
 /obj/item/gun/energy/ionrifle,
 /obj/item/clothing/suit/armor/laserproof,
 /obj/item/gun/energy/temperature/security,
+/obj/item/gun/energy/pumpaction/blaster,
 /turf/open/floor/plasteel/vault{
 	dir = 8
 	},
@@ -3218,6 +3218,8 @@
 /obj/item/storage/fancy/donut_box,
 /obj/item/gun/energy/e_gun/dragnet,
 /obj/item/gun/energy/e_gun/dragnet,
+/obj/item/gun/energy/pumpaction/blaster,
+/obj/item/gun/energy/pumpaction/blaster,
 /turf/open/floor/plasteel/vault{
 	dir = 1
 	},
@@ -6902,6 +6902,8 @@
 	},
 /obj/item/gun/energy/e_gun/dragnet,
 /obj/item/gun/energy/e_gun/dragnet,
+/obj/item/gun/energy/pumpaction/blaster,
+/obj/item/gun/energy/pumpaction/blaster,
 /turf/open/floor/plasteel/red/corner{
 	dir = 8
 	},
@@ -2937,6 +2937,7 @@
 	dir = 4;
 	pixel_x = -23
 	},
+/obj/item/gun/energy/pumpaction/blaster,
 /turf/open/floor/plasteel/dark,
 /area/security/armory)
 "ajh" = (