Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into NIF-Test

This commit is contained in:
Jon
2018-12-10 00:40:42 +00:00
13 changed files with 185 additions and 0 deletions
@@ -21,6 +21,11 @@
name = "Tasald Ajax Corlethian's Sidearm Permit"
desc = "A card indicating that the owner is allowed to carry a sidearm. It is issued by CentCom, so it is valid until it expires on August 2nd, 2562."
//tomtyph: Sarika
/obj/item/clothing/accessory/permit/gun/fluff/tomtyph
name = "Sarika's Sidearm Permit"
desc = "A card indicating that the owner is allowed to carry a sidearm. It is issued by CentCom, so it is valid until it expires on December 7th, 2563."
// dhaeleena:Dhaeleena M'iar
/obj/item/clothing/accessory/permit/gun/fluff/dhaeleena_miar
name = "Dhaeleena M'iar's Sidearm Permit"