mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Merge pull request #5141 from Novacat/nova-survival
Purges expired permits
This commit is contained in:
@@ -57,13 +57,11 @@
|
|||||||
// bwoincognito:Tasald Corlethian
|
// bwoincognito:Tasald Corlethian
|
||||||
/obj/item/weapon/storage/box/fluff/tasald
|
/obj/item/weapon/storage/box/fluff/tasald
|
||||||
name = "Tasald's Kit"
|
name = "Tasald's Kit"
|
||||||
desc = "A kit containing Talsald's equipment."
|
desc = "A kit containing Tasald's equipment."
|
||||||
has_items = list(
|
has_items = list(
|
||||||
/obj/item/clothing/suit/storage/det_suit/fluff/tasald,
|
/obj/item/clothing/suit/storage/det_suit/fluff/tasald,
|
||||||
/obj/item/clothing/suit/storage/det_suit/fluff/tas_coat,
|
/obj/item/clothing/suit/storage/det_suit/fluff/tas_coat,
|
||||||
/obj/item/clothing/under/det/fluff/tasald,
|
/obj/item/clothing/under/det/fluff/tasald,
|
||||||
// /obj/item/clothing/accessory/permit/gun/fluff/tasald_corlethian,
|
|
||||||
// /obj/item/weapon/gun/projectile/revolver/mateba/fluff/tasald_corlethian,
|
|
||||||
/obj/item/weapon/implanter/loyalty)
|
/obj/item/weapon/implanter/loyalty)
|
||||||
|
|
||||||
//bwoincognito:Octavious Ward
|
//bwoincognito:Octavious Ward
|
||||||
@@ -150,10 +148,7 @@
|
|||||||
new /obj/item/clothing/suit/storage/fluff/modernfedcoat(src)
|
new /obj/item/clothing/suit/storage/fluff/modernfedcoat(src)
|
||||||
new /obj/item/clothing/head/caphat/formal/fedcover(src)
|
new /obj/item/clothing/head/caphat/formal/fedcover(src)
|
||||||
new /obj/item/weapon/card/id/centcom/station/fluff/joanbadge(src)
|
new /obj/item/weapon/card/id/centcom/station/fluff/joanbadge(src)
|
||||||
// new /obj/item/weapon/gun/energy/gun/fluff/dominator(src)
|
|
||||||
new /obj/item/clothing/suit/armor/det_suit(src)
|
new /obj/item/clothing/suit/armor/det_suit(src)
|
||||||
// new /obj/item/clothing/accessory/permit/gun/fluff/joanrisu(src)
|
|
||||||
// new /obj/item/weapon/sword/fluff/joanaria(src)
|
|
||||||
new /obj/item/weapon/flame/lighter/zippo/fluff/joan(src)
|
new /obj/item/weapon/flame/lighter/zippo/fluff/joan(src)
|
||||||
new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src)
|
new /obj/item/clothing/under/rank/internalaffairs/fluff/joan(src)
|
||||||
new /obj/item/clothing/head/helmet/space/fluff/joan(src)
|
new /obj/item/clothing/head/helmet/space/fluff/joan(src)
|
||||||
@@ -169,7 +164,6 @@
|
|||||||
..()
|
..()
|
||||||
new /obj/item/clothing/accessory/holster/hip(src)
|
new /obj/item/clothing/accessory/holster/hip(src)
|
||||||
new /obj/item/clothing/suit/storage/fluff/fedcoat(src)
|
new /obj/item/clothing/suit/storage/fluff/fedcoat(src)
|
||||||
// new /obj/item/weapon/gun/energy/gun/fluff/dominator(src)
|
|
||||||
new /obj/item/clothing/suit/armor/det_suit(src)
|
new /obj/item/clothing/suit/armor/det_suit(src)
|
||||||
new /obj/item/clothing/accessory/storage/black_vest(src)
|
new /obj/item/clothing/accessory/storage/black_vest(src)
|
||||||
new /obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina(src)
|
new /obj/item/weapon/material/knife/tacknife/combatknife/fluff/katarina(src)
|
||||||
@@ -193,32 +187,6 @@
|
|||||||
can_hold = list(/obj/item/clothing/under/swimsuit/)
|
can_hold = list(/obj/item/clothing/under/swimsuit/)
|
||||||
has_items = list(/obj/item/clothing/under/swimsuit/fluff/penelope)
|
has_items = list(/obj/item/clothing/under/swimsuit/fluff/penelope)
|
||||||
|
|
||||||
// Aerowing:Sebastian Aji
|
|
||||||
/obj/item/weapon/storage/box/fluff/sebastian_aji
|
|
||||||
name = "Sebastian's Lumoco Arms P3 Box"
|
|
||||||
has_items = list(
|
|
||||||
/obj/item/weapon/gun/projectile/pistol,
|
|
||||||
/obj/item/ammo_magazine/m9mm/compact/flash,
|
|
||||||
/obj/item/ammo_magazine/m9mm/compact/flash,
|
|
||||||
/obj/item/clothing/accessory/permit/gun/fluff/sebastian_aji)
|
|
||||||
|
|
||||||
/*
|
|
||||||
/obj/item/weapon/storage/box/fluff/briana_moore
|
|
||||||
name = "Briana's Derringer Box"
|
|
||||||
has_items = list(
|
|
||||||
/obj/item/weapon/gun/projectile/derringer/fluff/briana,
|
|
||||||
/obj/item/clothing/accessory/permit/gun/fluff/briana_moore)
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
//SilencedMP5A5:Serdykov Antoz
|
|
||||||
/obj/item/weapon/storage/box/fluff/serdykov_antoz
|
|
||||||
name = "Serdy's Weapon Box"
|
|
||||||
has_items = list(
|
|
||||||
/obj/item/clothing/accessory/permit/gun/fluff/silencedmp5a5,
|
|
||||||
/obj/item/weapon/gun/projectile/colt/fluff/serdy)
|
|
||||||
*/
|
|
||||||
|
|
||||||
// JackNoir413: Mor Xaina
|
// JackNoir413: Mor Xaina
|
||||||
/obj/item/weapon/storage/box/fluff/morxaina
|
/obj/item/weapon/storage/box/fluff/morxaina
|
||||||
name = "Fashionable clothes set"
|
name = "Fashionable clothes set"
|
||||||
|
|||||||
@@ -6,72 +6,16 @@
|
|||||||
to_chat(user, "You cannot reset the naming locks on [src]. It's issued by CentCom and totally tamper-proof!")
|
to_chat(user, "You cannot reset the naming locks on [src]. It's issued by CentCom and totally tamper-proof!")
|
||||||
return
|
return
|
||||||
|
|
||||||
// aerowing:Sebastian Aji
|
|
||||||
/obj/item/clothing/accessory/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, 2563."
|
|
||||||
|
|
||||||
|
|
||||||
/* arokha:Aronai Kadigan
|
|
||||||
/obj/item/clothing/accessory/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."
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
// 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. It is issued by CentCom, so it is valid until it expires on March 1st, 2562."
|
|
||||||
*/
|
|
||||||
|
|
||||||
// jertheace:Jeremiah 'Ace' Acacius
|
// jertheace:Jeremiah 'Ace' Acacius
|
||||||
/obj/item/clothing/accessory/permit/gun/fluff/ace
|
/obj/item/clothing/accessory/permit/gun/fluff/ace
|
||||||
name = "Jeremiah Acacius's Sidearm Permit"
|
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."
|
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
|
|
||||||
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/clothing/accessory/permit/gun/fluff/briana_moore
|
|
||||||
name = "Briana Moore'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 24th, 2562."
|
|
||||||
*/
|
|
||||||
|
|
||||||
// ValiTheWolf: Vakashi
|
// ValiTheWolf: Vakashi
|
||||||
/obj/item/clothing/accessory/permit/gun/fluff/Vakashi
|
/obj/item/clothing/accessory/permit/gun/fluff/Vakashi
|
||||||
name = "Vakashi's Sidearm Permit"
|
name = "Vakashi'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, 2564."
|
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, 2564."
|
||||||
|
|
||||||
/* silenedmp5a5:Serdykov Antoz
|
|
||||||
/obj/item/clothing/accessory/permit/gun/fluff/silencedmp5a5
|
|
||||||
name = "Serdykov Antoz'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 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." // Apparently revoked? -Ace
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Legacy Permits
|
/* Legacy Permits
|
||||||
// BEGIN - PROTOTYPE
|
// BEGIN - PROTOTYPE
|
||||||
/obj/item/clothing/accessory/permit/gun/fluff
|
/obj/item/clothing/accessory/permit/gun/fluff
|
||||||
|
|||||||
Reference in New Issue
Block a user