cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-21 12:07:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2023-06-21 19:03:35 +02:00
parent 89fc57f631 a848dd292d
commit ff7df50a7e
346 changed files with 5621 additions and 4174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/client defines.dm
+1
View File
@@ -13,6 +13,7 @@
var/last_message = "" //Contains the last message sent by this client - used to protect against copy-paste spamming.
var/last_message_count = 0 //contins a number of how many times a message identical to last_message was sent.
var/ircreplyamount = 0
var/entity_narrate_holder //Holds /datum/entity_narrate when using the relevant admin verbs.
/////////
//OTHER//
code/modules/client/client procs.dm
+1 -1
View File
@@ -449,7 +449,7 @@
src << browse('code/modules/asset_cache/validate_assets.html', "window=asset_cache_browser")
//Precache the client with all other assets slowly, so as to not block other browse() calls
addtimer(CALLBACK(GLOBAL_PROC, /proc/getFilesSlow, src, SSassets.preload, FALSE), 5 SECONDS)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(getFilesSlow), src, SSassets.preload, FALSE), 5 SECONDS)
/mob/proc/MayRespawn()
return 0
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+14
View File
@@ -472,6 +472,20 @@
ckeywhitelist = list("fuackwit422")
character_name = list("Zera Livanne")
/datum/gear/fluff/zera_cloak
path = /obj/item/clothing/head/fluff/zerahat
display_name = "Grand Purple Hat"
slot = slot_head
ckeywhitelist = list("fuackwit422")
character_name = list("Zera Livanne")
/datum/gear/fluff/zera_hat
path = /obj/item/clothing/suit/storage/toggle/labcoat/fluff/zeracloak
display_name = "Grand Purple Cloak"
slot = slot_wear_suit
ckeywhitelist = list("fuackwit422")
character_name = list("Zera Livanne")
// G CKEYS
code/modules/client/preference_setup/loadout/loadout_gloves.dm
+20 -38
View File
@@ -6,25 +6,27 @@
slot = slot_gloves
sort_category = "Gloves and Handwear"
/datum/gear/gloves/blue
display_name = "gloves, blue"
path = /obj/item/clothing/gloves/blue
/datum/gear/gloves/selector
display_name = "coloured gloves selector"
description = "Pick from a range of plain coloured gloves."
path = /obj/item/clothing/gloves/black
/datum/gear/gloves/brown
display_name = "gloves, brown"
path = /obj/item/clothing/gloves/brown
/datum/gear/gloves/light_brown
display_name = "gloves, light-brown"
path = /obj/item/clothing/gloves/light_brown
/datum/gear/gloves/green
display_name = "gloves, green"
path = /obj/item/clothing/gloves/green
/datum/gear/gloves/grey
display_name = "gloves, grey"
path = /obj/item/clothing/gloves/grey
/datum/gear/gloves/selector/New()
..()
var/list/selector_uniforms = list(
"black"=/obj/item/clothing/gloves/black,
"blue"=/obj/item/clothing/gloves/blue,
"brown"=/obj/item/clothing/gloves/brown,
"light brown"=/obj/item/clothing/gloves/light_brown,
"green"=/obj/item/clothing/gloves/green,
"grey"=/obj/item/clothing/gloves/grey,
"orange"=/obj/item/clothing/gloves/orange,
"purple"=/obj/item/clothing/gloves/purple,
"rainbow"=/obj/item/clothing/gloves/rainbow,
"red"=/obj/item/clothing/gloves/red,
"white"=/obj/item/clothing/gloves/white
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/gloves/latex
display_name = "gloves, latex"
@@ -36,26 +38,6 @@
path = /obj/item/clothing/gloves/sterile/nitrile
cost = 2
/datum/gear/gloves/orange
display_name = "gloves, orange"
path = /obj/item/clothing/gloves/orange
/datum/gear/gloves/purple
display_name = "gloves, purple"
path = /obj/item/clothing/gloves/purple
/datum/gear/gloves/rainbow
display_name = "gloves, rainbow"
path = /obj/item/clothing/gloves/rainbow
/datum/gear/gloves/red
display_name = "gloves, red"
path = /obj/item/clothing/gloves/red
/datum/gear/gloves/white
display_name = "gloves, white"
path = /obj/item/clothing/gloves/white
/datum/gear/gloves/evening
display_name = "evening gloves"
path = /obj/item/clothing/gloves/evening
code/modules/client/preference_setup/loadout/loadout_head.dm
+96 -135
View File
@@ -16,11 +16,6 @@
display_name = "beret, red"
path = /obj/item/clothing/head/beret
/datum/gear/head/beret/bsec
display_name = "beret, navy (officer)"
path = /obj/item/clothing/head/beret/sec/navy/officer
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/beret/bsec_warden
display_name = "beret, navy (warden)"
path = /obj/item/clothing/head/beret/sec/navy/warden
@@ -31,11 +26,6 @@
path = /obj/item/clothing/head/beret/sec/navy/hos
allowed_roles = list("Head of Security")
/datum/gear/head/beret/csec
display_name = "beret, corporate (officer)"
path = /obj/item/clothing/head/beret/sec/corporate/officer
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/beret/csec_warden
display_name = "beret, corporate (warden)"
path = /obj/item/clothing/head/beret/sec/corporate/warden
@@ -54,70 +44,34 @@
display_name = "beret, purple"
path = /obj/item/clothing/head/beret/purple
/datum/gear/head/beret/sec
display_name = "beret, red (security)"
path = /obj/item/clothing/head/beret/sec
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/cap
display_name = "cap, black"
display_name = "cap, brown-flat"
path = /obj/item/clothing/head/flatcap
/datum/gear/head/cap/selector
display_name = "cap selector (plain)"
description = "Pick from a range of plain, coloured softcaps. Includes black, blue, green, and more!"
path = /obj/item/clothing/head/soft/black
/datum/gear/head/cap/blue
display_name = "cap, blue"
path = /obj/item/clothing/head/soft/blue
/datum/gear/head/cap/selector/New()
..()
var/list/selector_uniforms = list(
"black"=/obj/item/clothing/head/soft/black,
"blue"=/obj/item/clothing/head/soft/blue,
"green"=/obj/item/clothing/head/soft/green,
"grey"=/obj/item/clothing/head/soft/grey,
"orange"=/obj/item/clothing/head/soft/orange,
"purple"=/obj/item/clothing/head/soft/purple,
"rainbow"=/obj/item/clothing/head/soft/rainbow,
"red"=/obj/item/clothing/head/soft/red,
"yellow"=/obj/item/clothing/head/soft/yellow
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/head/cap/mailman
display_name = "cap, blue station"
path = /obj/item/clothing/head/mailman
/datum/gear/head/cap/flat
display_name = "cap, brown-flat"
path = /obj/item/clothing/head/flatcap
/datum/gear/head/cap/corp
display_name = "cap, corporate (Security)"
path = /obj/item/clothing/head/soft/sec/corp
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/cap/green
display_name = "cap, green"
path = /obj/item/clothing/head/soft/green
/datum/gear/head/cap/grey
display_name = "cap, grey"
path = /obj/item/clothing/head/soft/grey
/datum/gear/head/cap/med
display_name = "cap, medical (Medical)"
path = /obj/item/clothing/head/soft/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Search and Rescue")
/datum/gear/head/cap/orange
display_name = "cap, orange"
path = /obj/item/clothing/head/soft/orange
/datum/gear/head/cap/purple
display_name = "cap, purple"
path = /obj/item/clothing/head/soft/purple
/datum/gear/head/cap/rainbow
display_name = "cap, rainbow"
path = /obj/item/clothing/head/soft/rainbow
/datum/gear/head/cap/red
display_name = "cap, red"
path = /obj/item/clothing/head/soft/red
/datum/gear/head/cap/sec
display_name = "cap, security (Security)"
path = /obj/item/clothing/head/soft/sec
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/cap/yellow
display_name = "cap, yellow"
path = /obj/item/clothing/head/soft/yellow
/datum/gear/head/cap/white
display_name = "cap (colorable)"
path = /obj/item/clothing/head/soft/mime
@@ -134,69 +88,45 @@
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/head/cap/mbill
display_name = "cap, major bill's"
path = /obj/item/clothing/head/soft/mbill
/datum/gear/head/cap/sol
display_name = "cap, sol"
path = /obj/item/clothing/head/soft/solgov
/datum/gear/head/cowboy
display_name = "cowboy"
display_name = "cowboy hat selector"
description = "Pick from a range of styles of classic cowboy hat. Giddyup!"
path = /obj/item/clothing/head/cowboy
/datum/gear/head/cowboy/rattan
display_name = "cowboy, rattan"
path = /obj/item/clothing/head/cowboy/rattan
/datum/gear/head/cowboy/dark
display_name = "cowboy, dark"
path = /obj/item/clothing/head/cowboy/dark
/datum/gear/head/cowboy/ranger
display_name = "cowboy, ranger"
path = /obj/item/clothing/head/cowboy/ranger
/datum/gear/head/cowboy/black
display_name = "cowboy, black"
path = /obj/item/clothing/head/cowboy/black
/datum/gear/head/cowboy/fancy
display_name = "cowboy, fancy"
path = /obj/item/clothing/head/cowboy/fancy
/datum/gear/head/cowboy/rustler
display_name = "cowboy, rustler"
path = /obj/item/clothing/head/cowboy/rustler
/datum/gear/head/cowboy/black
display_name = "cowboy, bandit"
path = /obj/item/clothing/head/cowboy/bandit
/datum/gear/head/cowboy/wide
display_name = "cowboy, wide"
path = /obj/item/clothing/head/cowboy/wide
/datum/gear/head/cowboy/New()
..()
var/list/selector_uniforms = list(
"Classic"=/obj/item/clothing/head/cowboy,
"Rattan"=/obj/item/clothing/head/cowboy/rattan,
"Dark"=/obj/item/clothing/head/cowboy/dark,
"Ranger"=/obj/item/clothing/head/cowboy/ranger,
"Black"=/obj/item/clothing/head/cowboy/black,
"Fancy"=/obj/item/clothing/head/cowboy/fancy,
"Rustler's"=/obj/item/clothing/head/cowboy/rustler,
"Bandit's"=/obj/item/clothing/head/cowboy/bandit,
"Wide"=/obj/item/clothing/head/cowboy/wide
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/head/fedora/grey
display_name = "fedora, grey"
display_name = "fedora selector"
description = "Pick from a range of fedoras. Available in grey, white, brown, beige, and panama style."
path = /obj/item/clothing/head/fedora
/datum/gear/head/fedora/brown
display_name = "fedora, brown"
path = /obj/item/clothing/head/fedora/brown
/datum/gear/head/fedora/white
display_name = "fedora, white"
path = /obj/item/clothing/head/fedora/white
/datum/gear/head/fedora/beige
display_name = "fedora, beige"
path = /obj/item/clothing/head/fedora/beige
/datum/gear/head/fedora/panama
display_name = "fedora, panama"
path = /obj/item/clothing/head/fedora/panama
/datum/gear/head/fedora/grey/New()
..()
var/list/selector_uniforms = list(
"Brown"=/obj/item/clothing/head/fedora/brown,
"White"=/obj/item/clothing/head/fedora/white,
"Beige"=/obj/item/clothing/head/fedora/beige,
"Panama"=/obj/item/clothing/head/fedora/panama,
"Grey"=/obj/item/clothing/head/fedora
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/head/hairflower
display_name = "hair flower pin (colorable)"
@@ -353,27 +283,23 @@
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/head/welding/
display_name = "welding, normal (engineering/robotics)"
/datum/gear/head/welding
display_name = "welding mask selection"
description = "Select from a range of welding masks (engineering crew/roboticists only)"
path = /obj/item/clothing/head/welding
cost = 2
allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician","Research Director","Roboticist")
/datum/gear/head/welding/demon
display_name = "welding, demon (engineering/robotics)"
path = /obj/item/clothing/head/welding/demon
/datum/gear/head/welding/knight
display_name = "welding, knight (engineering/robotics)"
path = /obj/item/clothing/head/welding/knight
/datum/gear/head/welding/fancy
display_name = "welding, fancy (engineering/robotics)"
path = /obj/item/clothing/head/welding/fancy
/datum/gear/head/welding/engie
display_name = "welding, engie (engineering/robotics)"
path = /obj/item/clothing/head/welding/engie
/datum/gear/head/welding/New()
..()
var/list/selector_uniforms = list(
"plain"=/obj/item/clothing/head/welding,
"engineering"=/obj/item/clothing/head/welding/engie,
"fancy"=/obj/item/clothing/head/welding/fancy,
"demonic"=/obj/item/clothing/head/welding/demon,
"knightly"=/obj/item/clothing/head/welding/knight
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/head/beret/solgov
display_name = "beret sol, selection"
@@ -445,3 +371,38 @@
/datum/gear/head/wheat
display_name = "straw hat"
path = /obj/item/clothing/head/wheat
/datum/gear/head/sec_hat_selector
display_name = "Security - Basic Headwear"
description = "Select from a range of hats available to all Security personnel."
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
path = /obj/item/clothing/head/soft/sec/corp
/datum/gear/head/sec_hat_selector/New()
..()
var/list/selector_uniforms = list(
"Navy Security Beret"=/obj/item/clothing/head/beret/sec/navy/officer,
"CorpSec Beret"=/obj/item/clothing/head/beret/sec/corporate/officer,
"Security Beret"=/obj/item/clothing/head/beret/sec,
"CorpSec Softcap"=/obj/item/clothing/head/soft/sec/corp,
"Security Softcap"=/obj/item/clothing/head/soft/sec,
"Proxima Centauri Contractor Beret"=/obj/item/clothing/head/beret/corp/pcrc
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/head/med_hat_selector
display_name = "Medical - Basic Headwear"
description = "Select from a range of hats available to all Medical personnel."
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic") // YW EDIT Field medic
path = /obj/item/clothing/head/soft/med
/datum/gear/head/med_hat_selector/New()
..()
var/list/selector_uniforms = list(
"medical softcap"=/obj/item/clothing/head/soft/med,
"paramedic softcap"=/obj/item/clothing/head/soft/paramed,
"medical beret"=/obj/item/clothing/head/beret/medical,
"chemist's beret"=/obj/item/clothing/head/beret/medical/chem,
"virologist's beret"=/obj/item/clothing/head/beret/medical/viro
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
code/modules/client/preference_setup/loadout/loadout_head_vr.dm
+13 -25
View File
@@ -1,8 +1,3 @@
/datum/gear/head/cap/med
display_name = "cap, medical (Medical)"
path = /obj/item/clothing/head/soft/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic", "Field Medic") // YW EDIT Field medic
/*/datum/gear/head/cap/sol
display_name = "cap, sol"
path = /obj/item/clothing/head/soft/sol*/
@@ -33,28 +28,21 @@
allowed_roles = list("Head of Security", "Detective")
/datum/gear/head/bearpelt
display_name = "brown bear pelt"
display_name = "animal pelt selection"
description = "Select from a range of (probably, hopefully) synthetic/artificial animal pelts."
path = /obj/item/clothing/head/pelt
/datum/gear/head/wolfpelt
display_name = "brown wolf pelt"
path = /obj/item/clothing/head/pelt/wolfpelt
/datum/gear/head/wolfpeltblack
display_name = "black wolf pelt"
path = /obj/item/clothing/head/pelt/wolfpeltblack
/datum/gear/head/tigerpelt
display_name = "shiny tiger pelt"
path = /obj/item/clothing/head/pelt/tigerpelt
/datum/gear/head/tigerpeltsnow
display_name = "snow tiger pelt"
path = /obj/item/clothing/head/pelt/tigerpeltsnow
/datum/gear/head/tigerpeltpink
display_name = "pink tiger pelt"
path = /obj/item/clothing/head/pelt/tigerpeltpink
/datum/gear/head/bearpelt/New()
..()
var/list/selector_uniforms = list(
"bear, brown"=/obj/item/clothing/head/pelt,
"wolf, brown"=/obj/item/clothing/head/pelt/wolfpelt,
"wolf, black"=/obj/item/clothing/head/pelt/wolfpeltblack,
"tiger, plain"=/obj/item/clothing/head/pelt/tigerpelt,
"tiger, white"=/obj/item/clothing/head/pelt/tigerpeltsnow,
"tiger, pink"=/obj/item/clothing/head/pelt/tigerpeltpink
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/head/magic_hat
display_name = "wizard hat, colorable"
code/modules/client/preference_setup/loadout/loadout_mask.dm
+2 -2
View File
@@ -68,11 +68,11 @@
for(var/gaiter in typesof(/obj/item/clothing/accessory/gaiter))
var/obj/item/clothing/accessory/gaiter_type = gaiter
gaiters[initial(gaiter_type.name)] = gaiter_type
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc))
gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, GLOBAL_PROC_REF(cmp_text_asc)))
/datum/gear/mask/lace
display_name = "lace veil"
path = /obj/item/clothing/mask/lacemask
/datum/gear/mask/lace/New()
gear_tweaks += gear_tweak_free_color_choice
gear_tweaks += gear_tweak_free_color_choice
code/modules/client/preference_setup/loadout/loadout_smoking.dm
+1 -1
View File
@@ -48,6 +48,6 @@
/datum/gear/cigarettes/New()
..()
var/list/cigarettes = list()
for(var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand as anything in (typesof(/obj/item/weapon/storage/fancy/cigarettes) - typesof(/obj/item/weapon/storage/fancy/cigarettes/killthroat)))
for(var/obj/item/weapon/storage/fancy/cigarettes/cigarette_brand as anything in (typesof(/obj/item/weapon/storage/fancy/cigarettes)))
cigarettes[initial(cigarette_brand.name)] = cigarette_brand
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cigarettes))
code/modules/client/preference_setup/loadout/loadout_suit.dm
+48 -61
View File
@@ -31,52 +31,38 @@
path = /obj/item/clothing/suit/jacket/puffer/vest
/datum/gear/suit/bomber
display_name = "bomber jacket"
display_name = "bomber jacket selection"
description = "Pick from a small selection of bomber jackets."
path = /obj/item/clothing/suit/storage/toggle/bomber
/datum/gear/suit/bomber_alt
display_name = "bomber jacket, alt"
path = /obj/item/clothing/suit/storage/bomber/alt
/datum/gear/suit/bomber_retro
display_name = "bomber jacket, retro"
path = /obj/item/clothing/suit/storage/toggle/bomber/retro
/datum/gear/suit/bomber/New()
..()
var/list/selector_uniforms = list(
"classic"=/obj/item/clothing/suit/storage/toggle/bomber,
"classic alternative"=/obj/item/clothing/suit/storage/bomber/alt,
"retro"=/obj/item/clothing/suit/storage/toggle/bomber/retro
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/suit/leather_jacket
display_name = "leather jacket, black"
display_name = "leather jacket and vest selection"
description = "Pick from a wide variety of leather vests and jackets."
path = /obj/item/clothing/suit/storage/toggle/leather_jacket
/datum/gear/suit/leather_jacket_sleeveless
display_name = "leather vest, black"
path = /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless
/datum/gear/suit/leather_jacket_alt
display_name = "leather jacket 2, black"
path = /obj/item/clothing/suit/storage/leather_jacket_alt
/datum/gear/suit/leather_jacket_nt
display_name = "leather jacket, corporate, black"
path = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen
/datum/gear/suit/leather_jacket_nt/sleeveless
display_name = "leather vest, corporate, black"
path = /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless
/datum/gear/suit/brown_jacket
display_name = "leather jacket, brown"
path = /obj/item/clothing/suit/storage/toggle/brown_jacket
/datum/gear/suit/brown_jacket_sleeveless
display_name = "leather vest, brown"
path = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless
/datum/gear/suit/brown_jacket_nt
display_name = "leather jacket, corporate, brown"
path = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
/datum/gear/suit/brown_jacket_nt/sleeveless
display_name = "leather vest, corporate, brown"
path = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless
/datum/gear/suit/leather_jacket/New()
..()
var/list/selector_uniforms = list(
"black jacket"=/obj/item/clothing/suit/storage/toggle/leather_jacket,
"black vest"=/obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless,
"black jacket, alternative"=/obj/item/clothing/suit/storage/leather_jacket_alt,
"black jacket, corporate"=/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen,
"black vest, corporate"=/obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless,
"brown jacket"=/obj/item/clothing/suit/storage/toggle/brown_jacket,
"brown vest"=/obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless,
"brown jacket, corporate"=/obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen,
"brown vest, corporate"=/obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
//YW EDIT BEGINS
/datum/gear/suit/mil
@@ -204,17 +190,19 @@
path = /obj/item/clothing/suit/cyberpunk
cost = 2
/datum/gear/suit/puffycoat/blue
display_name = "puffy coat, blue"
/datum/gear/suit/puffycoat
display_name = "puffy coat selection"
description = "Pick from a few different colours of puffy coat."
path = /obj/item/clothing/suit/storage/puffyblue
/datum/gear/suit/puffycoat/red
display_name = "puffy coat, red"
path = /obj/item/clothing/suit/storage/puffyred
/datum/gear/suit/puffycoat/purple
display_name = "puffy coat, purple"
path = /obj/item/clothing/suit/storage/puffypurple
/datum/gear/suit/puffycoat/New()
..()
var/list/selector_uniforms = list(
"blue"=/obj/item/clothing/suit/storage/puffyblue,
"red"=/obj/item/clothing/suit/storage/puffyred,
"purple"=/obj/item/clothing/suit/storage/puffypurple
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/suit/poncho
display_name = "poncho selection"
@@ -558,20 +546,19 @@
gear_tweaks += new/datum/gear_tweak/path(flannel)
/datum/gear/suit/denim_jacket
display_name = "denim jacket"
display_name = "denim jacket and vest selection"
description = "Select from a small range of denim jackets and vests."
path = /obj/item/clothing/suit/storage/toggle/denim_jacket
/datum/gear/suit/denim_jacket/corporate
display_name = "denim jacket, corporate"
path = /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen
/datum/gear/suit/denim_vest
display_name = "denim vest"
path = /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless
/datum/gear/suit/denim_vest/corporate
display_name = "denim vest, corporate"
path = /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless
/datum/gear/suit/denim_jacket/New()
..()
var/list/selector_uniforms = list(
"denim jacket"=/obj/item/clothing/suit/storage/toggle/denim_jacket,
"denim jacket, corporate"=/obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen,
"denim vest"=/obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless,
"denim vest, corporate"=/obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
/datum/gear/suit/miscellaneous/dep_jacket
display_name = "department jacket selection"
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+1 -10
View File
@@ -23,7 +23,6 @@
path = /obj/item/clothing/suit/storage/toggle/labcoat/old/tox
cost = 2
/datum/gear/suit/roles/labcoat_old/New()
..()
var/list/labcoats = list(
@@ -92,7 +91,6 @@
display_name = "chiton"
path = /obj/item/clothing/suit/chiton
//oversized t-shirt
/datum/gear/suit/oversize
display_name = "oversized t-shirt (colorable)"
@@ -109,7 +107,6 @@ Talon winter coat
display_name = "winter coat, Talon"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
/datum/gear/suit/armor/combat/crusader_explo
display_name = "knight, explo"
path = /obj/item/clothing/suit/armor/combat/crusader_explo
@@ -118,20 +115,14 @@ Talon winter coat
/datum/gear/suit/armor/combat/crusader_explo/FM
display_name = "knight, Field Medic"
path = /obj/item/clothing/suit/armor/combat/crusader_explo/FM
allowed_roles = list ("Field Medic")
allowed_roles = list ("Paramedic")
//Atmos-coloured hazard vest
display_name = "hazard vest, atmospherics"
path = /obj/item/clothing/suit/storage/hazardvest/atmos
allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer")
//Long fur coat
/datum/gear/suit/russofurcoat
display_name = "long fur coat"
path = /obj/item/clothing/suit/storage/vest/hoscoat/russofurcoat
//Colorable Hoodie
/datum/gear/suit/hoodie_vr
display_name = "hoodie with hood (colorable)"
path = /obj/item/clothing/suit/storage/hooded/hoodie
code/modules/client/preference_setup/loadout/loadout_uni_selector.dm
+46 -43
View File
@@ -7,7 +7,7 @@
allowed_roles = list("")
path =
slot = slot_w_uniform
sort_category = "Uniform Selectors"
sort_category = "Uniforms"
cost = 2
/datum/gear/uniform/BLANK_selector/New()
@@ -24,8 +24,8 @@
description = "Select from a range of outfits available to all Site Managers."
allowed_roles = list("Site Manager")
path = /obj/item/clothing/under/rank/neo_captain
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/site_manager_selector/New()
..()
@@ -53,8 +53,8 @@
description = "Select from a range of outfits available to all Heads of Personnel."
allowed_roles = list("Head of Personnel")
path = /obj/item/clothing/under/rank/neo_hop
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/head_of_personnel_selector/New()
..()
@@ -84,7 +84,7 @@
description = "Select from a range of outfits available to all Pilots."
allowed_roles = list("Pilot")
path = /obj/item/clothing/under/rank/neo_pilot
sort_category = "Uniform Selectors"
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/pilot_uniform_selector/New()
@@ -102,7 +102,7 @@
description = "Select from a range of outfits available to all Janitorial personnel."
allowed_roles = list("Janitor")
path = /obj/item/clothing/under/rank/neo_janitor
sort_category = "Uniform Selectors"
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/janitor_uniform_selector/New()
@@ -117,7 +117,7 @@
display_name = "Civilian - Basic Uniforms"
description = "Select from a range of uniforms available to all personnel. Includes miscellaneous corporate contractor uniforms."
path = /obj/item/clothing/under/utility/grey
sort_category = "Uniform Selectors"
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/civvie_uniform_selector/New()
@@ -138,6 +138,7 @@
"Corporate, Focal Point Energistics uniform"=/obj/item/clothing/under/corp/focal,
"Corporate, Grayson Manufactories uniform"=/obj/item/clothing/under/corp/grayson,
"Corporate, Grayson Manufactories jumpsuit"=/obj/item/clothing/under/corp/grayson_jump,
"Corporate, Kaleidoscope"=/obj/item/clothing/under/corp/kaleidoscope,
"Corporate, Ward-Takahashi uniform"=/obj/item/clothing/under/corp/wardt,
"Corporate, Hephaestus Arms uniform"=/obj/item/clothing/under/corp/hephaestus,
"Corporate, Centauri Provisions uniform"=/obj/item/clothing/under/corp/centauri,
@@ -163,8 +164,8 @@
description = "Select from a range of outfits available to all Security personnel."
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
path = /obj/item/clothing/under/rank/security/corp
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/security_selector/New()
..()
@@ -208,8 +209,8 @@
description = "Select from a range of outfits available to Wardens."
allowed_roles = list("Head of Security","Warden")
path = /obj/item/clothing/under/rank/warden/corp
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/security_warden_selector/New()
..()
@@ -229,8 +230,8 @@
description = "Select from a range of outfits available to all Detectives."
allowed_roles = list("Head of Security","Detective")
path = /obj/item/clothing/under/det/corporate
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/security_detective_selector/New()
..()
@@ -245,8 +246,8 @@
description = "Select from a range of outfits available to all Heads of Security."
allowed_roles = list("Head of Security")
path = /obj/item/clothing/under/rank/head_of_security/corp
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/security_head_selector/New()
..()
@@ -284,8 +285,8 @@
description = "Select from a range of outfits available to all Quartermasters."
allowed_roles = list("Quartermaster")
path = /obj/item/clothing/under/rank/cargo/jeans
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/quartermaster_selector/New()
..()
@@ -315,8 +316,8 @@
description = "Select from a range of outfits available to all Cargo personnel."
allowed_roles = list("Cargo Technician","Shaft Miner","Quartermaster")
path = /obj/item/clothing/under/rank/cargotech/jeans
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/cargo_general_selector/New()
..()
@@ -343,8 +344,8 @@
description = "Select from a range of outfits available to all Mining personnel."
allowed_roles = list("Shaft Miner","Quartermaster")
path = /obj/item/clothing/under/rank/neo_miner
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/cargo_miner_selector/New()
..()
@@ -361,8 +362,8 @@
description = "Select from a range of outfits available to all Chief Engineers."
allowed_roles = list("Chief Engineer")
path = /obj/item/clothing/under/rank/neo_chiefengi
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/engineering_chief_selector/New()
..()
@@ -385,8 +386,8 @@
description = "Select from a range of outfits available to all Engineering personnel."
allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician")
path = /obj/item/clothing/under/rank/neo_engi
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/engineer_selector/New()
..()
@@ -402,7 +403,8 @@
"voidsuit underlayer"=/obj/item/clothing/under/undersuit/hazard,
"TG&C jumpsuit"=/obj/item/clothing/under/rank/neo_engi,
"TG&C jumpskirt"=/obj/item/clothing/under/rank/neo_engi_skirt,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_engi_gorka
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_engi_gorka,
"hazard jumpsuit"=/obj/item/clothing/under/hazard
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -411,8 +413,8 @@
description = "Select from a range of outfits available to all Atmospherics Technicians."
allowed_roles = list("Chief Engineer","Atmospheric Technician")
path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/engi_atmos_selector/New()
..()
@@ -430,8 +432,8 @@
description = "Select from a range of outfits available to all Medical personnel."
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
path = /obj/item/clothing/under/rank/neo_med
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/medical_selector/New()
..()
@@ -452,7 +454,8 @@
"TG&C virology jumpskirt"=/obj/item/clothing/under/rank/neo_viro_skirt,
"TG&C dark jumpsuit"=/obj/item/clothing/under/rank/neo_med_dark,
"TG&C dark jumpskirt"=/obj/item/clothing/under/rank/neo_med_dark_skirt,
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_med_gorka
"TG&C gorka suit"=/obj/item/clothing/under/rank/neo_med_gorka,
"sterile jumpsuit"=/obj/item/clothing/under/sterile
)
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(selector_uniforms))
@@ -461,8 +464,8 @@
description = "Select from a range of outfits available to all Chemists."
allowed_roles = list("Chief Medical Officer","Chemist")
path = /obj/item/clothing/under/rank/neo_chem
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/chemist_selector/New()
..()
@@ -480,8 +483,8 @@
description = "Select from a range of outfits available to all Paramedics."
allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
path = /obj/item/clothing/under/rank/paramedunidark
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/paramedic_selector/New()
..()
@@ -502,7 +505,7 @@
description = "Select from a range of outfits available to all Chief Medical Officers."
allowed_roles = list("Chief Medical Officer")
path = /obj/item/clothing/under/rank/neo_cmo
sort_category = "Uniform Selectors"
sort_category = "Uniforms"
cost = 2
/datum/gear/uniform/chief_medical_selector/New()
@@ -530,8 +533,8 @@
description = "Select from a range of outfits available to all Research Directors."
allowed_roles = list("Research Director")
path = /obj/item/clothing/under/rank/neo_rd_suit
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/research_director_selector/New()
..()
@@ -555,8 +558,8 @@
description = "Select from a range of outfits available to all Science personnel."
allowed_roles = list("Scientist","Research Director","Roboticist","Xenobiologist","Xenobotanist")
path = /obj/item/clothing/under/rank/neo_science
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/science_dept_selector/New()
..()
@@ -579,8 +582,8 @@
description = "Select from a range of outfits available to all Roboticists."
allowed_roles = list("Research Director","Roboticist")
path = /obj/item/clothing/under/rank/neo_robo
sort_category = "Uniform Selectors"
cost = 2
sort_category = "Uniforms"
cost = 1
/datum/gear/uniform/science_robotics_selector/New()
..()
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+1 -274
View File
@@ -3,7 +3,7 @@
display_name = "blazer, blue"
path = /obj/item/clothing/under/blazer
slot = slot_w_uniform
sort_category = "Uniforms and Casual Dress"
sort_category = "Casual Dress"
/datum/gear/uniform/blazerskirt
display_name = "blazer, blue with skirt"
@@ -106,116 +106,6 @@
shorts[initial(short_type.name)] = short_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorts))
/datum/gear/uniform/job_skirt/ce
display_name = "skirt, ce"
path = /obj/item/clothing/under/rank/chief_engineer/skirt
allowed_roles = list("Chief Engineer")
/datum/gear/uniform/job_skirt/atmos
display_name = "skirt, atmos"
path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
allowed_roles = list("Chief Engineer","Atmospheric Technician")
/datum/gear/uniform/job_skirt/eng
display_name = "skirt, engineer"
path = /obj/item/clothing/under/rank/engineer/skirt
allowed_roles = list("Chief Engineer","Engineer")
/datum/gear/uniform/job_skirt/roboticist
display_name = "skirt, roboticist"
path = /obj/item/clothing/under/rank/roboticist/skirt
allowed_roles = list("Research Director","Roboticist")
/datum/gear/uniform/job_skirt/cmo
display_name = "skirt, cmo"
path = /obj/item/clothing/under/rank/chief_medical_officer/skirt
allowed_roles = list("Chief Medical Officer")
/datum/gear/uniform/job_skirt/chem
display_name = "skirt, chemist"
path = /obj/item/clothing/under/rank/chemist/skirt
allowed_roles = list("Chief Medical Officer","Chemist")
/datum/gear/uniform/job_skirt/viro
display_name = "skirt, virologist"
path = /obj/item/clothing/under/rank/virologist/skirt
allowed_roles = list("Chief Medical Officer","Medical Doctor")
/datum/gear/uniform/job_skirt/med
display_name = "skirt, medical"
path = /obj/item/clothing/under/rank/medical/skirt
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
/datum/gear/uniform/job_skirt/sci
display_name = "skirt, scientist"
path = /obj/item/clothing/under/rank/scientist/skirt
allowed_roles = list("Research Director","Scientist", "Xenobiologist")
/datum/gear/uniform/job_skirt/cargo
display_name = "skirt, cargo"
path = /obj/item/clothing/under/rank/cargotech/skirt
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/job_skirt/qm
display_name = "skirt, QM"
path = /obj/item/clothing/under/rank/cargo/skirt
allowed_roles = list("Quartermaster")
/datum/gear/uniform/job_skirt/warden
display_name = "skirt, warden"
path = /obj/item/clothing/under/rank/warden/skirt
allowed_roles = list("Head of Security", "Warden")
/datum/gear/uniform/job_skirt/security
display_name = "skirt, security"
path = /obj/item/clothing/under/rank/security/skirt
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_skirt/head_of_security
display_name = "skirt, hos"
path = /obj/item/clothing/under/rank/head_of_security/skirt
allowed_roles = list("Head of Security")
/datum/gear/uniform/job_turtle/science
display_name = "turtleneck, science"
path = /obj/item/clothing/under/rank/scientist/turtleneck
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist")
/datum/gear/uniform/job_turtle/security
display_name = "turtleneck, security"
path = /obj/item/clothing/under/rank/security/turtleneck
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_turtle/engineering
display_name = "turtleneck, engineering"
path = /obj/item/clothing/under/rank/engineer/turtleneck
allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Engineer")
/datum/gear/uniform/job_turtle/medical
display_name = "turtleneck, medical"
path = /obj/item/clothing/under/rank/medical/turtleneck
allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Search and Rescue", "Chemist")
/datum/gear/uniform/jeans_qm
display_name = "jeans, QM"
path = /obj/item/clothing/under/rank/cargo/jeans
allowed_roles = list("Quartermaster")
/datum/gear/uniform/jeans_qmf
display_name = "female jeans, QM"
path = /obj/item/clothing/under/rank/cargo/jeans/female
allowed_roles = list("Quartermaster")
/datum/gear/uniform/jeans_cargo
display_name = "jeans, cargo"
path = /obj/item/clothing/under/rank/cargotech/jeans
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/jeans_cargof
display_name = "female jeans, cargo"
path = /obj/item/clothing/under/rank/cargotech/jeans/female
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/suit/lawyer
display_name = "suit, one-piece selection"
path = /obj/item/clothing/under/lawyer
@@ -302,57 +192,6 @@
display_name = "flame dress"
path = /obj/item/clothing/under/dress/dress_fire
/datum/gear/uniform/uniform_captain
display_name = "uniform, site manager's dress"
path = /obj/item/clothing/under/dress/dress_cap
allowed_roles = list("Site Manager")
/datum/gear/uniform/corpdetsuit
display_name = "uniform, corporate (Detective)"
path = /obj/item/clothing/under/det/corporate
allowed_roles = list("Detective","Head of Security")
/datum/gear/uniform/corpsecsuit
display_name = "uniform, corporate (Security)"
path = /obj/item/clothing/under/rank/security/corp
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/corpwarsuit
display_name = "uniform, corporate (Warden)"
path = /obj/item/clothing/under/rank/warden/corp
allowed_roles = list("Head of Security","Warden")
/datum/gear/uniform/corphossuit
display_name = "uniform, corporate (Head of Security)"
path = /obj/item/clothing/under/rank/head_of_security/corp
allowed_roles = list("Head of Security")
/datum/gear/uniform/uniform_hop
display_name = "uniform, HoP's dress"
path = /obj/item/clothing/under/dress/dress_hop
allowed_roles = list("Head of Personnel")
/datum/gear/uniform/uniform_hr
display_name = "uniform, HR director (HoP)"
path = /obj/item/clothing/under/dress/dress_hr
allowed_roles = list("Head of Personnel")
/datum/gear/uniform/navysecsuit
display_name = "uniform, navy blue (Security)"
path = /obj/item/clothing/under/rank/security/navyblue
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/navywarsuit
display_name = "uniform, navy blue (Warden)"
path = /obj/item/clothing/under/rank/warden/navyblue
allowed_roles = list("Head of Security","Warden")
/datum/gear/uniform/navyhossuit
display_name = "uniform, navy blue (Head of Security)"
path = /obj/item/clothing/under/rank/head_of_security/navyblue
allowed_roles = list("Head of Security")
/datum/gear/uniform/shortplaindress
display_name = "plain dress"
path = /obj/item/clothing/under/dress/white3
@@ -408,18 +247,6 @@
maids[initial(maid_type.name)] = maid_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(maids))
/datum/gear/uniform/utility
display_name = "utility, black"
path = /obj/item/clothing/under/utility
/datum/gear/uniform/utility/blue
display_name = "utility, blue"
path = /obj/item/clothing/under/utility/blue
/datum/gear/uniform/utility/grey
display_name = "utility, grey"
path = /obj/item/clothing/under/utility/grey
/datum/gear/uniform/sweater
display_name = "sweater, grey"
path = /obj/item/clothing/under/rank/psych/turtleneck/sweater
@@ -648,26 +475,6 @@
..()
gear_tweaks += gear_tweak_free_color_choice
/datum/gear/uniform/paramedunidark
display_name = "paramedic uniform, dark"
path = /obj/item/clothing/under/rank/paramedunidark
allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
/datum/gear/uniform/parameduniskirtdark
display_name = "paramedic skirt, dark"
path = /obj/item/clothing/under/rank/parameduniskirtdark
allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
/datum/gear/uniform/paramedunilight
display_name = "paramedic uniform, light"
path = /obj/item/clothing/under/rank/paramedunilight
allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
/datum/gear/uniform/parameduniskirtlight
display_name = "paramedic skirt, light"
path = /obj/item/clothing/under/rank/parameduniskirtlight
allowed_roles = list("Medical Doctor","Chief Medical Officer","Paramedic")
/datum/gear/uniform/tourist_1
display_name = "tourist outfit, white"
path = /obj/item/clothing/under/tourist_1
@@ -690,14 +497,6 @@
)
gear_tweaks += new/datum/gear_tweak/path(cowboy_outfits)
/datum/gear/uniform/utility/gsa
display_name = "utility, galactic survey"
path = /obj/item/clothing/under/gsa
/datum/gear/uniform/utility/gsa_work
display_name = "heavy utility, galactic survey"
path = /obj/item/clothing/under/gsa_work
/*
* 80s
*/
@@ -717,75 +516,3 @@
/datum/gear/uniform/tropical_outfit/blue
display_name = "tropical outfit, miami vice"
path = /obj/item/clothing/under/tropical/blue
/*
* Branded Uniforms
*/
/datum/gear/uniform/brandsuit/mbill
display_name = "uniform, major bill's"
path = /obj/item/clothing/under/mbill
/datum/gear/uniform/brandsuit/mbill_flight
display_name = "uniform, major bill's flightsuit (Pilot)"
path = /obj/item/clothing/under/mbill_flight
allowed_roles = list("Pilot")
/datum/gear/uniform/brandsuit/aether
display_name = "jumpsuit, aether"
path = /obj/item/clothing/under/corp/aether
/datum/gear/uniform/brandsuit/focal
display_name = "jumpsuit, focal"
path = /obj/item/clothing/under/corp/focal
/datum/gear/uniform/brandsuit/pcrc
display_name = "uniform, PCRC (Security)"
path = /obj/item/clothing/under/corp/pcrc
allowed_roles = list("Security Officer","Head of Security","Warden")
/datum/gear/uniform/brandsuit/grayson
display_name = "outfit, grayson"
path = /obj/item/clothing/under/corp/grayson
/datum/gear/uniform/brandsuit/grayson_jump
display_name = "jumpsuit, grayson"
path = /obj/item/clothing/under/corp/grayson_jump
/datum/gear/uniform/brandsuit/wardt
display_name = "jumpsuit, ward-takahashi"
path = /obj/item/clothing/under/corp/wardt
/datum/gear/uniform/brandsuit/hephaestus
display_name = "jumpsuit, hephaestus"
path = /obj/item/clothing/under/corp/hephaestus
/datum/gear/uniform/brandsuit/centauri
display_name = "jumpsuit, centauri provisions"
path = /obj/item/clothing/under/corp/centauri
/datum/gear/uniform/brandsuit/morpheus
display_name = "jumpsuit, morpheus"
path = /obj/item/clothing/under/corp/morpheus
/datum/gear/uniform/brandsuit/wulf
display_name = "jumpsuit, wulf"
path = /obj/item/clothing/under/corp/wulf
/datum/gear/uniform/brandsuit/zenghu
display_name = "jumpsuit, zeng-hu"
path = /obj/item/clothing/under/corp/zenghu
/datum/gear/uniform/brandsuit/xion
display_name = "jumpsuit, xion"
path = /obj/item/clothing/under/corp/xion
/datum/gear/uniform/brandsuit/vedmed
display_name = "jumpsuit, vey-med (Medical)"
path = /obj/item/clothing/under/corp/veymed
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
/datum/gear/uniform/brandsuit/kaleidoscope
display_name = "outfit, kaleidoscope (Science)"
path = /obj/item/clothing/under/corp/kaleidoscope
allowed_roles = list("Research Director","Scientist","Xenobiologist")
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
+1 -155
View File
@@ -11,52 +11,6 @@
display_name = "pt uniform, planetside sec"
path = /obj/item/clothing/under/solgov/pt/sifguard
/datum/gear/uniform/job_skirt/sci
allowed_roles = list("Research Director","Scientist", "Xenobiologist", "Xenobotanist")
/datum/gear/uniform/job_turtle/science
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
/datum/gear/uniform/job_turtle/medical
display_name = "turtleneck, medical"
path = /obj/item/clothing/under/rank/medical/turtleneck
allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Chemist", "Field Medic") // YW EDIT Field medic
//KHI Uniforms
/datum/gear/uniform/job_khi/cmd
display_name = "khi uniform, cmd"
path = /obj/item/clothing/under/rank/khi/cmd
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_khi/sec
display_name = "khi uniform, sec"
path = /obj/item/clothing/under/rank/khi/sec
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_khi/med
display_name = "khi uniform, med"
path = /obj/item/clothing/under/rank/khi/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Psychiatrist", "Field Medic") // YW EDIT Field medic
/datum/gear/uniform/job_khi/eng
display_name = "khi uniform, eng"
path = /obj/item/clothing/under/rank/khi/eng
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
/datum/gear/uniform/job_khi/sci
display_name = "khi uniform, sci"
path = /obj/item/clothing/under/rank/khi/sci
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
/datum/gear/uniform/job_khi/crg
display_name = "khi uniform, cargo"
path = /obj/item/clothing/under/rank/khi/crg
allowed_roles = list("Quartermaster", "Cargo Technician", "Shaft Miner")
/datum/gear/uniform/job_khi/civ
display_name = "khi uniform, civ"
path = /obj/item/clothing/under/rank/khi/civ
//Federation jackets
/datum/gear/suit/job_fed/sec
display_name = "fed uniform, sec"
@@ -72,56 +26,6 @@
display_name = "fed uniform, eng"
path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
// Trekie things
//TOS
/datum/gear/uniform/job_trek/cmd/tos
display_name = "TOS uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/tos
display_name = "TOS uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") // YW EDIT Field medic
/datum/gear/uniform/job_trek/eng/tos
display_name = "TOS uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS
//TNG
/datum/gear/uniform/job_trek/cmd/tng
display_name = "TNG uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/next
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/tng
display_name = "TNG uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/next
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") // YW EDIT Field medic
/datum/gear/uniform/job_trek/eng/tng
display_name = "TNG uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/next
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS
//VOY
/datum/gear/uniform/job_trek/cmd/voy
display_name = "VOY uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/voy
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/voy
display_name = "VOY uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/voy
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") // YW EDIT Field medic
/datum/gear/uniform/job_trek/eng/voy
display_name = "VOY uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/voy
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security","Pathfinder","Explorer","Field Medic","Blueshield Guard","Security Pilot") //YW ADDITIONS
//DS9
/datum/gear/suit/job_trek/ds9_coat
@@ -132,38 +36,6 @@
"Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician",
"Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS, Blueshield, Sec pilot, Exploration
/datum/gear/uniform/job_trek/cmd/ds9
display_name = "DS9 uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/ds9
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/ds9
display_name = "DS9 uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/ds9
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") // YW EDIT Field medic
/datum/gear/uniform/job_trek/eng/ds9
display_name = "DS9 uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/ds9
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS
//ENT
/datum/gear/uniform/job_trek/cmd/ent
display_name = "ENT uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/ent
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/ent
display_name = "ENT uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/ent
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") // YW EDIT Field medic
/datum/gear/uniform/job_trek/eng/ent
display_name = "ENT uniform, eng/sec"
path = /obj/item/clothing/under/rank/trek/engsec/ent
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security","Blueshield Guard","Security Pilot") //YW ADDITIONS
/*
Swimsuits
*/
@@ -269,26 +141,6 @@ Talon jumpsuit
suits[initial(undersuit_type.name)] = undersuit_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(suits))
/datum/gear/uniform/undersuit_haz
display_name = "undersuit, hazard (Engineering)"
allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Engineer")
path = /obj/item/clothing/under/undersuit/hazard
/datum/gear/uniform/undersuit_sec
display_name = "undersuit, security (Security)"
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
path = /obj/item/clothing/under/undersuit/sec
/datum/gear/uniform/undersuit_hos
display_name = "undersuit, security command (HoS)"
allowed_roles = list("Head of Security")
path = /obj/item/clothing/under/undersuit/sec/hos
/datum/gear/uniform/undersuit_com
display_name = "undersuit, command (SM/HoP)"
allowed_roles = list("Site Manager", "Head of Personnel")
path = /obj/item/clothing/under/undersuit/command
//Altevian Uniforms
/datum/gear/uniform/altevian
description = "An extremely comfortable set of clothing that's made to help people handle their day to day work around the fleets with little to no discomfort."
@@ -315,12 +167,6 @@ Talon jumpsuit
jumpsuits[initial(jumpsuit.name)] = jumpsuit
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpsuits))
//Modernized Sec Jumpsuit
/datum/gear/uniform/modernsec
display_name = "undersuit, security, modernized (Security)"
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
path = /obj/item/clothing/under/rank/security/modern
/datum/gear/uniform/singer_blue
display_name = "blue singer dress"
path = /obj/item/clothing/under/dress/singer
@@ -365,4 +211,4 @@ Talon jumpsuit
/datum/gear/uniform/stripeddungarees
display_name = "striped dungarees"
path = /obj/item/clothing/under/stripeddungarees
path = /obj/item/clothing/under/stripeddungarees
code/modules/client/preferences_factions.dm
-3
View File
@@ -25,7 +25,6 @@ var/global/list/citizenship_choices = list(
"Third Ares Confederation",
"Teshari Expeditionary Fleet",
"Altevian Hegemony",
"Kitsuhana Heavy Industries",
"Kosaky Fleets"
)
@@ -39,7 +38,6 @@ var/global/list/home_system_choices = list(
"Titan, Sol",
"Toledo, New Ohio",
"The Pact, Myria",
"Kitsuhana Prime",
"Kishar, Alpha Centauri",
"Anshar, Alpha Centauri",
"Heaven Complex, Alpha Centauri",
@@ -92,7 +90,6 @@ var/global/list/faction_choices = list(
"Gilthari Exports",
"Coyote Salvage Corp.",
"Chimera Genetics Corp.",
"Kitsuhana Heavy Industries",
"Independent Pilots Association",
"Local System Defense Force",
"United Solar Defense Force",