cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Raeschen
2023-06-19 11:48:24 +02:00
parent 617e2e55b9
commit de6a048679
4 changed files with 0 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
code/modules/client/preference_setup/loadout/loadout_head.dm
View File

@@ -16,14 +16,6 @@
display_name = "beret, red"
path = /obj/item/clothing/head/beret
<<<<<<< HEAD
/datum/gear/head/beret/bsec
display_name = "beret, navy (officer)"
path = /obj/item/clothing/head/beret/sec/navy/officer
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
=======
>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
/datum/gear/head/beret/bsec_warden
display_name = "beret, navy (warden)"
path = /obj/item/clothing/head/beret/sec/navy/warden
@@ -34,14 +26,6 @@
path = /obj/item/clothing/head/beret/sec/navy/hos
allowed_roles = list("Head of Security")
<<<<<<< HEAD
/datum/gear/head/beret/csec
display_name = "beret, corporate (officer)"
path = /obj/item/clothing/head/beret/sec/corporate/officer
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
=======
>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
/datum/gear/head/beret/csec_warden
display_name = "beret, corporate (warden)"
path = /obj/item/clothing/head/beret/sec/corporate/warden
@@ -60,14 +44,6 @@
display_name = "beret, purple"
path = /obj/item/clothing/head/beret/purple
<<<<<<< HEAD
/datum/gear/head/beret/sec
display_name = "beret, red (security)"
path = /obj/item/clothing/head/beret/sec
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
=======
>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
/datum/gear/head/cap
display_name = "cap, brown-flat"
path = /obj/item/clothing/head/flatcap
@@ -96,56 +72,6 @@
display_name = "cap, blue station"
path = /obj/item/clothing/head/mailman
<<<<<<< HEAD
/datum/gear/head/cap/flat
display_name = "cap, brown-flat"
path = /obj/item/clothing/head/flatcap
/datum/gear/head/cap/corp
display_name = "cap, corporate (Security)"
path = /obj/item/clothing/head/soft/sec/corp
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/cap/green
display_name = "cap, green"
path = /obj/item/clothing/head/soft/green
/datum/gear/head/cap/grey
display_name = "cap, grey"
path = /obj/item/clothing/head/soft/grey
/datum/gear/head/cap/med
display_name = "cap, medical (Medical)"
path = /obj/item/clothing/head/soft/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Search and Rescue")
/datum/gear/head/cap/orange
display_name = "cap, orange"
path = /obj/item/clothing/head/soft/orange
/datum/gear/head/cap/purple
display_name = "cap, purple"
path = /obj/item/clothing/head/soft/purple
/datum/gear/head/cap/rainbow
display_name = "cap, rainbow"
path = /obj/item/clothing/head/soft/rainbow
/datum/gear/head/cap/red
display_name = "cap, red"
path = /obj/item/clothing/head/soft/red
/datum/gear/head/cap/sec
display_name = "cap, security (Security)"
path = /obj/item/clothing/head/soft/sec
allowed_roles = list("Security Officer","Head of Security","Warden", "Detective","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/head/cap/yellow
display_name = "cap, yellow"
path = /obj/item/clothing/head/soft/yellow
=======
>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
/datum/gear/head/cap/white
display_name = "cap (colorable)"
path = /obj/item/clothing/head/soft/mime

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

@@ -1,11 +1,3 @@
<<<<<<< HEAD
/datum/gear/head/cap/med
display_name = "cap, medical (Medical)"
path = /obj/item/clothing/head/soft/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic","Field Medic") //CHOMP keep explo
=======
>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
/*/datum/gear/head/cap/sol
display_name = "cap, sol"
path = /obj/item/clothing/head/soft/sol*/

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

@@ -106,119 +106,6 @@
shorts[initial(short_type.name)] = short_type
gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorts))
<<<<<<< HEAD
/datum/gear/uniform/job_skirt/ce
display_name = "skirt, ce"
path = /obj/item/clothing/under/rank/chief_engineer/skirt
allowed_roles = list("Chief Engineer")
/datum/gear/uniform/job_skirt/atmos
display_name = "skirt, atmos"
path = /obj/item/clothing/under/rank/atmospheric_technician/skirt
allowed_roles = list("Chief Engineer","Atmospheric Technician")
/datum/gear/uniform/job_skirt/eng
display_name = "skirt, engineer"
path = /obj/item/clothing/under/rank/engineer/skirt
allowed_roles = list("Chief Engineer","Engineer")
/datum/gear/uniform/job_skirt/roboticist
display_name = "skirt, roboticist"
path = /obj/item/clothing/under/rank/roboticist/skirt
allowed_roles = list("Research Director","Roboticist")
/datum/gear/uniform/job_skirt/cmo
display_name = "skirt, cmo"
path = /obj/item/clothing/under/rank/chief_medical_officer/skirt
allowed_roles = list("Chief Medical Officer")
/datum/gear/uniform/job_skirt/chem
display_name = "skirt, chemist"
path = /obj/item/clothing/under/rank/chemist/skirt
allowed_roles = list("Chief Medical Officer","Chemist")
/datum/gear/uniform/job_skirt/viro
display_name = "skirt, virologist"
path = /obj/item/clothing/under/rank/virologist/skirt
allowed_roles = list("Chief Medical Officer","Medical Doctor")
/datum/gear/uniform/job_skirt/med
display_name = "skirt, medical"
path = /obj/item/clothing/under/rank/medical/skirt
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Psychiatrist","Paramedic")
/datum/gear/uniform/job_skirt/sci
display_name = "skirt, scientist"
path = /obj/item/clothing/under/rank/scientist/skirt
allowed_roles = list("Research Director","Scientist", "Xenobiologist")
/datum/gear/uniform/job_skirt/cargo
display_name = "skirt, cargo"
path = /obj/item/clothing/under/rank/cargotech/skirt
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/job_skirt/qm
display_name = "skirt, QM"
path = /obj/item/clothing/under/rank/cargo/skirt
allowed_roles = list("Quartermaster")
/datum/gear/uniform/job_skirt/warden
display_name = "skirt, warden"
path = /obj/item/clothing/under/rank/warden/skirt
allowed_roles = list("Head of Security", "Warden")
/datum/gear/uniform/job_skirt/security
display_name = "skirt, security"
path = /obj/item/clothing/under/rank/security/skirt
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_skirt/head_of_security
display_name = "skirt, hos"
path = /obj/item/clothing/under/rank/head_of_security/skirt
allowed_roles = list("Head of Security")
/datum/gear/uniform/job_turtle/science
display_name = "turtleneck, science"
path = /obj/item/clothing/under/rank/scientist/turtleneck
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist")
/datum/gear/uniform/job_turtle/security
display_name = "turtleneck, security"
path = /obj/item/clothing/under/rank/security/turtleneck
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_turtle/engineering
display_name = "turtleneck, engineering"
path = /obj/item/clothing/under/rank/engineer/turtleneck
allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Engineer")
/datum/gear/uniform/job_turtle/medical
display_name = "turtleneck, medical"
path = /obj/item/clothing/under/rank/medical/turtleneck
allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Search and Rescue", "Chemist")
/datum/gear/uniform/jeans_qm
display_name = "jeans, QM"
path = /obj/item/clothing/under/rank/cargo/jeans
allowed_roles = list("Quartermaster")
/datum/gear/uniform/jeans_qmf
display_name = "female jeans, QM"
path = /obj/item/clothing/under/rank/cargo/jeans/female
allowed_roles = list("Quartermaster")
/datum/gear/uniform/jeans_cargo
display_name = "jeans, cargo"
path = /obj/item/clothing/under/rank/cargotech/jeans
allowed_roles = list("Quartermaster","Cargo Technician")
/datum/gear/uniform/jeans_cargof
display_name = "female jeans, cargo"
path = /obj/item/clothing/under/rank/cargotech/jeans/female
allowed_roles = list("Quartermaster","Cargo Technician")
=======
>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
/datum/gear/uniform/suit/lawyer
display_name = "suit, one-piece selection"
path = /obj/item/clothing/under/lawyer
@@ -305,60 +192,6 @@
display_name = "flame dress"
path = /obj/item/clothing/under/dress/dress_fire
<<<<<<< HEAD
/datum/gear/uniform/uniform_captain
display_name = "uniform, site manager's dress"
path = /obj/item/clothing/under/dress/dress_cap
allowed_roles = list("Site Manager")
/datum/gear/uniform/corpdetsuit
display_name = "uniform, corporate (Detective)"
path = /obj/item/clothing/under/det/corporate
allowed_roles = list("Detective","Head of Security")
/datum/gear/uniform/corpsecsuit
display_name = "uniform, corporate (Security)"
path = /obj/item/clothing/under/rank/security/corp
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/corpwarsuit
display_name = "uniform, corporate (Warden)"
path = /obj/item/clothing/under/rank/warden/corp
allowed_roles = list("Head of Security","Warden")
/datum/gear/uniform/corphossuit
display_name = "uniform, corporate (Head of Security)"
path = /obj/item/clothing/under/rank/head_of_security/corp
allowed_roles = list("Head of Security")
/datum/gear/uniform/uniform_hop
display_name = "uniform, HoP's dress"
path = /obj/item/clothing/under/dress/dress_hop
allowed_roles = list("Head of Personnel")
/datum/gear/uniform/uniform_hr
display_name = "uniform, HR director (HoP)"
path = /obj/item/clothing/under/dress/dress_hr
allowed_roles = list("Head of Personnel")
/datum/gear/uniform/navysecsuit
display_name = "uniform, navy blue (Security)"
path = /obj/item/clothing/under/rank/security/navyblue
allowed_roles = list("Security Officer","Head of Security","Warden","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/navywarsuit
display_name = "uniform, navy blue (Warden)"
path = /obj/item/clothing/under/rank/warden/navyblue
allowed_roles = list("Head of Security","Warden")
/datum/gear/uniform/navyhossuit
display_name = "uniform, navy blue (Head of Security)"
path = /obj/item/clothing/under/rank/head_of_security/navyblue
allowed_roles = list("Head of Security")
=======
>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
/datum/gear/uniform/shortplaindress
display_name = "plain dress"
path = /obj/item/clothing/under/dress/white3

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

@@ -11,55 +11,6 @@
display_name = "pt uniform, planetside sec"
path = /obj/item/clothing/under/solgov/pt/sifguard
<<<<<<< HEAD
/datum/gear/uniform/job_skirt/sci
allowed_roles = list("Research Director","Scientist", "Xenobiologist", "Xenobotanist")
/datum/gear/uniform/job_turtle/science
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
/datum/gear/uniform/job_turtle/medical
display_name = "turtleneck, medical"
path = /obj/item/clothing/under/rank/medical/turtleneck
allowed_roles = list("Chief Medical Officer", "Paramedic", "Medical Doctor", "Psychiatrist", "Field Medic", "Chemist") //CHOMP keep explo
//KHI Uniforms
/datum/gear/uniform/job_khi/cmd
display_name = "ge uniform, cmd" //CHOMPedit: changed to GE suit
path = /obj/item/clothing/under/rank/khi/cmd
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_khi/sec
display_name = "geuniform, sec" //CHOMPedit: changed to GE suit
path = /obj/item/clothing/under/rank/khi/sec
allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer","Blueshield Guard","Security Pilot") //YW ADDITIONS
/datum/gear/uniform/job_khi/med
display_name = "ge uniform, med" //CHOMPedit: changed to GE suit
path = /obj/item/clothing/under/rank/khi/med
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Field Medic","Psychiatrist") //CHOMP keep explo
/datum/gear/uniform/job_khi/eng
display_name = "ge uniform, eng" //CHOMPedit: changed to GE suit
path = /obj/item/clothing/under/rank/khi/eng
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
/datum/gear/uniform/job_khi/sci
display_name = "ge uniform, sci" //CHOMPedit: changed to GE suit
path = /obj/item/clothing/under/rank/khi/sci
allowed_roles = list("Research Director", "Scientist", "Roboticist", "Xenobiologist", "Xenobotanist")
/datum/gear/uniform/job_khi/crg
display_name = "ge uniform, cargo" //CHOMPedit: changed to GE suit
path = /obj/item/clothing/under/rank/khi/crg
allowed_roles = list("Quartermaster", "Cargo Technician", "Shaft Miner")
/datum/gear/uniform/job_khi/civ
display_name = "ge uniform, civ" //CHOMPedit: changed to GE suit
path = /obj/item/clothing/under/rank/khi/civ
=======
>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
//Federation jackets
/datum/gear/suit/job_fed/sec
display_name = "fed uniform, sec"
@@ -75,65 +26,7 @@
display_name = "fed uniform, eng"
path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer")
<<<<<<< HEAD
// Trekie things
//TOS
/datum/gear/uniform/job_trek/cmd/tos
display_name = "TOS uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/tos
display_name = "TOS uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") //CHOMP keep explo
/datum/gear/uniform/job_trek/eng/tos
display_name = "TOS uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
//TNG
/datum/gear/uniform/job_trek/cmd/tng
display_name = "TNG uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/next
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/tng
display_name = "TNG uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/next
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") //CHOMP keep explo
/datum/gear/uniform/job_trek/eng/tng
display_name = "TNG uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/next //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
//VOY
/datum/gear/uniform/job_trek/cmd/voy
display_name = "VOY uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/voy
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/voy
display_name = "VOY uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/voy
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") //CHOMP keep explo
/datum/gear/uniform/job_trek/eng/voy
display_name = "VOY uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/voy //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
=======
>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
//DS9
/datum/gear/suit/job_trek/ds9_coat
@@ -144,45 +37,6 @@
"Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician",
"Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic", "Blueshield Guard","Security Pilot") //YW ADDITIONS //CHOMP keep explo
<<<<<<< HEAD
/datum/gear/uniform/job_trek/cmd/ds9
display_name = "DS9 uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/ds9
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/ds9
display_name = "DS9 uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/ds9
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") //CHOMP keep explo
/datum/gear/uniform/job_trek/eng/ds9
display_name = "DS9 uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/ds9 //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
//ENT
/datum/gear/uniform/job_trek/cmd/ent
display_name = "ENT uniform, cmd"
path = /obj/item/clothing/under/rank/trek/command/ent
allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Blueshield Guard") //YW ADDITIONS
/datum/gear/uniform/job_trek/medsci/ent
display_name = "ENT uniform, med/sci"
path = /obj/item/clothing/under/rank/trek/medsci/ent
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Field Medic") //CHOMP keep explo
/datum/gear/uniform/job_trek/eng/ent
display_name = "ENT uniform, eng" //CHOMPEdit: Removed sec from the name. Gonna separate sec into its own so that I can apply armor value.
path = /obj/item/clothing/under/rank/trek/eng/ent //CHOMPEdit: Engineering only
allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") //CHOMPEdit: Removed sec from the allowed list. Gonna separate sec into its own so that I can apply armor value.
//CHOMPEdit: See loadout_uniform_vr_ch.dm for a security-specific variant that has standard armor values.
=======
>>>>>>> ec9eb3a615... Merge pull request #15017 from KillianKirilenko/kk-loadouts
/*
Swimsuits
*/