cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a lot of clothes/armor/suits/spacesuits/rigs

Browse Source
This commit is contained in:
Chompstation Bot
2021-07-12 23:46:33 +00:00
committed by Darlantan
parent b246cfd374
commit b974746755
51 changed files with 2969 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/outfits/jobs/medical.dm
View File

@@ -92,7 +92,7 @@
/decl/hierarchy/outfit/job/medical/paramedic
name = OUTFIT_JOB_NAME("Paramedic")
uniform = /obj/item/clothing/under/rank/medical/scrubs/black
uniform = /obj/item/clothing/under/rank/medical/paramedic
suit = /obj/item/clothing/suit/storage/toggle/fr_jacket
shoes = /obj/item/clothing/shoes/boots/jackboots
l_hand = /obj/item/weapon/storage/firstaid/regular
@@ -103,5 +103,5 @@
/decl/hierarchy/outfit/job/medical/paramedic/emt
name = OUTFIT_JOB_NAME("Emergency Medical Technician")
uniform = /obj/item/clothing/under/rank/medical/paramedic
uniform = /obj/item/clothing/under/rank/medical/paramedic_alt
suit = /obj/item/clothing/suit/storage/toggle/labcoat/emt

6
code/datums/supplypacks/medical.dm
View File

@@ -202,7 +202,7 @@
/obj/item/clothing/under/rank/medical/paramedic,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/mask/gas,
/obj/item/clothing/under/rank/medical/paramedic,
/obj/item/clothing/under/rank/medical/paramedic_alt,
/obj/item/clothing/accessory/stethoscope,
/obj/item/weapon/storage/firstaid/adv,
/obj/item/clothing/shoes/boots/jackboots,
@@ -305,8 +305,8 @@
/datum/supply_pack/med/medicalbiosuits
name = "Medical biohazard gear"
contains = list(
/obj/item/clothing/head/bio_hood = 3,
/obj/item/clothing/suit/bio_suit = 3,
/obj/item/clothing/head/bio_hood/modern = 3,
/obj/item/clothing/suit/bio_suit/modern = 3,
/obj/item/clothing/head/bio_hood/virology = 2,
/obj/item/clothing/suit/bio_suit/cmo,
/obj/item/clothing/head/bio_hood/cmo,

31
code/game/machinery/gear_dispenser.dm
View File

@@ -80,15 +80,16 @@ var/list/dispenser_presets = list()
var/spawned = list()
voidsuit = new voidsuit_type(T)
spawned += voidsuit
spawned += voidsuit // We only add the voidsuit so the game doesn't try to put the tank/helmet/boots etc into their hands
// If we're supposed to make a helmet
if(voidhelmet_type)
// The coder may not have realized this type spawns its own helmet
if(voidsuit.helmet)
error("[src] created a voidsuit [voidsuit] and wants to add a helmet but it already has one")
else
voidsuit.attach_helmet(new voidhelmet_type())
spawned += voidhelmet
voidhelmet = new voidhelmet_type()
voidsuit.attach_helmet(voidhelmet)
// If we're supposed to make boots
if(magboots_type)
// The coder may not have realized thist ype spawns its own boots
@@ -97,7 +98,6 @@ var/list/dispenser_presets = list()
else
magboots = new magboots_type(voidsuit)
voidsuit.boots = magboots
spawned += magboots
if(refit)
voidsuit.refit_for_species(user.species?.get_bodytype()) // does helmet and boots if they're attached
@@ -109,7 +109,6 @@ var/list/dispenser_presets = list()
else
var/obj/item/life_support = new /obj/item/device/suit_cooling_unit(voidsuit)
voidsuit.cooler = life_support
spawned += life_support
else if(user.species?.breath_type)
if(voidsuit.tank)
error("[src] created a voidsuit [voidsuit] and wants to add a tank but it already has one")
@@ -121,7 +120,6 @@ var/list/dispenser_presets = list()
if(tankpath)
var/obj/item/life_support = new tankpath(voidsuit)
voidsuit.tank = life_support
spawned += life_support
else
voidsuit.audible_message("Dispenser warning: Unable to locate suitable airtank for user.")
@@ -567,6 +565,27 @@ var/list/dispenser_presets = list()
one_setting = /datum/gear_disp/voidsuit/autolok
special_frame = "frame_grey"
////////////////////////////// MOEBIUS SUIT DISPENSERS ///////////////////////////
/datum/gear_disp/voidsuit/aether
name = "Aether Voidsuit"
voidsuit_type = /obj/item/clothing/suit/space/void/aether
voidhelmet_type = /obj/item/clothing/head/helmet/space/void/aether
refit = FALSE // No animal sprites AAA!
/obj/machinery/gear_dispenser/suit/aether
name = "\improper Aether Voidsuit Dispenser"
desc = "An industrial U-Tak-It Dispenser unit designed to fetch a specific Aether-produced high-end suit."
icon_state = "suitdispenserMB"
dispenser_flags = GD_ONEITEM|GD_NOGREED|GD_UNLIMITED
one_setting = /datum/gear_disp/voidsuit/aether
/obj/machinery/gear_dispenser/suit_fancy/aether
name = "\improper Aether Voidsuit Dispenser"
desc = "A commercial U-Tak-It Dispenser unit designed to fetch a specific Aether-produced high-end suit."
dispenser_flags = GD_ONEITEM|GD_NOGREED|GD_UNLIMITED
one_setting = /datum/gear_disp/voidsuit/aether
special_frame = "frame_purple"
// Adminbuse
/obj/machinery/gear_dispenser/vv_get_dropdown()
. = ..()

2
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View File

@@ -33,6 +33,7 @@
/obj/item/clothing/under/rank/nurse,
/obj/item/clothing/under/rank/orderly,
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/shoes/white,
/obj/item/weapon/cartridge/medical,
@@ -127,6 +128,7 @@
/obj/item/clothing/under/rank/chief_medical_officer/skirt,
/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
/obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo,
/obj/item/weapon/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/shoes/brown,

2
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
View File

@@ -33,6 +33,7 @@
/obj/item/clothing/under/rank/research_director/rdalt,
/obj/item/clothing/under/rank/research_director/dress_rd,
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/weapon/cartridge/rd,
/obj/item/clothing/shoes/white,
/obj/item/clothing/shoes/laceup/brown,
@@ -54,6 +55,7 @@
starts_with = list(
/obj/item/clothing/under/rank/scientist,
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/clothing/shoes/white,
/obj/item/weapon/melee/umbrella, // vorestation addition,
/obj/item/clothing/glasses/science,

1
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
View File

@@ -220,6 +220,7 @@
/obj/item/clothing/under/rank/scientist/skirt = 2,
/obj/item/clothing/under/rank/scientist/turtleneck = 3,
/obj/item/clothing/suit/storage/toggle/labcoat = 3,
/obj/item/clothing/suit/storage/toggle/labcoat/modern = 3,
/obj/item/clothing/shoes/white = 3,
/obj/item/clothing/shoes/slippers = 3,
/obj/item/clothing/suit/storage/hooded/wintercoat/science,

2
code/modules/admin/view_variables/topic_list.dm
View File

@@ -10,7 +10,7 @@
mod_list(target, null, "list", "contents", target_index, autodetect_class = FALSE)
if(href_list[VV_HK_LIST_REMOVE])
var/variable = target[target_index]
var/prompt = tgui_alert(usr, "Do you want to remove item number [target_index] from list?", "Confirm", "Yes", "No")
var/prompt = tgui_alert(usr, "Do you want to remove item number [target_index] from list?", "Confirm", list("Yes", "No"))
if (prompt != "Yes")
return
target.Cut(target_index, target_index+1)

2
code/modules/busy_space_vr/organizations.dm
View File

@@ -1402,7 +1402,7 @@
//////////////////////////////////////////////////////////////////////////////////
// Other
/datum/lore/organization/other/kitsuhana //sorry KHI, but you're not a coherent stellar government, and you're definitely not a TSC. you get to go in the Others pool.
/datum/lore/organization/other/kitsuhana //sorry KHI, but you're not a coherent stellar government, and you're definitely not a TSC. you get to go in the Others pool. //makes sense to me!
name = "Kitsuhana Heavy Industries"
short_name = "" //whitespace haaaack
desc = "A large post-scarcity amalgamation of races, Kitsuhana is no longer a company but rather a loose association of 'members' \

263
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -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,61 +204,76 @@
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
/datum/gear/suit/roles/poncho/New()
..()
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(ponchos)
/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/cloak
display_name = "cloak selection, departments"
path = /obj/item/clothing/accessory/poncho/roles/cloak/cargo
/datum/gear/suit/roles/poncho/science
display_name = "poncho, science"
path = /obj/item/clothing/accessory/poncho/roles/science
/datum/gear/suit/roles/cloak/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
)
gear_tweaks += new/datum/gear_tweak/path(cloaks)
/datum/gear/suit/roles/poncho/cloak/hos
/datum/gear/suit/roles/poncho/cloak_hos
display_name = "cloak, head of security"
path = /obj/item/clothing/accessory/poncho/roles/cloak/hos
allowed_roles = list("Head of Security")
/datum/gear/suit/roles/poncho/cloak/cmo
/datum/gear/suit/roles/poncho/cloak_cmo
display_name = "cloak, chief medical officer"
path = /obj/item/clothing/accessory/poncho/roles/cloak/cmo
allowed_roles = list("Chief Medical Officer")
/datum/gear/suit/roles/poncho/cloak/ce
/datum/gear/suit/roles/poncho/cloak_ce
display_name = "cloak, chief engineer"
path = /obj/item/clothing/accessory/poncho/roles/cloak/ce
allowed_roles = list("Chief Engineer")
/datum/gear/suit/roles/poncho/cloak/rd
/datum/gear/suit/roles/poncho/cloak_rd
display_name = "cloak, research director"
path = /obj/item/clothing/accessory/poncho/roles/cloak/rd
allowed_roles = list("Research Director")
/datum/gear/suit/roles/poncho/cloak/qm
/datum/gear/suit/roles/poncho/cloak_qm
display_name = "cloak, quartermaster"
path = /obj/item/clothing/accessory/poncho/roles/cloak/qm
allowed_roles = list("Quartermaster")
/datum/gear/suit/roles/poncho/cloak/captain
/datum/gear/suit/roles/poncho/cloak_captain
display_name = "cloak, site manager"
path = /obj/item/clothing/accessory/poncho/roles/cloak/captain
allowed_roles = list("Site Manager")
/datum/gear/suit/roles/poncho/cloak/hop
/datum/gear/suit/roles/poncho/cloak_hop
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
@@ -293,6 +309,45 @@
/datum/gear/suit/roles/poncho/cloak/custom //A colorable cloak
display_name = "cloak (colorable)"
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
/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
/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)"
=======
/datum/gear/suit/roles/poncho/cloak_custom //A colorable cloak
display_name = "cloak, colorable"
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
path = /obj/item/clothing/accessory/poncho/roles/cloak/custom
/datum/gear/suit/roles/poncho/cloak/custom/New()
@@ -304,44 +359,51 @@
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")
/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")
/obj/item/clothing/suit/storage/cargo
// winter coats go here
/datum/gear/suit/wintercoat
display_name = "winter coat"
path = /obj/item/clothing/suit/storage/hooded/wintercoat
@@ -406,7 +468,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
@@ -477,7 +538,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
@@ -505,20 +565,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"
@@ -544,25 +602,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"

18
code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
View File

@@ -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

14
code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm
View File

@@ -236,3 +236,17 @@ Talon jumpsuit
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
// 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)

2122
code/modules/clothing/clothing.dm
View File

File diff suppressed because it is too large Load Diff

1
code/modules/clothing/spacesuits/rig/modules/modules.dm
View File

@@ -41,6 +41,7 @@
// Icons.
var/suit_overlay
var/suit_overlay_icon = 'icons/mob/rig_modules.dmi'
var/suit_overlay_active // If set, drawn over icon and mob when effect is active.
var/suit_overlay_inactive // As above, inactive.
var/suit_overlay_used // As above, when engaged.

5
code/modules/clothing/spacesuits/rig/modules/utility.dm
View File

@@ -8,7 +8,6 @@
* /obj/item/rig_module/device/arch_drill
* /obj/item/rig_module/device/anomaly_scanner
* /obj/item/rig_module/maneuvering_jets
* /obj/item/rig_module/foam_sprayer
* /obj/item/rig_module/device/broadcaster
* /obj/item/rig_module/chem_dispenser
* /obj/item/rig_module/chem_dispenser/injector
@@ -411,11 +410,7 @@
jets.holder = null
jets.ion_trail.set_up(jets)
/obj/item/rig_module/foam_sprayer
//Deployable Mop
/obj/item/rig_module/mounted/mop
name = "mop projector"

42
code/modules/clothing/spacesuits/rig/rig.dm
View File

@@ -7,7 +7,6 @@
*/
/obj/item/weapon/rig
name = "hardsuit control module"
icon = 'icons/obj/rig_modules.dmi'
desc = "A back-mounted hardsuit deployment and control mechanism."
@@ -27,6 +26,8 @@
unacidable = 1
preserve_item = 1
var/default_mob_icon = 'icons/mob/rig_back.dmi'
var/suit_state //The string used for the suit's icon_state.
var/interface_path = "RIGSuit"
@@ -98,22 +99,8 @@
var/datum/effect/effect/system/spark_spread/spark_system
var/datum/mini_hud/rig/minihud
/obj/item/weapon/rig/examine()
. = ..()
if(wearer)
for(var/obj/item/piece in list(helmet,gloves,chest,boots))
if(!piece || piece.loc != wearer)
continue
. += "[bicon(piece)] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed."
if(src.loc == usr)
. += "The access panel is [locked? "locked" : "unlocked"]."
. += "The maintenance panel is [open ? "open" : "closed"]."
. += "Hardsuit systems are [offline ? "<span class='warning'>offline</span>" : "<span class='notice'>online</span>"]."
. += "The cooling stystem is [cooling_on ? "active" : "inactive"]."
if(open)
. += "It's equipped with [english_list(installed_modules)]."
// Action button
action_button_name = "Hardsuit Interface"
/obj/item/weapon/rig/New()
..()
@@ -186,6 +173,23 @@
spark_system = null
return ..()
/obj/item/weapon/rig/examine()
. = ..()
if(wearer)
for(var/obj/item/piece in list(helmet,gloves,chest,boots))
if(!piece || piece.loc != wearer)
continue
. += "[bicon(piece)] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed."
if(src.loc == usr)
. += "The access panel is [locked? "locked" : "unlocked"]."
. += "The maintenance panel is [open ? "open" : "closed"]."
. += "Hardsuit systems are [offline ? "<span class='warning'>offline</span>" : "<span class='notice'>online</span>"]."
. += "The cooling stystem is [cooling_on ? "active" : "inactive"]."
if(open)
. += "It's equipped with [english_list(installed_modules)]."
// We only care about processing when we're on a mob
/obj/item/weapon/rig/Moved(old_loc, direction, forced)
if(ismob(loc))
@@ -589,7 +593,7 @@
cut_overlays()
if(!mob_icon || update_mob_icon)
var/species_icon = 'icons/mob/rig_back.dmi'
var/species_icon = default_mob_icon
// Since setting mob_icon will override the species checks in
// update_inv_wear_suit(), handle species checks here.
if(wearer && sprite_sheets && sprite_sheets[wearer.species.get_bodytype(wearer)])
@@ -599,7 +603,7 @@
if(installed_modules.len)
for(var/obj/item/rig_module/module in installed_modules)
if(module.suit_overlay)
chest.add_overlay(image('icons/mob/rig_modules.dmi', icon_state = "[module.suit_overlay]", dir = SOUTH))
chest.add_overlay(image(module.suit_overlay_icon, icon_state = "[module.suit_overlay]", dir = SOUTH))
if(wearer)
wearer.update_inv_shoes()

5
code/modules/clothing/spacesuits/rig/rig_verbs.dm
View File

@@ -9,6 +9,11 @@
if(wearer && (wearer.back == src || wearer.belt == src))
tgui_interact(usr)
// So the UI button clicks come here
/obj/item/weapon/rig/ui_action_click()
if(usr == wearer && (wearer.back == src || wearer.belt == src))
tgui_interact(usr)
/obj/item/weapon/rig/verb/toggle_vision()
set name = "Toggle Visor"

125
code/modules/clothing/spacesuits/rig/suits/station_vr.dm
View File

@@ -53,3 +53,128 @@
/obj/item/weapon/rig/robotics
allowed = list(/obj/item/device/flashlight, /obj/item/weapon/storage/box, /obj/item/weapon/storage/belt, /obj/item/device/defib_kit/compact)
// 'Technomancer' hardsuit
/obj/item/weapon/rig/focalpoint
name = "\improper F.P.E. hardsuit control module"
desc = "A high-end hardsuit produced by Focal Point Energistics, focused around repair and construction."
icon = 'icons/obj/rig_modules_vr.dmi' // the item
default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob
icon_state = "techno_rig"
suit_type = "\improper F.P.E. hardsuit"
cell_type = /obj/item/weapon/cell/hyper
// Copied from CE rig
slowdown = 0
offline_slowdown = 0
offline_vision_restriction = 0
rigsuit_max_pressure = 20 * ONE_ATMOSPHERE // Max pressure the rig protects against when sealed
rigsuit_min_pressure = 0 // Min pressure the rig protects against when sealed
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE // so it's like a rig firesuit
armor = list("melee" = 40, "bullet" = 10, "laser" = 30, "energy" = 55, "bomb" = 70, "bio" = 100, "rad" = 100)
chest_type = /obj/item/clothing/suit/space/rig/focalpoint
helm_type = /obj/item/clothing/head/helmet/space/rig/focalpoint
boot_type = /obj/item/clothing/shoes/magboots/rig/focalpoint
glove_type = /obj/item/clothing/gloves/gauntlets/rig/focalpoint
/obj/item/weapon/rig/focalpoint/equipped
initial_modules = list(
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/teleporter, // Try not to set yourself on fire
/obj/item/rig_module/device/rcd,
/obj/item/rig_module/grenade_launcher/metalfoam
)
/obj/item/clothing/head/helmet/space/rig/focalpoint
icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "techno_rig"
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/suit/space/rig/focalpoint
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "techno_rig"
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/shoes/magboots/rig/focalpoint
icon = 'icons/inventory/feet/item_vr.dmi'
default_worn_icon = 'icons/inventory/feet/mob_vr.dmi'
icon_state = "techno_rig"
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/gloves/gauntlets/rig/focalpoint
icon = 'icons/inventory/hands/item_vr.dmi'
default_worn_icon = 'icons/inventory/hands/mob_vr.dmi'
icon_state = "techno_rig"
siemens_coefficient = 0
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
// 'Ironhammer' hardsuit
/obj/item/weapon/rig/hephaestus
name = "\improper Hephaestus hardsuit control module"
desc = "A high-end hardsuit produced by Hephaestus Industries, focused on destroying the competition. Literally."
icon = 'icons/obj/rig_modules_vr.dmi' // the item
default_mob_icon = 'icons/mob/rig_back_vr.dmi' // the onmob
icon_state = "ihs_rig"
suit_type = "\improper Hephaestus hardsuit"
cell_type = /obj/item/weapon/cell/super
armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 60, "bio" = 100, "rad" = 20)
chest_type = /obj/item/clothing/suit/space/rig/hephaestus
helm_type = /obj/item/clothing/head/helmet/space/rig/hephaestus
boot_type = /obj/item/clothing/shoes/magboots/rig/hephaestus
glove_type = /obj/item/clothing/gloves/gauntlets/rig/hephaestus
/obj/item/weapon/rig/hephaestus/equipped
initial_modules = list(
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/grenade_launcher,
/obj/item/rig_module/mounted/egun,
/obj/item/rig_module/mounted/energy_blade
)
/obj/item/clothing/head/helmet/space/rig/hephaestus
icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "ihs_rig"
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/suit/space/rig/hephaestus
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "ihs_rig"
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/shoes/magboots/rig/hephaestus
icon = 'icons/inventory/feet/item_vr.dmi'
default_worn_icon = 'icons/inventory/feet/mob_vr.dmi'
icon_state = "ihs_rig"
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/gloves/gauntlets/rig/hephaestus
icon = 'icons/inventory/hands/item_vr.dmi'
default_worn_icon = 'icons/inventory/hands/mob_vr.dmi'
icon_state = "ihs_rig"
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()

157
code/modules/clothing/spacesuits/void/event_vr.dm
View File

@@ -74,3 +74,160 @@
/obj/item/clothing/suit/space/void/refurb/mercenary/talon
name = "talon mercenary's voidsuit"
desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer mercs swear by these old things, even if new powered hardsuits have more features and better armor. The red markings indicate this as the mercenary variant. \"ITV TALON\" has been stamped onto each pauldron and the right side of the breastplate."
// HEV Suits
/obj/item/clothing/suit/space/void/hev
name = "hazardous environment suit"
desc = "Has a strange smell to it, but you feel like it might be an old friend."
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "hev_orange"
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/suit/space/void/hev/violet
icon_state = "hev_violet"
desc = "Has a strange smell to it, but you feel like it might be an old friend. This one has 'Dr. Coomer' engraved on the collar."
/obj/item/clothing/head/helmet/space/void/hev
name = "hazardous environment helmet"
desc = "Has a strange smell to it, but you feel like it might be an old friend."
icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "hev_orange"
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/head/helmet/space/void/hev/violet
icon_state = "hev_violet"
desc = "Has a strange smell to it, but you feel like it might be an old friend. This one has 'Dr. Coomer' engraved on the collar."
// Makeshift void suit
/obj/item/clothing/suit/space/void/makeshift
name = "makeshift voidsuit"
desc = "This is not something you should use if you have other options, but it's better than nothing!"
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "makeshift_void"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0)
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/head/helmet/space/void/makeshift
name = "makeshift voidsuit helmet"
desc = "This is not something you should use if you have other options, but it's better than nothing!"
icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "makeshift_void"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0)
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
// 'Custodian' armor
/obj/item/clothing/suit/space/void/custodian
name = "custodian suit"
desc = "Vacuum-capable armor for a Custodian to do their duty."
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "custodian"
armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20)
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/head/helmet/space/void/custodian
name = "custodian helmet"
desc = "Vacuum-capable helmet for a Custodian to do their duty."
icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "custodian"
armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20)
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
// 'Moebius' armor
/obj/item/clothing/suit/space/void/aether
name = "\improper Aether voidsuit"
desc = "This suit seems rather high-end for a standard voidsuit. The air in it has a hint of 'new car smell', courtesy of Aether Atmospherics."
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "moebiussuit"
armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 20)
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/head/helmet/space/void/aether
name = "\improper Aether voidsuit helmet"
desc = "Aether Atmospherics thought that giving this helmet selectable colored lighting would improve market penetration. Very comfortable, regardless."
icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "moebiushelm_White"
armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 20, "bomb" = 20, "bio" = 100, "rad" = 20)
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/head/helmet/space/void/aether/verb/select_color()
set name = "Helmet Color"
set desc = "Change the color of [src]"
set category = "Object"
var/choice = tgui_input_list(usr, "Select a new color:", "[src] Color", list("White", "Blue", "Purple", "Yellow", "Red", "Green"))
if(!choice)
return
icon_state = "moebiushelm_[choice]"
update_clothing_icon()
to_chat(usr, "<span class='notice'>[src] color changed to: [choice]</span>")
// Excelsior suit
/obj/item/clothing/suit/space/void/excelsior
name = "\improper Excelsior voidsuit"
desc = "A space suit from a particular spaceship: Excelsior."
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "excelsior"
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()
/obj/item/clothing/head/helmet/space/void/excelsior
name = "\improper Excelsior voidsuit helmet"
desc = "A space helmet from a particular spaceship: Excelsior."
icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "excelsior"
// No animal people sprites for these yet, sad times
species_restricted = list("exclude", SPECIES_TESHARI, SPECIES_VOX, SPECIES_DIONA)
sprite_sheets = list()

21
code/modules/clothing/suits/armor_vr.dm
View File

@@ -118,3 +118,24 @@
/obj/item/clothing/suit/armor/pcarrier/explorer/deluxe
name = "modular explorer suit"
desc = "A modification of the explorer suit with a modular armor system. Requires you to insert armor plates."
// 'Crusader' armor
/obj/item/clothing/suit/armor/crusader
name = "crusader armor"
desc = "God will protect those who defend his faith."
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 30, "bio" = 0, "rad" = 0)
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "crusader_suit"
/obj/item/clothing/head/helmet/crusader
name = "crusader helmet"
desc = "God will protect those who defend his faith."
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 30, "bio" = 0, "rad" = 0)
icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "crusader_head"

18
code/modules/clothing/suits/jobs_vr.dm Normal file
View File

@@ -0,0 +1,18 @@
// Cargotech jacket
/obj/item/clothing/suit/storage/cargo
name = "cargo jacket"
desc = "A jacket typically assigned to cargo technicians when it's chilly in cargonia."
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "cargo_jacket"
// QM Coat
/obj/item/clothing/suit/storage/qm
name = "\improper QM coat"
desc = "A coat typically assigned to quartermasters when it's chilly in cargonia."
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "qm_coat"

27
code/modules/clothing/suits/labcoat_vr.dm Normal file
View File

@@ -0,0 +1,27 @@
// 'Modern' labcoats
/obj/item/clothing/suit/storage/toggle/labcoat/modern
name = "modern labcoat"
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "labcoat_mod"
/obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo
name = "modern cmo's labcoat"
desc = "A suit that protects against minor chemical spills. This one has distinct markings on the arms."
icon_state = "labcoat_cmo_mod"
// 'Modern' biosuits
/obj/item/clothing/suit/bio_suit/modern
name = "modern bio suit"
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "bio_mod"
/obj/item/clothing/head/bio_hood/modern
name = "modern bio hood"
icon = 'icons/inventory/head/item_vr.dmi'
default_worn_icon = 'icons/inventory/head/mob_vr.dmi'
icon_state = "bio_mod"

46
code/modules/clothing/suits/miscellaneous_vr.dm
View File

@@ -88,18 +88,40 @@
/obj/item/clothing/suit/storage/det_trench/alt
name = "sleek modern coat"
desc = "A sleek overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside."
<<<<<<< HEAD
icon = 'icons/obj/clothing/suits_vr.dmi'
icon_override = 'icons/mob/suit_vr.dmi'
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
icon = 'icons/inventory/suit/item_vr.dmi'
icon_override = 'icons/inventory/suit/mob_vr.dmi'
=======
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
icon_state = "cyberpunksleek"
item_state = "cyberpunksleek"
/obj/item/clothing/suit/storage/det_trench/alt2
name = "sleek modern coat (long)"
desc = "A sleek long overcoat made of neo-laminated fabric. Has a reasonably sized pocket on the inside."
<<<<<<< HEAD
icon = 'icons/obj/clothing/suits_vr.dmi'
icon_override = 'icons/mob/suit_vr.dmi'
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
icon = 'icons/inventory/suit/item_vr.dmi'
icon_override = 'icons/inventory/suit/mob_vr.dmi'
=======
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
icon_state = "cyberpunksleek_long"
item_state = "cyberpunksleek_long"
/obj/item/clothing/suit/storage/det_trench/alt/black
icon_state = "cyberpunksleek_black"
/obj/item/clothing/suit/storage/det_trench/alt2/black
icon_state = "cyberpunksleek_long_black"
//Talon Hoodie
/obj/item/clothing/suit/storage/toggle/hoodie/talon
@@ -109,3 +131,23 @@
icon_override = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "talonhoodie"
item_state_slots = list(slot_r_hand_str = "suit_blue", slot_l_hand_str = "suit_blue")
// Bladerunner coat
/obj/item/clothing/suit/storage/bladerunner
name = "leather coat"
desc = "An old leather coat. Has probably seen things you wouldn't believe."
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "bladerunner_coat"
// Cyberpunk 'orange' vest
/obj/item/clothing/suit/cyberpunk
name = "cyberpunk vest"
desc = "A red vest with golden streaks. It's made out of tough materials, and can protect fairly well against bullets. Wake the fuck up, Samurai."
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "cyberpunk"
armor = list("melee" = 10, "bullet" = 20, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0)

9
code/modules/clothing/under/jobs/medsci.dm
View File

@@ -122,6 +122,15 @@
rolled_sleeves = -1
/obj/item/clothing/under/rank/medical/paramedic
name = "paramedic uniform"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is the color scheme that designates a rapid first responder."
icon_state = "paramedic"
item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
rolled_down = -1
rolled_sleeves = -1
/obj/item/clothing/under/rank/medical/paramedic_alt
name = "short sleeve medical jumpsuit"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one has a cross on the chest denoting that the wearer is trained medical personnel."
icon_state = "medical_short"

28
code/modules/clothing/under/miscellaneous_vr.dm
View File

@@ -197,3 +197,31 @@
icon_state = "talon_captain"
item_state = "talon_captain"
rolled_sleeves = 0
// Excelsior uniforms
/obj/item/clothing/under/excelsior
name = "\improper Excelsior uniform"
desc = "A uniform from a particular spaceship: Excelsior."
icon = 'icons/inventory/uniform/item_vr.dmi'
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "excelsior_white"
/obj/item/clothing/under/excelsior/mixed
icon_state = "excelsior_mixed"
/obj/item/clothing/under/excelsior/orange
icon_state = "excelsior_orange"
// Summer dresses
/obj/item/clothing/under/summerdress
name = "summer dress"
desc = "A nice summer dress."
icon = 'icons/inventory/uniform/item_vr.dmi'
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "summerdress"
/obj/item/clothing/under/summerdress/red
icon_state = "summerdress3"
/obj/item/clothing/under/summerdress/blue
icon_state = "summerdress2"

3
code/modules/economy/vending_machines.dm
View File

@@ -1156,6 +1156,7 @@
/obj/item/clothing/head/surgery/black = 5,
/obj/item/clothing/shoes/white = 5,
/obj/item/clothing/suit/storage/toggle/labcoat = 5,
/obj/item/clothing/suit/storage/toggle/labcoat/modern = 5,
/obj/item/clothing/mask/surgical = 5,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical = 5,
/obj/item/clothing/shoes/boots/winter/medical = 5
@@ -1227,6 +1228,7 @@
/obj/item/clothing/under/rank/scientist/skirt = 5,
/obj/item/clothing/under/rank/scientist/turtleneck = 5,
/obj/item/clothing/suit/storage/toggle/labcoat = 5,
/obj/item/clothing/suit/storage/toggle/labcoat/modern = 5,
/obj/item/clothing/shoes/white = 5,
/obj/item/clothing/shoes/slippers = 5,
/obj/item/clothing/suit/storage/hooded/wintercoat/science = 5,
@@ -1348,6 +1350,7 @@
/obj/item/clothing/under/rank/cargotech/jeans = 5,
/obj/item/clothing/under/rank/cargotech/jeans/female = 5,
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo = 5,
/obj/item/clothing/suit/storage/cargo = 5,
/obj/item/clothing/shoes/boots/winter/supply = 5,
/obj/item/clothing/shoes/black = 5,
/obj/item/clothing/gloves/black = 5,

11
code/modules/mob/living/carbon/human/human_species.dm
View File

@@ -22,6 +22,17 @@
. = ..()
delete_inventory()
/mob/living/carbon/human/dummy/mannequin/autoequip
icon = 'icons/effects/species.dmi'
icon_state = "lizard_f_s_full"
/mob/living/carbon/human/dummy/mannequin/autoequip/Initialize()
icon = null
icon_state = ""
. = ..()
for(var/obj/item/I in loc)
equip_to_appropriate_slot(I)
/mob/living/carbon/human/skrell/Initialize(var/new_loc)
h_style = "Skrell Short Tentacles"
return ..(new_loc, SPECIES_SKRELL)

141
code/modules/vore/fluffstuff/custom_clothes_vr.dm
View File

@@ -889,74 +889,166 @@ No. With a teleporter? Just *no*. - Hawk, YW
//catalogue_data = list(/datum/category_item/catalogue/information/organization/khi)
sensor_mode = 3
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "khi_uniform_i"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = ""
icon = 'icons/inventory/uniform/item_vr.dmi'
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "khi_uniform"
/obj/item/clothing/under/rank/khi/cmd //Command version
<<<<<<< HEAD
name = "GE command suit" //CHOMPedit: Change to GE
desc = "Gilthari Exports uniform. An extra-comfortable command one, at that." //CHOMPedit
icon_state = "khi_uniform_cmd_i"
item_state = "khi_uniform_cmd"
worn_state = "khi_uniform_cmd"
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
name = "KHI command suit"
desc = "Kitsuhana Heavy Industries uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason."
icon_state = "khi_uniform_cmd_i"
item_state = "khi_uniform_cmd"
worn_state = "khi_uniform_cmd"
=======
name = "KHI command suit"
desc = "Kitsuhana Heavy Industries uniform. An extra-comfortable command one, at that. I guess if you DON'T want anarchy for some reason."
icon_state = "khi_uniform_cmd"
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/khi/sec //Security version
<<<<<<< HEAD
name = "GE security suit" //CHOMPedit: Change to GE
desc = "Gilthari Exports uniform. This one has angry red security stripes. Keepin' the peace in style." //CHOMPedit
icon_state = "khi_uniform_sec_i"
item_state = "khi_uniform_sec"
worn_state = "khi_uniform_sec"
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
name = "KHI security suit"
desc = "Kitsuhana Heavy Industries uniform. This one has angry red security stripes. Keepin' the peace in style."
icon_state = "khi_uniform_sec_i"
item_state = "khi_uniform_sec"
worn_state = "khi_uniform_sec"
=======
name = "KHI security suit"
desc = "Kitsuhana Heavy Industries uniform. This one has angry red security stripes. Keepin' the peace in style."
icon_state = "khi_uniform_sec"
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/khi/med //Medical version
<<<<<<< HEAD
name = "GE medical suit" //CHOMPedit: Change to GE
desc = "Gilthari Exports uniform. The medical version. Why not just get a new body, anyway?"//CHOMPedit
icon_state = "khi_uniform_med_i"
item_state = "khi_uniform_med"
worn_state = "khi_uniform_med"
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
name = "KHI medical suit"
desc = "Kitsuhana Heavy Industries uniform. The medical version. Why not just get a new body, anyway?"
icon_state = "khi_uniform_med_i"
item_state = "khi_uniform_med"
worn_state = "khi_uniform_med"
=======
name = "KHI medical suit"
desc = "Kitsuhana Heavy Industries uniform. The medical version. Why not just get a new body, anyway?"
icon_state = "khi_uniform_med"
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
/obj/item/clothing/under/rank/khi/eng //Engineering version
<<<<<<< HEAD
name = "GE engineering suit" //CHOMPedit: Change to GE
desc = "Gilthari Exports uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time." //CHOMPedit
icon_state = "khi_uniform_eng_i"
item_state = "khi_uniform_eng"
worn_state = "khi_uniform_eng"
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
name = "KHI engineering suit"
desc = "Kitsuhana Heavy Industries uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time."
icon_state = "khi_uniform_eng_i"
item_state = "khi_uniform_eng"
worn_state = "khi_uniform_eng"
=======
name = "KHI engineering suit"
desc = "Kitsuhana Heavy Industries uniform. One fit for an engineer, by the looks of it. Building the future, one disaster at a time."
icon_state = "khi_uniform_eng"
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 10)
/obj/item/clothing/under/rank/khi/sci //Science version
<<<<<<< HEAD
name = "GE science suit" //CHOMPedit: Change to GE
desc = "Gilthari Exports uniform. For performing science in, based on the color! Only SCIENCE can save us now." //CHOMPedit
icon_state = "khi_uniform_sci_i"
item_state = "khi_uniform_sci"
worn_state = "khi_uniform_sci"
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
name = "KHI science suit"
desc = "Kitsuhana Heavy Industries uniform. For performing science in, based on the color! Only SCIENCE can save us now."
icon_state = "khi_uniform_sci_i"
item_state = "khi_uniform_sci"
worn_state = "khi_uniform_sci"
=======
name = "KHI science suit"
desc = "Kitsuhana Heavy Industries uniform. For performing science in, based on the color! Only SCIENCE can save us now."
icon_state = "khi_uniform_sci"
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0)
/obj/item/clothing/under/rank/khi/crg //Cargo version
<<<<<<< HEAD
name = "GE cargo suit" //CHOMPedit: Change to GE
desc = "A sleek cargo uniform from Gilthari Exports." //CHOMPedit
icon_state = "khi_uniform_crg_i"
item_state = "khi_uniform_crg"
worn_state = "khi_uniform_crg"
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
name = "KHI cargo suit"
desc = "Kitsuhana Heavy Industries uniform. Looks like it's in supply and cargo division colors. Even post-scarcity societies need things moved and mined sometimes."
icon_state = "khi_uniform_crg_i"
item_state = "khi_uniform_crg"
worn_state = "khi_uniform_crg"
=======
name = "KHI cargo suit"
desc = "Kitsuhana Heavy Industries uniform. Looks like it's in supply and cargo division colors. Even post-scarcity societies need things moved and mined sometimes."
icon_state = "khi_uniform_crg"
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/khi/civ //Science version
<<<<<<< HEAD
name = "GE civilian suit" //CHOMPedit: Change to GE
desc = "A sleek civilian uniform from Gilthari Exports." //CHOMPedit
icon_state = "khi_uniform_civ_i"
item_state = "khi_uniform_civ"
worn_state = "khi_uniform_civ"
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
name = "KHI civilian suit"
desc = "Kitsuhana Heavy Industries uniform. Snazzy silver trim marks this is as the general civilian branch. Smells like paperwork and bureaucracy."
icon_state = "khi_uniform_civ_i"
item_state = "khi_uniform_civ"
worn_state = "khi_uniform_civ"
=======
name = "KHI civilian suit"
desc = "Kitsuhana Heavy Industries uniform. Snazzy silver trim marks this is as the general civilian branch. Smells like paperwork and bureaucracy."
icon_state = "khi_uniform_civ"
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/rank/khi/fluff/aronai //Aro fluff version
name = "KHI meditech suit"
<<<<<<< HEAD
desc = "An outdated uniform of some sort. You get the sense that whoever wore this must've been very full of themselves"
icon_state = "khi_uniform_aro_i"
item_state = "khi_uniform_aro"
worn_state = "khi_uniform_aro"
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
desc = "Kitsuhana Heavy Industries uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top."
icon_state = "khi_uniform_aro_i"
item_state = "khi_uniform_aro"
worn_state = "khi_uniform_aro"
=======
desc = "Kitsuhana Heavy Industries uniform. This one has the colors of a resleeving or mnemonics engineer. It has 'Aronai' written inside the top."
icon_state = "khi_uniform_aro"
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
//jacobdragon:Earthen Breath
@@ -1189,30 +1281,34 @@ Departamental Swimsuits, for general use
/obj/item/clothing/under/rank/trek
name = "Section 31 Uniform"
desc = "Oooh... right."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = ""
icon = 'icons/inventory/uniform/item_vr.dmi'
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
//TOS
/obj/item/clothing/under/rank/trek/command
name = "Command Uniform"
desc = "The uniform worn by command officers in the mid 2260s."
icon_state = "trek_command"
item_state = "trek_command"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // Considering only staff heads get to pick it
/obj/item/clothing/under/rank/trek/eng //CHOMPEdit: Engineering only
name = "Operations Uniform"
desc = "The uniform worn by operations officers of the mid 2260s. You feel strangely vulnerable just seeing this..."
icon_state = "trek_engsec"
<<<<<<< HEAD
item_state = "trek_engsec"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // since they're shared between jobs and kinda moot. //CHOMPEdit: I'll tell you what, the armor values are NOT shared. Removed melee bonus.
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
item_state = "trek_engsec"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // since they're shared between jobs and kinda moot.
=======
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) // since they're shared between jobs and kinda moot.
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
/obj/item/clothing/under/rank/trek/medsci
name = "MedSci Uniform"
desc = "The uniform worn by medsci officers in the mid 2260s."
icon_state = "trek_medsci"
item_state = "trek_medsci"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) // basically a copy of vanilla sci/med
@@ -1220,59 +1316,48 @@ Departamental Swimsuits, for general use
/obj/item/clothing/under/rank/trek/command/next
desc = "The uniform worn by command officers. This one's from the mid 2360s."
icon_state = "trek_next_command"
item_state = "trek_next_command"
/obj/item/clothing/under/rank/trek/eng/next //CHOMPEdit: Engineering only
desc = "The uniform worn by operation officers. This one's from the mid 2360s."
icon_state = "trek_next_engsec"
item_state = "trek_next_engsec"
/obj/item/clothing/under/rank/trek/medsci/next
desc = "The uniform worn by medsci officers. This one's from the mid 2360s."
icon_state = "trek_next_medsci"
item_state = "trek_next_medsci"
//ENT
/obj/item/clothing/under/rank/trek/command/ent
desc = "The uniform worn by command officers of the 2140s."
icon_state = "trek_ent_command"
item_state = "trek_ent_command"
/obj/item/clothing/under/rank/trek/eng/ent //CHOMPEdit: Engineering only
desc = "The uniform worn by operations officers of the 2140s."
icon_state = "trek_ent_engsec"
item_state = "trek_ent_engsec"
/obj/item/clothing/under/rank/trek/medsci/ent
desc = "The uniform worn by medsci officers of the 2140s."
icon_state = "trek_ent_medsci"
item_state = "trek_ent_medsci"
//VOY
/obj/item/clothing/under/rank/trek/command/voy
desc = "The uniform worn by command officers of the 2370s."
icon_state = "trek_voy_command"
item_state = "trek_voy_command"
/obj/item/clothing/under/rank/trek/eng/voy //CHOMPEdit: Engineering only
desc = "The uniform worn by operations officers of the 2370s."
icon_state = "trek_voy_engsec"
item_state = "trek_voy_engsec"
/obj/item/clothing/under/rank/trek/medsci/voy
desc = "The uniform worn by medsci officers of the 2370s."
icon_state = "trek_voy_medsci"
item_state = "trek_voy_medsci"
//DS9
/obj/item/clothing/suit/storage/trek/ds9
name = "Padded Overcoat"
desc = "The overcoat worn by all officers of the 2380s."
icon = 'icons/inventory/suit/item_vr.dmi'
default_worn_icon = 'icons/inventory/suit/mob_vr.dmi'
icon_state = "trek_ds9_coat"
icon = 'icons/vore/custom_clothes_vr.dmi'
item_state = "trek_ds9_coat_mob"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
permeability_coefficient = 0.50
allowed = list(
@@ -1289,23 +1374,21 @@ Departamental Swimsuits, for general use
name = "Admiral Overcoat"
desc = "Admirality specialty coat to keep flag officers fashionable and protected."
icon_state = "trek_ds9_coat_adm"
item_state = "trek_ds9_coat_adm_mob"
armor = list(melee = 45, bullet = 35, laser = 35, energy = 20, bomb = 0, bio = 40, rad = 55)
/obj/item/clothing/under/rank/trek/command/ds9
desc = "The uniform worn by command officers of the 2380s."
icon_state = "trek_command"
icon_state = "trek_command" // no unique state for this one
item_state = "trek_ds9_command"
/obj/item/clothing/under/rank/trek/eng/ds9 //CHOMPEdit: Engineering only
desc = "The uniform worn by operations officers of the 2380s."
icon_state = "trek_engsec"
icon_state = "trek_engsec" // no unique state for this one
item_state = "trek_ds9_engsec"
/obj/item/clothing/under/rank/trek/medsci/ds9
desc = "The uniform undershit worn by medsci officers of the 2380s."
icon_state = "trek_medsci"
icon_state = "trek_medsci" // no unique state for this one
item_state = "trek_ds9_medsci"
//For general use maybe
@@ -1941,7 +2024,7 @@ Departamental Swimsuits, for general use
item_icons = list()
default_worn_icon = 'icons/vore/custom_clothes_vr.dmi'
color = COLOR_NAVY
sprite_sheets = null
sprite_sheets = list()
//SweetBlueSylveon:Pip Shyner
/obj/item/clothing/accessory/poncho/roles/cloak/hop/fluff/pip

BIN
icons/inventory/accessory/item.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 60 KiB

BIN
icons/inventory/belt/item.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
icons/inventory/feet/item_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
icons/inventory/feet/mob_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
icons/inventory/hands/item_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 894 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
icons/inventory/hands/mob_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 449 B

After

Width:  |  Height:  |  Size: 975 B

BIN
icons/inventory/head/item_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 25 KiB

BIN
icons/inventory/head/mob_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 47 KiB

BIN
icons/inventory/suit/item_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
icons/inventory/suit/mob_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 83 KiB

BIN
icons/inventory/uniform/item.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 127 KiB

BIN
icons/inventory/uniform/item_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
icons/inventory/uniform/mob.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 440 KiB

After

Width:  |  Height:  |  Size: 442 KiB

BIN
icons/inventory/uniform/mob_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 48 KiB

BIN
icons/mob/rig_back_vr.dmi Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 543 B

BIN
icons/obj/rig_modules_vr.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 455 B

After

Width:  |  Height:  |  Size: 738 B

BIN
icons/obj/suitdispenser.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 33 KiB

22
maps/offmap_vr/om_ships/aro3.dmm
View File

@@ -2589,6 +2589,10 @@
/obj/structure/table/marble,
/turf/simulated/floor/tiled/eris/cafe,
/area/aro3/kitchen)
"vP" = (
/obj/machinery/gear_dispenser/suit_fancy/aether,
/turf/simulated/floor/tiled/eris/steel/panels,
/area/aro3/eva_hall)
"vQ" = (
/obj/structure/table/steel,
/obj/item/device/flashlight/lamp,
@@ -3953,6 +3957,22 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
<<<<<<< HEAD
||||||| parent of df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
/obj/machinery/light_switch{
dir = 1;
pixel_y = -24
},
/obj/item/device/uav/loaded,
=======
/obj/machinery/light_switch{
dir = 1;
pixel_y = -24
},
/obj/item/device/uav/loaded{
nickname = "FoxBot Beta"
},
>>>>>>> df7a88506f... Merge pull request #11032 from VOREStation/Arokha/megaport
/turf/simulated/floor/tiled/eris/dark/gray_perforated,
/area/aro3/repair_bay)
"Gy" = (
@@ -42234,7 +42254,7 @@ el
el
vZ
lu
DM
vP
XF
XF
Nu

2
maps/offmap_vr/talon/talon_v2.dm
View File

@@ -343,7 +343,7 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/nurse,
/obj/item/clothing/under/rank/orderly,
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/clothing/suit/storage/toggle/fr_jacket,
/obj/item/clothing/shoes/white,
/obj/item/device/radio/headset/talon,

1
maps/southern_cross/structures/closets/medical.dm
View File

@@ -13,6 +13,7 @@
/obj/item/clothing/under/rank/chief_medical_officer/skirt,
/obj/item/clothing/suit/storage/toggle/labcoat/cmo,
/obj/item/clothing/suit/storage/toggle/labcoat/cmoalt,
/obj/item/clothing/suit/storage/toggle/labcoat/modern/cmo,
/obj/item/weapon/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/shoes/brown,

4
maps/virgo_minitest/virgo_minitest_defines.dm
View File

@@ -60,6 +60,10 @@
allowed_spawns = list("Arrivals Shuttle","Gateway","Cryogenic Storage","Cyborg Storage")
/datum/map/virgo_minitest/New()
..()
SSticker.start_immediately = TRUE
/datum/map_z_level/minitest/station
z = Z_LEVEL_MAIN_VIRGO_TESTING
name = "Station Level"

10
tgui/packages/common/string.js
View File

@@ -78,13 +78,21 @@ export const createSearch = (searchText, stringifier) => {
};
};
export const isUppercase = chr => {
return chr.toUpperCase() === chr;
};
export const capitalize = str => {
// Handle array
if (Array.isArray(str)) {
return str.map(capitalize);
}
// Handle string
return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
let chr = str.charAt(0);
if (isUppercase(chr)) {
return str; // Already caps, might be an acronym, so don't mess it up by lowercasing the rest
}
return chr.toUpperCase() + str.slice(1).toLowerCase();
};
export const toTitleCase = str => {

2
tgui/public/tgui-common.bundle.js
View File

File diff suppressed because one or more lines are too long

2
vorestation.dme
View File

@@ -2147,7 +2147,9 @@
#include "code\modules\clothing\suits\hooded_vr.dm"
#include "code\modules\clothing\suits\hooded_yw.dm"
#include "code\modules\clothing\suits\jobs.dm"
#include "code\modules\clothing\suits\jobs_vr.dm"
#include "code\modules\clothing\suits\labcoat.dm"
#include "code\modules\clothing\suits\labcoat_vr.dm"
#include "code\modules\clothing\suits\miscellaneous.dm"
#include "code\modules\clothing\suits\miscellaneous_vr.dm"
#include "code\modules\clothing\suits\solgov.dm"