From 9170d42f70eaa1db38cec9a90647ef0883abc0f5 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Thu, 28 Nov 2019 08:52:59 -0500 Subject: [PATCH 1/4] Expired Permit Removal Title. --- code/modules/vore/fluffstuff/custom_permits_vr.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/vore/fluffstuff/custom_permits_vr.dm b/code/modules/vore/fluffstuff/custom_permits_vr.dm index 4eebf38f51..635b9831d4 100644 --- a/code/modules/vore/fluffstuff/custom_permits_vr.dm +++ b/code/modules/vore/fluffstuff/custom_permits_vr.dm @@ -6,10 +6,13 @@ to_chat(user, "You cannot reset the naming locks on [src]. It's issued by CentCom and totally tamper-proof!") return +//TFF 28/11/19 - Remove expired permit +/* // jertheace:Jeremiah 'Ace' Acacius /obj/item/clothing/accessory/permit/gun/fluff/ace 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." +*/ // ValiTheWolf: Vakashi /obj/item/clothing/accessory/permit/gun/fluff/Vakashi From 0c2c70ce482d627fdcc59734756a25542d2a9308 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Thu, 28 Nov 2019 09:02:30 -0500 Subject: [PATCH 2/4] Whoops. That feeling when you forget about this little refactor. Pfft. --- .../client/preference_setup/loadout/loadout_fluffitems_vr.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 759f79e7fa..dd8b66175f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -337,12 +337,15 @@ ckeywhitelist = list("jemli") character_name = list("Jemli") +//TFF 28/11/19 - Expired permit removal +/* /datum/gear/fluff/jeremiah_permit path = /obj/item/clothing/accessory/permit/gun/fluff/ace display_name = "Ace's Gun Permit" ckeywhitelist = list("jertheace") character_name = list("Jeremiah Acacius") allowed_roles = list("Colony Director", "Warden", "Head of Security") +*/ /datum/gear/fluff/jeremiah_gun path = /obj/item/weapon/gun/projectile/p92x/large/preban/hp From 5956dd62d878e4ce57103483c2b555ba9c3560bc Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Thu, 28 Nov 2019 11:06:56 -0500 Subject: [PATCH 3/4] Requested Changes Includes commenting out gun that had a permit for it. --- .../preference_setup/loadout/loadout_fluffitems_vr.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index dd8b66175f..3edce201b8 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -345,7 +345,6 @@ ckeywhitelist = list("jertheace") character_name = list("Jeremiah Acacius") allowed_roles = list("Colony Director", "Warden", "Head of Security") -*/ /datum/gear/fluff/jeremiah_gun path = /obj/item/weapon/gun/projectile/p92x/large/preban/hp @@ -353,6 +352,7 @@ ckeywhitelist = list("jertheace") character_name = list("Jeremiah Acacius") allowed_roles = list("Colony Director", "Warden", "Head of Security") +*/ /datum/gear/fluff/jeremiah_ammo path = /obj/item/ammo_magazine/m9mm/large/preban/hp //Spare ammo @@ -890,7 +890,7 @@ character_name = list("Chakat Tempest Venosare") allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") slot = slot_glasses - + /datum/gear/fluff/tempest_hypospray path = /obj/item/weapon/reagent_containers/hypospray/vial/tempest display_name = "Tempest's Hypospray" @@ -898,14 +898,14 @@ character_name = list("Chakat Tempest Venosare") allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") slot = slot_belt - + /datum/gear/fluff/tempest_backpack path = /obj/item/weapon/storage/backpack/saddlebag/tempest display_name = "Tempest's Saddlebag" ckeywhitelist = list("wickedtemp") character_name = list("Chakat Tempest Venosare") slot = slot_back - + /datum/gear/fluff/tempest_implant path = /obj/item/weapon/implanter/reagent_generator/tempest display_name = "Tempest's Implant" From defff15e24552dcb07307a99098fab4185fe3431 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Fri, 29 Nov 2019 20:56:27 -0500 Subject: [PATCH 4/4] Update loadout_fluffitems_vr.dm --- .../client/preference_setup/loadout/loadout_fluffitems_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 3edce201b8..c2faea0171 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -352,7 +352,6 @@ ckeywhitelist = list("jertheace") character_name = list("Jeremiah Acacius") allowed_roles = list("Colony Director", "Warden", "Head of Security") -*/ /datum/gear/fluff/jeremiah_ammo path = /obj/item/ammo_magazine/m9mm/large/preban/hp //Spare ammo @@ -360,6 +359,7 @@ ckeywhitelist = list("jertheace") character_name = list("Jeremiah Acacius") allowed_roles = list("Colony Director", "Warden", "Head of Security") +*/ /datum/gear/fluff/jeremiah_holster path = /obj/item/clothing/accessory/holster/armpit