mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-12 00:33:20 +01:00
Merge branch 'master' into upstream-merge-11054
This commit is contained in:
Nadyr
@@ -135,43 +135,39 @@
|
||||
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hoodies))
|
||||
|
||||
/datum/gear/suit/labcoat
|
||||
display_name = "labcoat"
|
||||
display_name = "labcoat selection, public"
|
||||
path = /obj/item/clothing/suit/storage/toggle/labcoat
|
||||
|
||||
/datum/gear/suit/labcoat/blue
|
||||
display_name = "labcoat, blue"
|
||||
path = /obj/item/clothing/suit/storage/toggle/labcoat/blue
|
||||
/datum/gear/suit/labcoat/New()
|
||||
..()
|
||||
var/list/labcoats = list(
|
||||
"White labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat,
|
||||
"Blue-edge labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge,
|
||||
"Green labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/green,
|
||||
"Orange labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/orange,
|
||||
"Purple labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/purple,
|
||||
"Pink labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/pink,
|
||||
"Red labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/red,
|
||||
"Yellow labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/yellow
|
||||
)
|
||||
gear_tweaks += new/datum/gear_tweak/path(labcoats)
|
||||
|
||||
/datum/gear/suit/labcoat/blue_edge
|
||||
display_name = "labcoat, blue-edged"
|
||||
path = /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge
|
||||
/datum/gear/suit/labcoat_cmo
|
||||
display_name = "labcoat selection, cmo"
|
||||
path = /obj/item/clothing/suit/storage/toggle/labcoat/cmo
|
||||
allowed_roles = list("Chief Medical Officer")
|
||||
|
||||
/datum/gear/suit/labcoat/green
|
||||
display_name = "labcoat, green"
|
||||
path = /obj/item/clothing/suit/storage/toggle/labcoat/green
|
||||
|
||||
/datum/gear/suit/labcoat/orange
|
||||
display_name = "labcoat, orange"
|
||||
path = /obj/item/clothing/suit/storage/toggle/labcoat/orange
|
||||
|
||||
/datum/gear/suit/labcoat/purple
|
||||
display_name = "labcoat, purple"
|
||||
path = /obj/item/clothing/suit/storage/toggle/labcoat/purple
|
||||
|
||||
/datum/gear/suit/labcoat/pink
|
||||
display_name = "labcoat, pink"
|
||||
path = /obj/item/clothing/suit/storage/toggle/labcoat/pink
|
||||
|
||||
/datum/gear/suit/labcoat/red
|
||||
display_name = "labcoat, red"
|
||||
path = /obj/item/clothing/suit/storage/toggle/labcoat/red
|
||||
|
||||
/datum/gear/suit/labcoat/yellow
|
||||
display_name = "labcoat, yellow"
|
||||
path = /obj/item/clothing/suit/storage/toggle/labcoat/yellow
|
||||
/datum/gear/suit/labcoat_cmo/New()
|
||||
..()
|
||||
var/list/labcoats = list(
|
||||
"CMO labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/cmo,
|
||||
"CMO labcoat (alt)" = /obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
|
||||
"CMO labcoat (modern)" = /obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo
|
||||
)
|
||||
gear_tweaks += new/datum/gear_tweak/path(labcoats)
|
||||
|
||||
/datum/gear/suit/labcoat/emt
|
||||
display_name = "labcoat, EMT (Medical)"
|
||||
display_name = "labcoat, EMT"
|
||||
path = /obj/item/clothing/suit/storage/toggle/labcoat/emt
|
||||
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
|
||||
|
||||
@@ -189,6 +185,11 @@
|
||||
path = /obj/item/clothing/suit/storage/apron/overalls
|
||||
cost = 1
|
||||
|
||||
/datum/gear/suit/cyberpunk
|
||||
display_name = "cyberpunk jacket"
|
||||
path = /obj/item/clothing/suit/cyberpunk
|
||||
cost = 2
|
||||
|
||||
/datum/gear/suit/poncho
|
||||
display_name = "poncho selection"
|
||||
path = /obj/item/clothing/accessory/poncho
|
||||
@@ -203,45 +204,26 @@
|
||||
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(ponchos))
|
||||
|
||||
/datum/gear/suit/roles/poncho
|
||||
display_name = "poncho, cargo"
|
||||
display_name = "poncho selection, departments"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cargo
|
||||
cost = 1
|
||||
|
||||
/datum/gear/suit/roles/poncho/security
|
||||
display_name = "poncho, security"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/security
|
||||
|
||||
<<<<<<< HEAD
|
||||
/datum/gear/suit/roles/poncho/medical
|
||||
display_name = "poncho, medical"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/medical
|
||||
|
||||
/datum/gear/suit/roles/poncho/engineering
|
||||
display_name = "poncho, engineering"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/engineering
|
||||
|
||||
/datum/gear/suit/roles/poncho/science
|
||||
display_name = "poncho, science"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/science
|
||||
|
||||
/datum/gear/suit/roles/poncho/cloak/hos
|
||||
||||||| parent of 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
/datum/gear/suit/roles/cloak/New()
|
||||
/datum/gear/suit/roles/poncho/New()
|
||||
..()
|
||||
var/list/cloaks = list(
|
||||
"Cargo cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/cargo,
|
||||
"Mining cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/mining,
|
||||
"Security cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/security,
|
||||
"Service cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/service,
|
||||
"Engineer cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/engineer,
|
||||
"Atmos cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/atmos,
|
||||
"Research cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/research,
|
||||
"Medical cloak" = /obj/item/clothing/accessory/poncho/roles/cloak/medical
|
||||
var/list/ponchos = list(
|
||||
"Cargo poncho" = /obj/item/clothing/accessory/poncho/roles/cargo,
|
||||
"Security poncho" = /obj/item/clothing/accessory/poncho/roles/security,
|
||||
"Medical poncho" = /obj/item/clothing/accessory/poncho/roles/medical,
|
||||
"Engineering poncho" = /obj/item/clothing/accessory/poncho/roles/engineering,
|
||||
"Science poncho" = /obj/item/clothing/accessory/poncho/roles/science
|
||||
)
|
||||
gear_tweaks += new/datum/gear_tweak/path(cloaks)
|
||||
gear_tweaks += new/datum/gear_tweak/path(ponchos)
|
||||
|
||||
|
||||
/datum/gear/suit/roles/cloak
|
||||
display_name = "cloak selection, departments"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo
|
||||
|
||||
/datum/gear/suit/roles/poncho/cloak_hos
|
||||
=======
|
||||
/datum/gear/suit/roles/cloak/New()
|
||||
..()
|
||||
var/list/cloaks = list(
|
||||
@@ -257,120 +239,42 @@
|
||||
gear_tweaks += new/datum/gear_tweak/path(cloaks)
|
||||
|
||||
/datum/gear/suit/roles/cloak_hos
|
||||
>>>>>>> 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
display_name = "cloak, head of security"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/hos
|
||||
allowed_roles = list("Head of Security")
|
||||
|
||||
<<<<<<< HEAD
|
||||
/datum/gear/suit/roles/poncho/cloak/cmo
|
||||
||||||| parent of 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
/datum/gear/suit/roles/poncho/cloak_cmo
|
||||
=======
|
||||
/datum/gear/suit/roles/cloak_cmo
|
||||
>>>>>>> 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
display_name = "cloak, chief medical officer"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/cmo
|
||||
allowed_roles = list("Chief Medical Officer")
|
||||
|
||||
<<<<<<< HEAD
|
||||
/datum/gear/suit/roles/poncho/cloak/ce
|
||||
||||||| parent of 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
/datum/gear/suit/roles/poncho/cloak_ce
|
||||
=======
|
||||
/datum/gear/suit/roles/cloak_ce
|
||||
>>>>>>> 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
display_name = "cloak, chief engineer"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/ce
|
||||
allowed_roles = list("Chief Engineer")
|
||||
|
||||
<<<<<<< HEAD
|
||||
/datum/gear/suit/roles/poncho/cloak/rd
|
||||
||||||| parent of 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
/datum/gear/suit/roles/poncho/cloak_rd
|
||||
=======
|
||||
/datum/gear/suit/roles/cloak_rd
|
||||
>>>>>>> 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
display_name = "cloak, research director"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/rd
|
||||
allowed_roles = list("Research Director")
|
||||
|
||||
<<<<<<< HEAD
|
||||
/datum/gear/suit/roles/poncho/cloak/qm
|
||||
||||||| parent of 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
/datum/gear/suit/roles/poncho/cloak_qm
|
||||
=======
|
||||
/datum/gear/suit/roles/cloak_qm
|
||||
>>>>>>> 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
display_name = "cloak, quartermaster"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/qm
|
||||
allowed_roles = list("Quartermaster")
|
||||
|
||||
<<<<<<< HEAD
|
||||
/datum/gear/suit/roles/poncho/cloak/captain
|
||||
||||||| parent of 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
/datum/gear/suit/roles/poncho/cloak_captain
|
||||
=======
|
||||
/datum/gear/suit/roles/cloak_captain
|
||||
>>>>>>> 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
display_name = "cloak, site manager"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/captain
|
||||
allowed_roles = list("Site Manager")
|
||||
|
||||
<<<<<<< HEAD
|
||||
/datum/gear/suit/roles/poncho/cloak/hop
|
||||
||||||| parent of 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
/datum/gear/suit/roles/poncho/cloak_hop
|
||||
=======
|
||||
/datum/gear/suit/roles/cloak_hop
|
||||
>>>>>>> 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
display_name = "cloak, head of personnel"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/hop
|
||||
allowed_roles = list("Head of Personnel")
|
||||
|
||||
<<<<<<< HEAD
|
||||
/datum/gear/suit/roles/poncho/cloak/cargo
|
||||
display_name = "cloak, cargo"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo
|
||||
|
||||
/datum/gear/suit/roles/poncho/cloak/mining
|
||||
display_name = "cloak, mining"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/mining
|
||||
|
||||
/datum/gear/suit/roles/poncho/cloak/security
|
||||
display_name = "cloak, security"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/security
|
||||
allowed_roles = list("Head of Security","Detective","Warden","Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
|
||||
|
||||
/datum/gear/suit/roles/poncho/cloak/service
|
||||
display_name = "cloak, service"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/service
|
||||
|
||||
/datum/gear/suit/roles/poncho/cloak/engineer
|
||||
display_name = "cloak, engineer"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/engineer
|
||||
|
||||
/datum/gear/suit/roles/poncho/cloak/atmos
|
||||
display_name = "cloak, atmos"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/atmos
|
||||
|
||||
/datum/gear/suit/roles/poncho/cloak/research
|
||||
display_name = "cloak, science"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/research
|
||||
|
||||
/datum/gear/suit/roles/poncho/cloak/medical
|
||||
display_name = "cloak, medical"
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/medical
|
||||
|
||||
/datum/gear/suit/roles/poncho/cloak/custom //A colorable cloak
|
||||
display_name = "cloak (colorable)"
|
||||
||||||| parent of 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
/datum/gear/suit/roles/poncho/cloak_custom //A colorable cloak
|
||||
display_name = "cloak, colorable"
|
||||
=======
|
||||
/datum/gear/suit/cloak_custom //A colorable cloak
|
||||
display_name = "cloak, colorable"
|
||||
>>>>>>> 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
path = /obj/item/clothing/accessory/poncho/roles/cloak/custom
|
||||
|
||||
/datum/gear/suit/cloak_custom/New()
|
||||
@@ -382,50 +286,49 @@
|
||||
path = /obj/item/clothing/suit/unathi/robe
|
||||
cost = 1
|
||||
|
||||
/datum/gear/suit/black_lawyer_jacket
|
||||
display_name = "suit jacket, black"
|
||||
/datum/gear/suit/lawyer_jackets
|
||||
display_name = "suit jacket selection"
|
||||
path = /obj/item/clothing/suit/storage/toggle/internalaffairs
|
||||
|
||||
/datum/gear/suit/blue_lawyer_jacket
|
||||
display_name = "suit jacket, blue"
|
||||
path = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket
|
||||
|
||||
/datum/gear/suit/purple_lawyer_jacket
|
||||
display_name = "suit jacket, purple"
|
||||
path = /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket
|
||||
/datum/gear/suit/lawyer_jackets/New()
|
||||
..()
|
||||
var/list/jackets = list(
|
||||
"Black suit jacket" = /obj/item/clothing/suit/storage/toggle/internalaffairs,
|
||||
"Blue suit jacket" = /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket,
|
||||
"Purple suit jacket" = /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket
|
||||
)
|
||||
gear_tweaks += new/datum/gear_tweak/path(jackets)
|
||||
|
||||
/datum/gear/suit/suspenders
|
||||
display_name = "suspenders"
|
||||
path = /obj/item/clothing/suit/suspenders
|
||||
|
||||
/datum/gear/suit/forensics
|
||||
display_name = "forensics long, red"
|
||||
display_name = "forensics uniform selection (Detective)"
|
||||
path = /obj/item/clothing/suit/storage/forensics/red/long
|
||||
allowed_roles = list("Detective")
|
||||
|
||||
/datum/gear/suit/forensics/blue
|
||||
display_name = "forensics long, blue"
|
||||
path = /obj/item/clothing/suit/storage/forensics/blue/long
|
||||
allowed_roles = list("Detective")
|
||||
/datum/gear/suit/forensics/New()
|
||||
..()
|
||||
var/list/uniforms = list(
|
||||
"Red, long uniform" = /obj/item/clothing/suit/storage/forensics/red/long,
|
||||
"Blue, long uniform" = /obj/item/clothing/suit/storage/forensics/blue/long,
|
||||
"Red, short uniform" = /obj/item/clothing/suit/storage/forensics/red,
|
||||
"Blue, short uniform" = /obj/item/clothing/suit/storage/forensics/blue
|
||||
)
|
||||
gear_tweaks += new/datum/gear_tweak/path(uniforms)
|
||||
|
||||
/datum/gear/suit/forensics/blue/short
|
||||
display_name = "forensics, blue"
|
||||
path = /obj/item/clothing/suit/storage/forensics/blue
|
||||
allowed_roles = list("Detective")
|
||||
/datum/gear/suit/qm_coat
|
||||
display_name = "coat, quartermaster"
|
||||
path = /obj/item/clothing/suit/storage/qm
|
||||
allowed_roles = list("Quartermaster")
|
||||
|
||||
<<<<<<< HEAD
|
||||
/datum/gear/suit/forensics/red/short
|
||||
display_name = "forensics, red"
|
||||
path = /obj/item/clothing/suit/storage/forensics/red
|
||||
allowed_roles = list("Detective")
|
||||
/datum/gear/suit/cargo_coat
|
||||
display_name = "coat, cargo tech"
|
||||
path = /obj/item/clothing/suit/storage/cargo
|
||||
allowed_roles = list("Quartermaster","Shaft Miner","Cargo Technician","Head of Personnel")
|
||||
|
||||
||||||| parent of 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
/obj/item/clothing/suit/storage/cargo
|
||||
|
||||
=======
|
||||
>>>>>>> 7ec7f1cdda... Merge pull request #11054 from VOREStation/Fixes/11052
|
||||
// winter coats go here
|
||||
|
||||
/datum/gear/suit/wintercoat
|
||||
display_name = "winter coat"
|
||||
path = /obj/item/clothing/suit/storage/hooded/wintercoat
|
||||
@@ -490,7 +393,6 @@
|
||||
path = /obj/item/clothing/suit/storage/hooded/wintercoat/science
|
||||
allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
|
||||
|
||||
|
||||
/datum/gear/suit/wintercoat/science/robotics
|
||||
display_name = "winter coat, robotics"
|
||||
path = /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics
|
||||
@@ -561,7 +463,6 @@
|
||||
/datum/gear/suit/wintercoat/cosmic
|
||||
display_name = "winter coat, cosmic"
|
||||
path = /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic
|
||||
|
||||
// winter coats end here
|
||||
|
||||
/datum/gear/suit/varsity
|
||||
@@ -589,20 +490,18 @@
|
||||
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(tracks))
|
||||
|
||||
/datum/gear/suit/flannel
|
||||
display_name = "grey flannel"
|
||||
display_name = "flannel jacket selection"
|
||||
path = /obj/item/clothing/suit/storage/flannel
|
||||
|
||||
/datum/gear/suit/flannel/red
|
||||
display_name = "red flannel"
|
||||
path = /obj/item/clothing/suit/storage/flannel/red
|
||||
|
||||
/datum/gear/suit/flannel/aqua
|
||||
display_name = "aqua flannel"
|
||||
path = /obj/item/clothing/suit/storage/flannel/aqua
|
||||
|
||||
/datum/gear/suit/flannel/brown
|
||||
display_name = "brown flannel"
|
||||
path = /obj/item/clothing/suit/storage/flannel/brown
|
||||
/datum/gear/suit/flannel/New()
|
||||
..()
|
||||
var/list/flannel = list(
|
||||
"Grey flannel" = /obj/item/clothing/suit/storage/flannel,
|
||||
"Red flannel" = /obj/item/clothing/suit/storage/flannel/red,
|
||||
"Aqua flannel" = /obj/item/clothing/suit/storage/flannel/aqua,
|
||||
"Brown flannel" = /obj/item/clothing/suit/storage/flannel/brown
|
||||
)
|
||||
gear_tweaks += new/datum/gear_tweak/path(flannel)
|
||||
|
||||
/datum/gear/suit/denim_jacket
|
||||
display_name = "denim jacket"
|
||||
@@ -628,25 +527,20 @@
|
||||
..()
|
||||
gear_tweaks += gear_tweak_free_color_choice
|
||||
|
||||
/datum/gear/suit/miscellaneous/sec_dep_jacket
|
||||
display_name = "department jacket, security"
|
||||
/datum/gear/suit/miscellaneous/dep_jacket
|
||||
display_name = "department jacket selection"
|
||||
path = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket
|
||||
|
||||
/datum/gear/suit/miscellaneous/engi_dep_jacket
|
||||
display_name = "department jacket, engineering"
|
||||
path = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket
|
||||
|
||||
/datum/gear/suit/miscellaneous/supply_dep_jacket
|
||||
display_name = "department jacket, supply"
|
||||
path = /obj/item/clothing/suit/storage/toggle/supply_dep_jacket
|
||||
|
||||
/datum/gear/suit/miscellaneous/sci_dep_jacket
|
||||
display_name = "department jacket, science"
|
||||
path = /obj/item/clothing/suit/storage/toggle/sci_dep_jacket
|
||||
|
||||
/datum/gear/suit/miscellaneous/med_dep_jacket
|
||||
display_name = "department jacket, medical"
|
||||
path = /obj/item/clothing/suit/storage/toggle/med_dep_jacket
|
||||
/datum/gear/suit/miscellaneous/dep_jacket/New()
|
||||
..()
|
||||
var/list/jacket = list(
|
||||
"Security department jacket" = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket,
|
||||
"Engineering department jacket" = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket,
|
||||
"Cargo department jacket" = /obj/item/clothing/suit/storage/toggle/supply_dep_jacket,
|
||||
"Science department jacket" = /obj/item/clothing/suit/storage/toggle/sci_dep_jacket,
|
||||
"Medical department jacket" = /obj/item/clothing/suit/storage/toggle/med_dep_jacket
|
||||
)
|
||||
gear_tweaks += new/datum/gear_tweak/path(jacket)
|
||||
|
||||
/datum/gear/suit/miscellaneous/peacoat
|
||||
display_name = "peacoat"
|
||||
@@ -700,4 +594,4 @@
|
||||
|
||||
/datum/gear/suit/miscellaneous/cardigan/New()
|
||||
..()
|
||||
gear_tweaks += gear_tweak_free_color_choice
|
||||
gear_tweaks += gear_tweak_free_color_choice
|
||||
|
||||
@@ -31,16 +31,20 @@
|
||||
path = /obj/item/clothing/suit/poncho
|
||||
|
||||
//Detective alternative
|
||||
/datum/gear/uniform/detective_alt
|
||||
display_name = "sleek modern coat, detective"
|
||||
/datum/gear/suit/detective_alt
|
||||
display_name = "sleek modern coat selection, detective"
|
||||
path = /obj/item/clothing/suit/storage/det_trench/alt
|
||||
allowed_roles = list("Head of Security", "Detective")
|
||||
|
||||
//Detective alternative
|
||||
/datum/gear/uniform/detective_alt2
|
||||
display_name = "sleek modern coat (long), detective"
|
||||
path = /obj/item/clothing/suit/storage/det_trench/alt2
|
||||
allowed_roles = list("Head of Security", "Detective")
|
||||
/datum/gear/suit/detective_alt/New()
|
||||
..()
|
||||
var/list/coats = list(
|
||||
"Modern coat (tan)" = /obj/item/clothing/suit/storage/det_trench/alt,
|
||||
"Modern coat (long, tan)" = /obj/item/clothing/suit/storage/det_trench/alt2,
|
||||
"Modern coat (black)" = /obj/item/clothing/suit/storage/det_trench/alt/black,
|
||||
"Modern coat (long, black)" = /obj/item/clothing/suit/storage/det_trench/alt2/black
|
||||
)
|
||||
gear_tweaks += new/datum/gear_tweak/path(coats)
|
||||
|
||||
//Emergency Responder jackets for Parameds & EMTs, but also general Medical Staff
|
||||
/datum/gear/suit/roles/medical/ems_jacket
|
||||
|
||||
@@ -235,4 +235,18 @@ Talon jumpsuit
|
||||
/datum/gear/uniform/talonbasic
|
||||
display_name = "ITV Jumpsuit"
|
||||
description = "A jumpsuit that is usually issued to ITV contractors, however others can purchase it to show their support towards ITV."
|
||||
path = /obj/item/clothing/under/rank/talon/basic
|
||||
path = /obj/item/clothing/under/rank/talon/basic
|
||||
|
||||
// Summer dresses
|
||||
/datum/gear/uniform/summerdress
|
||||
display_name = "summer dress selection"
|
||||
path = /obj/item/clothing/under/summerdress
|
||||
|
||||
/datum/gear/uniform/summerdress/New()
|
||||
..()
|
||||
var/list/dresses = list(
|
||||
"black and white" = /obj/item/clothing/under/summerdress,
|
||||
"blue and white" = /obj/item/clothing/under/summerdress/blue,
|
||||
"red and white" = /obj/item/clothing/under/summerdress/red
|
||||
)
|
||||
gear_tweaks += new/datum/gear_tweak/path(dresses)
|
||||
|
||||
Reference in New Issue
Block a user