cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-12-21 21:57:49 +00:00
parent 06a47d15d5 8b9806c8c4
commit 6b935d64ec
192 changed files with 7436 additions and 5475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/client/preference_setup/loadout/loadout.dm
View File

@@ -66,7 +66,7 @@ var/list/gear_datums = list()
for(var/gear_name in gear_datums)
var/datum/gear/G = gear_datums[gear_name]
if(G.whitelisted && !is_alien_whitelisted(preference_mob, all_species[G.whitelisted]))
if(G.whitelisted && !is_alien_whitelisted(preference_mob, GLOB.all_species[G.whitelisted]))
continue
if(max_cost && G.cost > max_cost)
continue

8
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
View File

@@ -45,11 +45,11 @@
/datum/gear/accessory/brown_vest
display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner", "Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
/datum/gear/accessory/black_vest
display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner", "Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
/datum/gear/accessory/white_vest
display_name = "webbing, white (Medical)"
@@ -57,11 +57,11 @@
/datum/gear/accessory/brown_drop_pouches
display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner", "Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
/datum/gear/accessory/black_drop_pouches
display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)"
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Pathfinder","Shaft Miner", "Blueshield Guard")
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard")
/datum/gear/accessory/white_drop_pouches
display_name = "drop pouches, white (Medical)"

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

@@ -471,7 +471,7 @@
path = /obj/item/clothing/accessory/medal/silver/unity
display_name = "Rana's Unity Medal"
ckeywhitelist = list("kitchifox")
character_name = list("Rana Uma")
character_name = list("Rana Starsong-Uma")
/datum/gear/fluff/taiga_uniform
path = /obj/item/clothing/under/fluff/taiga

40
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -517,3 +517,43 @@
/datum/gear/uniform/lilacdress
display_name = "lilac dress"
path = /obj/item/clothing/under/dress/lilacdress
/datum/gear/uniform/polka
display_name = "polka dot dress"
path = /obj/item/clothing/under/dress/polka
/datum/gear/uniform/twistfront
display_name = "twistfront crop dress"
path = /obj/item/clothing/under/dress/twistfront
/datum/gear/uniform/cropdress
display_name = "crop dress"
path = /obj/item/clothing/under/dress/cropdress
/datum/gear/uniform/vneckdress
display_name = "v-neck dress"
path = /obj/item/clothing/under/dress/vneck
/datum/gear/uniform/bluedress
display_name = "blue dress"
path = /obj/item/clothing/under/dress/bluedress
/datum/gear/uniform/wench
display_name = "wench's dress"
path = /obj/item/clothing/under/dress/wench
/datum/gear/uniform/littleblackdress
display_name = "little black dress"
path = /obj/item/clothing/under/dress/littleblackdress
/datum/gear/uniform/pinktutu
display_name = "pink tutu"
path = /obj/item/clothing/under/dress/pinktutu
/datum/gear/uniform/festivedress
display_name = "festive dress"
path = /obj/item/clothing/under/dress/festivedress
/datum/gear/uniform/haltertop
display_name = "halter top"
path = /obj/item/clothing/under/haltertop