Updates permits, adds Ace's pistol

- Fixed some permit stuff.
- Removed expired permits and associated items.
- Added Ace's pistol plus a spare mag.
- Locked items to brig access, covering warden, HoS, and Captain, but
not roles like HoP. I think.
This commit is contained in:
Spades
2018-11-09 20:06:01 -05:00
parent e38cd74655
commit 129a289052
4 changed files with 47 additions and 26 deletions

View File

@@ -2,4 +2,8 @@
name = ".45 pistol"
/obj/item/weapon/gun/projectile/p92x/sec
magazine_type = /obj/item/ammo_magazine/m9mm/rubber
magazine_type = /obj/item/ammo_magazine/m9mm/rubber
/obj/item/weapon/gun/projectile/p92x/large/preban
icon_state = "p92x-brown"
magazine_type = /obj/item/ammo_magazine/m9mm/large/preban // Spawns with big magazines that are legal.

View File

@@ -120,6 +120,11 @@
ammo_type = /obj/item/ammo_casing/a12g/stunshell
max_shells = 6
/* // jertheace : Jeremiah 'Ace' Acacius
/obj/item/ammo_magazine/m9mm/large/preban/hp // Not yet implemented. Waiting on a PR to Polaris. -Ace
ammo_type = /obj/item/ammo_casing/a9mm/hp
*/
// bwoincognito:Tasald Corlethian
/obj/item/weapon/gun/projectile/revolver/mateba/fluff/tasald_corlethian //Now that it is actually Single-Action and not hacky broken SA, I see no reason to nerf this down to .38. --Joan Risu
name = "\improper \"Big Iron\" revolver"

View File

@@ -18,21 +18,23 @@
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."
*/
/*
// bwoincognito:Tasald Corlethian
/obj/item/clothing/accessory/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/clothing/accessory/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."
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 March 1st, 2562."
*/
// jertheace:Jeremiah 'Ace' Acacius
/obj/item/clothing/accessory/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."
name = "Jeremiah Acacius'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 November 10th, 2563."
/* joanrisu:Joan Risu
/obj/item/clothing/accessory/permit/gun/fluff/joanrisu
@@ -52,15 +54,17 @@
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 April 24th, 2562."
*/
/*
// pawoverlord:Sorrel Cavalet
/obj/item/clothing/accessory/permit/gun/fluff/sorrel_cavalet
name = "Sorrel Cavalet'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 September 26th, 2562."
*/
/* hzdonut:Jesse Soemmer
/obj/item/clothing/accessory/permit/gun/fluff/JesseSoemmer
name = "Jesse Soemmer'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 March 4, 2563."
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 March 4, 2563." // Apparently revoked? -Ace
*/
/* Legacy Permits

View File

@@ -383,15 +383,29 @@ item_path: /obj/item/clothing/head/fedora/fluff/jemli
{
ckey: jertheace
character_name: Jeremiah Acacius
item_path: /obj/item/weapon/gun/projectile/shotgun/pump/USDF/fluff/ace
req_access = 58
item_path: /obj/item/clothing/accessory/permit/gun/fluff/ace
req_access = 2
}
{
ckey: jertheace
character_name: Jeremiah Acacius
item_path: /obj/item/clothing/accessory/permit/gun/fluff/ace
req_access = 58
item_path: /obj/item/weapon/gun/projectile/p92x/large/preban #Todo: Replace with HP version allowed in the application.
req_access = 2
}
{
ckey: jertheace
character_name: Jeremiah Acacius
item_path: /obj/item/ammo_magazine/m9mm/large/preban #Spare ammo. #Todo: Replace with HP version allowed in the application.
req_access = 2
}
{
ckey: jertheace
character_name: Jeremiah Acacius
item_path: /obj/item/clothing/accessory/holster/armpit
req_access = 2
}
{
@@ -406,12 +420,6 @@ character_name: Jeremiah Acacius
item_path: /obj/item/clothing/under/syndicate/combat
}
{
ckey: jertheace
character_name: Jeremiah Acacius
item_path: /obj/item/clothing/suit/armor/tactical/officer/fluff/ace
}
{
ckey: joanrisu
character_name: Joan Risu
@@ -646,18 +654,18 @@ item_path: /obj/item/weapon/melee/fluff/holochain
# ######## P CKEYS
{
ckey: pawoverlord
character_name: Sorrel Cavalet
item_path: /obj/item/clothing/accessory/permit/gun/fluff/sorrel_cavalet
}
#{
#ckey: pawoverlord
#character_name: Sorrel Cavalet
#item_path: /obj/item/clothing/accessory/permit/gun/fluff/sorrel_cavalet
#}
{
ckey: pawoverlord
character_name: Sorrel Cavalet
item_path: /obj/item/weapon/gun/projectile/colt
item_desc: "A cheap Martian knock-off of a Colt M1911. It has the word 'Cavalet' etched on the side. Uses .45 rounds."
}
#{
#ckey: pawoverlord
#character_name: Sorrel Cavalet
#item_path: /obj/item/weapon/gun/projectile/colt
#item_desc: "A cheap Martian knock-off of a Colt M1911. It has the word 'Cavalet' etched on the side. Uses .45 rounds."
#}
{
ckey: phoaly