Merge branch 'pinned' of https://github.com/Cheridan/-tg-station into pinned

This commit is contained in:
Cheridan
2015-01-15 16:17:51 -06:00
+2 -2
View File
@@ -1,5 +1,5 @@
/obj/item/device/firing_pin
name = "firing pin"
name = "electronic firing pin"
desc = "A small authentication device, to be inserted into a firearm reciever to allow operation. NT safety regulations require all new designs to incorporate one."
icon = 'icons/obj/device.dmi'
icon_state = "firing_pin"
@@ -83,4 +83,4 @@
/obj/item/device/firing_pin/tag/blue
name = "blue laser tag firing pin"
icon_state = "firing_pin_blue"
suit_requirement = /obj/item/clothing/suit/bluetag
suit_requirement = /obj/item/clothing/suit/bluetag