Restricts items, removes a medal, enables character check

This commit is contained in:
Mewchild
2019-09-10 16:21:12 -05:00
parent 6eec538f28
commit a40a656478
2 changed files with 7 additions and 15 deletions

View File

@@ -80,7 +80,6 @@
path = /obj/item/weapon/storage/box/fluff/kilano path = /obj/item/weapon/storage/box/fluff/kilano
ckeywhitelist = list("beyondmylife") ckeywhitelist = list("beyondmylife")
character_name = list("Ne'tra Ky'ram") character_name = list("Ne'tra Ky'ram")
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
/datum/gear/fluff/xin_sovietuniform /datum/gear/fluff/xin_sovietuniform
path = /obj/item/clothing/under/soviet path = /obj/item/clothing/under/soviet
@@ -145,13 +144,6 @@
ckeywhitelist = list("dhaeleena") ckeywhitelist = list("dhaeleena")
character_name = list("Dhaeleena M'iar") character_name = list("Dhaeleena M'iar")
/* Item not defined.
/datum/gear/fluff/elliot_medal
path = /obj/item/clothing/accessory/medal/medical
ckeywhitelist = list("dickfreedomjohnson")
character_name = list("Elliot Richards")
*/
/datum/gear/fluff/elliot_belt /datum/gear/fluff/elliot_belt
path = /obj/item/weapon/storage/belt/champion path = /obj/item/weapon/storage/belt/champion
ckeywhitelist = list("dickfreedomjohnson") ckeywhitelist = list("dickfreedomjohnson")
@@ -276,25 +268,25 @@
path = /obj/item/clothing/accessory/permit/gun/fluff/ace path = /obj/item/clothing/accessory/permit/gun/fluff/ace
ckeywhitelist = list("jertheace") ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius") character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/jeremiah_gun /datum/gear/fluff/jeremiah_gun
path = /obj/item/weapon/gun/projectile/p92x/large/preban/hp path = /obj/item/weapon/gun/projectile/p92x/large/preban/hp
ckeywhitelist = list("jertheace") ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius") character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/jeremiah_ammo /datum/gear/fluff/jeremiah_ammo
path = /obj/item/ammo_magazine/m9mm/large/preban/hp //Spare ammo path = /obj/item/ammo_magazine/m9mm/large/preban/hp //Spare ammo
ckeywhitelist = list("jertheace") ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius") character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") 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
ckeywhitelist = list("jertheace") ckeywhitelist = list("jertheace")
character_name = list("Jeremiah Acacius") character_name = list("Jeremiah Acacius")
allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/jeremiah_boots /datum/gear/fluff/jeremiah_boots
path = /obj/item/clothing/shoes/boots/combat path = /obj/item/clothing/shoes/boots/combat
@@ -311,10 +303,12 @@
ckeywhitelist = list("joanrisu") ckeywhitelist = list("joanrisu")
character_name = list("Joan Risu") character_name = list("Joan Risu")
/datum/gear/fluff/katarina_backpack /datum/gear/fluff/katarina_backpack
path = /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/katarina path = /obj/item/weapon/storage/backpack/dufflebag/sec/fluff/katarina
ckeywhitelist = list("joanrisu") ckeywhitelist = list("joanrisu")
character_name = list("Katarina Eine") character_name = list("Katarina Eine")
allowed_roles = list("Colony Director", "Warden", "Head of Security")
/datum/gear/fluff/emoticon_box /datum/gear/fluff/emoticon_box
path = /obj/item/weapon/storage/box/fluff/emoticon path = /obj/item/weapon/storage/box/fluff/emoticon
@@ -536,7 +530,7 @@
ckeywhitelist = list("seiga") ckeywhitelist = list("seiga")
character_name = list("Alfonso Oak Telanor") character_name = list("Alfonso Oak Telanor")
/datum/gear/fluff/nthasd_modkit /datum/gear/fluff/nthasd_modkit //Converts a Security suit's sprite
path = /obj/item/device/modkit_conversion/hasd path = /obj/item/device/modkit_conversion/hasd
ckeywhitelist = list("silencedmp5a5") ckeywhitelist = list("silencedmp5a5")
character_name = list("NT-HASD #556") character_name = list("NT-HASD #556")

View File

@@ -14,8 +14,6 @@
continue continue
if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist))
continue continue
/* Commenting out the charactername check, for now. Easier to do it here, instead of doing it in the individual entries.
if(G.character_name && !(preference_mob.real_name in G.character_name)) if(G.character_name && !(preference_mob.real_name in G.character_name))
continue continue
*/
. += gear_name . += gear_name