cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 09:09:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge Upstream

Browse Source
This commit is contained in:
Hawk_v3
2019-11-22 23:40:13 +00:00
parent 2339269a9a b6c504ed06
commit bafec81a0a
48 changed files with 12009 additions and 8774 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout.dm
+14 -8
View File
@@ -70,10 +70,13 @@ var/list/gear_datums = list()
continue
if(max_cost && G.cost > max_cost)
continue
if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
continue //Vorestation Edit
if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit
continue //Vorestation Edit
//VOREStation Edit Start
if(preference_mob && preference_mob.client)
if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist))
continue
if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name))
continue
//VOREStation Edit End
. += gear_name
/datum/category_item/player_setup_item/loadout/sanitize_character()
@@ -150,10 +153,13 @@ var/list/gear_datums = list()
. += "<tr><td colspan=3><hr></td></tr>"
for(var/gear_name in LC.gear)
var/datum/gear/G = LC.gear[gear_name]
if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist)) //Vorestation Edit
continue //Vorestation Edit
if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name)) //Vorestation Edit
continue //Vorestation Edit
//VOREStation Edit Start
if(preference_mob && preference_mob.client)
if(G.ckeywhitelist && !(preference_mob.ckey in G.ckeywhitelist))
continue
if(G.character_name && !(preference_mob.client.prefs.real_name in G.character_name))
continue
//VOREStation Edit End
var/ticked = (G.display_name in pref.gear)
. += "<tr style='vertical-align:top;'><td width=25%><a style='white-space:normal;' [ticked ? "class='linkOn' " : ""]href='?src=\ref[src];toggle_gear=[html_encode(G.display_name)]'>[G.display_name]</a></td>"
. += "<td width = 10% style='vertical-align:top'>[G.cost]</td>"
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+11 -8
View File
@@ -884,27 +884,30 @@
path = /obj/item/clothing/glasses/omnihud/med/fluff/wickedtemphud
display_name = "Tempest's Medical Hud"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venesare")
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"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venesare")
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 Venesare")
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"
ckeywhitelist = list("wickedtemp")
character_name = list("Chakat Tempest Venesare")
character_name = list("Chakat Tempest Venosare")
// X CKEYS
/datum/gear/fluff/penelope_box
@@ -944,4 +947,4 @@
path = /obj/item/clothing/accessory/sweater/fluff/star
display_name = "Star Sweater"
ckeywhitelist = list("bacon12366")
character_name = list("Elly Brown")
character_name = list("Elly Brown")