cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6246 from TheFurryFeline/patch-9

Browse Source 
Expired Permit Removal
This commit is contained in:
Novacat
2019-11-29 22:23:40 -05:00
committed by GitHub
parent 2ac780043f defff15e24
commit cbb5a4bdd4
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
View File

@@ -337,6 +337,8 @@
ckeywhitelist = list("jemli") ckeywhitelist = list("jemli")
character_name = list("Jemli") character_name = list("Jemli")
//TFF 28/11/19 - Expired permit removal
/*
/datum/gear/fluff/jeremiah_permit /datum/gear/fluff/jeremiah_permit
path = /obj/item/clothing/accessory/permit/gun/fluff/ace path = /obj/item/clothing/accessory/permit/gun/fluff/ace
display_name = "Ace's Gun Permit" display_name = "Ace's Gun Permit"
@@ -357,6 +359,7 @@
ckeywhitelist = list("jertheace") ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius") character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Warden", "Head of Security") allowed_roles = list("Colony Director", "Warden", "Head of Security")
*/
/datum/gear/fluff/jeremiah_holster /datum/gear/fluff/jeremiah_holster
path = /obj/item/clothing/accessory/holster/armpit path = /obj/item/clothing/accessory/holster/armpit
@@ -887,7 +890,7 @@
character_name = list("Chakat Tempest Venosare") character_name = list("Chakat Tempest Venosare")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
slot = slot_glasses slot = slot_glasses
/datum/gear/fluff/tempest_hypospray /datum/gear/fluff/tempest_hypospray
path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest
display_name = "Tempest's Hypospray" display_name = "Tempest's Hypospray"
@@ -895,14 +898,14 @@
character_name = list("Chakat Tempest Venosare") character_name = list("Chakat Tempest Venosare")
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic")
slot = slot_belt slot = slot_belt
/datum/gear/fluff/tempest_backpack /datum/gear/fluff/tempest_backpack
path = /obj/item/weapon/storage/backpack/saddlebag/tempest path = /obj/item/weapon/storage/backpack/saddlebag/tempest
display_name = "Tempest's Saddlebag" display_name = "Tempest's Saddlebag"
ckeywhitelist = list("wickedtemp") ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venosare") character_name = list("Chakat Tempest Venosare")
slot = slot_back slot = slot_back
/datum/gear/fluff/tempest_implant /datum/gear/fluff/tempest_implant
path = /obj/item/weapon/implanter/reagent_generator/tempest path = /obj/item/weapon/implanter/reagent_generator/tempest
display_name = "Tempest's Implant" display_name = "Tempest's Implant"

3
code/modules/vore/fluffstuff/custom_permits_vr.dm
View File

@@ -6,10 +6,13 @@
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
//TFF 28/11/19 - Remove expired permit
/*
// 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."
*/
// ValiTheWolf: Vakashi // ValiTheWolf: Vakashi
/obj/item/clothing/accessory/permit/gun/fluff/Vakashi /obj/item/clothing/accessory/permit/gun/fluff/Vakashi