cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)

Browse Source 
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
This commit is contained in:
ElorgRHG
2022-10-09 15:24:10 +02:00
committed by GitHub
parent 7904d3d7c3
commit e843567671
182 changed files with 1953 additions and 1928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/loadout/loadout_uniform.dm
+29 -29
View File
@@ -104,11 +104,11 @@
/datum/gear/uniform/suit/soviet
display_name = "USSP uniform"
path = /obj/item/clothing/under/soviet
path = /obj/item/clothing/under/costume/soviet
/datum/gear/uniform/suit/kilt
display_name = "Kilt"
path = /obj/item/clothing/under/kilt
path = /obj/item/clothing/under/costume/kilt
/datum/gear/uniform/skirt
main_typepath = /datum/gear/uniform/skirt
@@ -127,7 +127,7 @@
/datum/gear/uniform/skirt/black
display_name = "Skirt, black"
path = /obj/item/clothing/under/blackskirt
path = /obj/item/clothing/under/dress/blackskirt
/datum/gear/uniform/skirt/job
main_typepath = /datum/gear/uniform/skirt/job
@@ -135,82 +135,82 @@
/datum/gear/uniform/skirt/job/ce
display_name = "Skirt, ce"
path = /obj/item/clothing/under/rank/chief_engineer/skirt
path = /obj/item/clothing/under/rank/engineering/chief_engineer/skirt
allowed_roles = list("Chief Engineer")
/datum/gear/uniform/skirt/job/atmos
display_name = "Skirt, atmos"
path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
path = /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt
allowed_roles = list("Chief Engineer","Life Support Specialist")
/datum/gear/uniform/skirt/job/eng
display_name = "Skirt, engineer"
path = /obj/item/clothing/under/rank/engineer/skirt
path = /obj/item/clothing/under/rank/engineering/engineer/skirt
allowed_roles = list("Chief Engineer","Station Engineer")
/datum/gear/uniform/skirt/job/roboticist
display_name = "Skirt, roboticist"
path = /obj/item/clothing/under/rank/roboticist/skirt
path = /obj/item/clothing/under/rank/rnd/roboticist/skirt
allowed_roles = list("Research Director","Roboticist")
/datum/gear/uniform/skirt/job/cmo
display_name = "Skirt, cmo"
path = /obj/item/clothing/under/rank/chief_medical_officer/skirt
path = /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt
allowed_roles = list("Chief Medical Officer")
/datum/gear/uniform/skirt/job/chem
display_name = "Skirt, chemist"
path = /obj/item/clothing/under/rank/chemist/skirt
path = /obj/item/clothing/under/rank/medical/chemist/skirt
allowed_roles = list("Chief Medical Officer","Chemist")
/datum/gear/uniform/skirt/job/viro
display_name = "Skirt, virologist"
path = /obj/item/clothing/under/rank/virologist/skirt
path = /obj/item/clothing/under/rank/medical/virologist/skirt
allowed_roles = list("Virologist")
/datum/gear/uniform/skirt/job/med
display_name = "Skirt, medical"
path = /obj/item/clothing/under/rank/medical/skirt
path = /obj/item/clothing/under/rank/medical/doctor/skirt
allowed_roles = list("Chief Medical Officer","Medical Doctor","Psychiatrist","Paramedic","Coroner")
/datum/gear/uniform/skirt/job/sci
display_name = "Skirt, scientist"
path = /obj/item/clothing/under/rank/scientist/skirt
path = /obj/item/clothing/under/rank/rnd/scientist/skirt
allowed_roles = list("Research Director","Scientist")
/datum/gear/uniform/skirt/job/cargo
display_name = "Skirt, cargo"
path = /obj/item/clothing/under/rank/cargotech/skirt
path = /obj/item/clothing/under/rank/cargo/tech/skirt
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/skirt/job/qm
display_name = "Skirt, QM"
path = /obj/item/clothing/under/rank/cargo/skirt
path = /obj/item/clothing/under/rank/cargo/quartermaster/skirt
allowed_roles = list("Quartermaster")
/datum/gear/uniform/skirt/job/warden
display_name = "Skirt, warden"
path = /obj/item/clothing/under/rank/warden/skirt
path = /obj/item/clothing/under/rank/security/warden/skirt
allowed_roles = list("Head of Security", "Warden")
/datum/gear/uniform/skirt/job/security
display_name = "Skirt, security"
path = /obj/item/clothing/under/rank/security/skirt
path = /obj/item/clothing/under/rank/security/officer/skirt
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer")
/datum/gear/uniform/skirt/job/head_of_security
display_name = "Skirt, hos"
path = /obj/item/clothing/under/rank/head_of_security/skirt
path = /obj/item/clothing/under/rank/security/head_of_security/skirt
allowed_roles = list("Head of Security")
/datum/gear/uniform/skirt/job/ntrep
display_name = "Skirt, nt rep"
path = /obj/item/clothing/under/rank/ntrep/skirt
path = /obj/item/clothing/under/rank/centcom/representative/skirt
allowed_roles = list("Nanotrasen Representative")
/datum/gear/uniform/skirt/job/blueshield
display_name = "Skirt, blueshield"
path = /obj/item/clothing/under/rank/blueshield/skirt
path = /obj/item/clothing/under/rank/centcom/blueshield/skirt
allowed_roles = list("Blueshield")
@@ -219,12 +219,12 @@
/datum/gear/uniform/medical/pscrubs
display_name = "Medical scrubs, purple"
path = /obj/item/clothing/under/rank/medical/purple
path = /obj/item/clothing/under/rank/medical/scrubs/purple
allowed_roles = list("Chief Medical Officer", "Medical Doctor")
/datum/gear/uniform/medical/gscrubs
display_name = "Medical scrubs, green"
path = /obj/item/clothing/under/rank/medical/green
path = /obj/item/clothing/under/rank/medical/scrubs/green
allowed_roles = list("Chief Medical Officer", "Medical Doctor")
/datum/gear/uniform/sec
@@ -237,17 +237,17 @@
/datum/gear/uniform/sec/secorporate
display_name = "Security uniform, corporate"
path = /obj/item/clothing/under/rank/security/corp
path = /obj/item/clothing/under/rank/security/officer/corporate
allowed_roles = list("Head of Security", "Warden", "Security Officer")
/datum/gear/uniform/sec/dispatch
display_name = "Security uniform, dispatch"
path = /obj/item/clothing/under/rank/dispatch
path = /obj/item/clothing/under/rank/security/officer/dispatch
allowed_roles = list("Head of Security", "Warden", "Security Officer")
/datum/gear/uniform/sec/casual
display_name = "Security uniform, casual"
path = /obj/item/clothing/under/rank/security2
path = /obj/item/clothing/under/rank/security/officer/uniform
allowed_roles = list("Head of Security", "Warden", "Security Officer", "Detective")
/datum/gear/uniform/shorts
@@ -255,23 +255,23 @@
/datum/gear/uniform/shorts/red
display_name = "Shorts, red"
path = /obj/item/clothing/under/shorts/red
path = /obj/item/clothing/under/pants/shorts/red
/datum/gear/uniform/shorts/green
display_name = "Shorts, green"
path = /obj/item/clothing/under/shorts/green
path = /obj/item/clothing/under/pants/shorts/green
/datum/gear/uniform/shorts/blue
display_name = "Shorts, blue"
path = /obj/item/clothing/under/shorts/blue
path = /obj/item/clothing/under/pants/shorts/blue
/datum/gear/uniform/shorts/black
display_name = "Shorts, black"
path = /obj/item/clothing/under/shorts/black
path = /obj/item/clothing/under/pants/shorts/black
/datum/gear/uniform/shorts/grey
display_name = "Shorts, grey"
path = /obj/item/clothing/under/shorts/grey
path = /obj/item/clothing/under/pants/shorts/grey
/datum/gear/uniform/pants
main_typepath = /datum/gear/uniform/pants