From 1a14b8ada7506c14a770c853520f5eb38e99d7a8 Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 2 Oct 2017 03:03:35 -0400 Subject: [PATCH 1/2] Ace's gun permit - Readded Ace's gun permit. - Rearranged the permits to be in alphabetical order while I was at it. --- .../vore/fluffstuff/custom_permits_vr.dm | 29 +++++++++++-------- config/custom_items.txt | 3 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/code/modules/vore/fluffstuff/custom_permits_vr.dm b/code/modules/vore/fluffstuff/custom_permits_vr.dm index 1a6e3ef7a68..52d76f9d497 100644 --- a/code/modules/vore/fluffstuff/custom_permits_vr.dm +++ b/code/modules/vore/fluffstuff/custom_permits_vr.dm @@ -6,30 +6,35 @@ to_chat(user, "You cannot reset the naming locks on [src]. It's issued by CentCom and totally tamper-proof!") return -// bwoincognito:Tasald Corlethian -/obj/item/weapon/permit/gun/fluff/tasald_corlethian - 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." +// aerowing:Sebastian Aji +/obj/item/weapon/permit/gun/fluff/sebastian_aji + name = "Sebastian Aji'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 April 17th, 2562." // arokha:Aronai Kadigan /obj/item/weapon/permit/gun/fluff/aronai_kadigan name = "Aronai Kadigan'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 February 16th, 2562." -// joanrisu:Joan Risu -/obj/item/weapon/permit/gun/fluff/joanrisu - name = "Joan Risu'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 April 4th, 2562." +// bwoincognito:Tasald Corlethian +/obj/item/weapon/permit/gun/fluff/tasald_corlethian + 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." // dhaeleena:Dhaeleena M'iar /obj/item/weapon/permit/gun/fluff/dhaeleena_miar name = "Dhaeleena M'iar's Sidearm Permit" desc = "A card indicating that the owner is allowed to carry a sidearm that uses less-than-lethal munitions. It is issued by CentCom, so it is valid until it expires on March 1st, 2562." -// aerowing:Sebastian Aji -/obj/item/weapon/permit/gun/fluff/sebastian_aji - name = "Sebastian Aji'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 April 17th, 2562." +// jertheace:Jeremiah 'Ace' Acacius +/obj/item/weapon/permit/gun/fluff/ace + name = "Ace's Shotgun Permit" + desc = "A card indicating that the owner is allowed to carry a firearm. It is issued by CentCom, so it is valid until it expires on October 1st, 2562." + +// joanrisu:Joan Risu +/obj/item/weapon/permit/gun/fluff/joanrisu + name = "Joan Risu'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 April 4th, 2562." // luminescent_ring:Briana Moore /obj/item/weapon/permit/gun/fluff/briana_moore diff --git a/config/custom_items.txt b/config/custom_items.txt index 3ab52b7fcf3..2cf211dce5d 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -307,7 +307,8 @@ item_path: /obj/item/clothing/head/fedora/fluff/jemli { ckey: jertheace character_name: Jeremiah 'Ace' Acacius -item_path: /obj/item/weapon/storage/box/fluff/ace +item_path: /obj/item/weapon/gun/projectile/shotgun/pump/USDF/fluff/ace +req_access = 58 } { From eb7686de3b6f0634a94a75fcee5311c032aeb546 Mon Sep 17 00:00:00 2001 From: Spades Date: Mon, 2 Oct 2017 03:06:31 -0400 Subject: [PATCH 2/2] Hey you know what else is important? The actual permit. --- config/custom_items.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/custom_items.txt b/config/custom_items.txt index 2cf211dce5d..cd17c553777 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -311,6 +311,13 @@ item_path: /obj/item/weapon/gun/projectile/shotgun/pump/USDF/fluff/ace req_access = 58 } +{ +ckey: jertheace +character_name: Jeremiah 'Ace' Acacius +item_path: /obj/item/weapon/permit/gun/fluff/ace +req_access = 58 +} + { ckey: jertheace character_name: Jeremiah 'Ace' Acacius