diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm deleted file mode 100644 index bc13217c54..0000000000 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_yw.dm +++ /dev/null @@ -1,20 +0,0 @@ -/datum/gear/eyes/arglasses/sec - display_name = "AR-S Security glasses" - path = /obj/item/clothing/glasses/omnihud/sec - allowed_roles = list(JOB_SECURITY_OFFICER,JOB_HEAD_OF_SECURITY,JOB_WARDEN,JOB_DETECTIVE,JOB_BLUESHIELD_GUARD,JOB_SECURITY_PILOT) - -/datum/gear/eyes/arglasses/eng - display_name = "AR-E Engineering glasses" - path = /obj/item/clothing/glasses/omnihud/eng - allowed_roles = list(JOB_ENGINEER,JOB_CHIEF_ENGINEER,JOB_ATMOSPHERIC_TECHNICIAN) // CHOMPedit: Allows AR-E Glasses to actually be used. - -/datum/gear/eyes/arglasses/med - display_name = "AR-M Medical glasses" - path = /obj/item/clothing/glasses/omnihud/med - allowed_roles = list(JOB_MEDICAL_DOCTOR,JOB_CHIEF_MEDICAL_OFFICER,JOB_CHEMIST,JOB_PARAMEDIC,JOB_GENETICIST, JOB_PSYCHIATRIST, JOB_FIELD_MEDIC) - -/datum/gear/eyes/arglasses/all - display_name = "AR-B Command glasses" - path = /obj/item/clothing/glasses/omnihud/all - cost = 2 - allowed_roles = list(JOB_SITE_MANAGER,JOB_HEAD_OF_PERSONNEL,JOB_BLUESHIELD_GUARD) diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm b/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm index 2b3cd8abcf..a7ee8a3d10 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_yw.dm @@ -15,12 +15,3 @@ /datum/gear/suit/victdress/red display_name = "Victorian ladiescoat, Red" path = /obj/item/clothing/suit/storage/victcoat/red - -/datum/gear/suit/roles/medical/ems_jacket - display_name = "first responder jacket" - path = /obj/item/clothing/suit/storage/toggle/fr_jacket - allowed_roles = list(JOB_CHIEF_MEDICAL_OFFICER,JOB_PARAMEDIC,JOB_MEDICAL_DOCTOR) - -/datum/gear/suit/roles/medical/ems_jacket/alt - display_name = "first responder jacket, alt." - path = /obj/item/clothing/suit/storage/toggle/fr_jacket/ems diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_ch.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_ch.dm index b907c80f31..20737aa59a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_ch.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_ch.dm @@ -1,23 +1,9 @@ -/datum/gear/suit/hood - display_name = "hooded cloak selection (Teshari)" - path = /obj/item/clothing/suit/storage/teshari/cloak/standard - whitelisted = SPECIES_TESHARI - sort_category = "Xenowear" - /datum/gear/eyes/arglasses/tesh_visor display_name = "AR visor (Teshari)" path = /obj/item/clothing/glasses/omnihud/visor/tesh whitelisted = SPECIES_TESHARI sort_category = "Xenowear" -/datum/gear/suit/hood/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/standard)) - var/obj/item/clothing/suit/storage/teshari/cloak/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - /datum/gear/double_tank_nitrogen display_name = "Pocket sized double nitrogen tank (Customs)" path = /obj/item/tank/emergency/nitrogen/double diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm index c0dbd1bf92..29a5f258f2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_yw.dm @@ -1,197 +1,3 @@ -//Added from CHOMP -/datum/gear/suit/hood - display_name = "hooded cloak selection (Teshari)" - path = /obj/item/clothing/suit/storage/teshari/cloak/standard - whitelisted = SPECIES_TESHARI - sort_category = "Xenowear" - -/datum/gear/suit/hood/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/hooded/teshari/standard)) - var/obj/item/clothing/suit/storage/teshari/cloak/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/beltcloak - display_name = "belted cloak selection (Teshari)" - path = /obj/item/clothing/suit/storage/teshari/beltcloak/standard - whitelisted = SPECIES_TESHARI - sort_category = "Xenowear" - -/datum/gear/suit/beltcloak/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/beltcloak/standard)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/standard/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/uniform/beltcloakcolor/New() - ..() - gear_tweaks = list(gear_tweak_free_color_choice) - -/datum/gear/suit/cloakcolor - display_name = "belted cloak, recolorable (Teshari)" - path = /obj/item/clothing/suit/storage/teshari/beltcloak/standard/white_grey - whitelisted = SPECIES_TESHARI - sort_category = "Xenowear" - -/datum/gear/suit/dept/beltcloak/ - whitelisted = SPECIES_TESHARI - sort_category = "Xenowear" - -/datum/gear/suit/dept/beltcloak/wrdn - display_name = "warden belted cloak (Teshari)" - path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/wrdn - allowed_roles = list(JOB_HEAD_OF_SECURITY,JOB_WARDEN) - -/datum/gear/suit/dept/beltcloak/hos - display_name = "Chief of Security belted cloak (Teshari)" - path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/hos - allowed_roles = list(JOB_HEAD_OF_SECURITY) - -/datum/gear/suit/dept/beltcloak/jani - display_name = "janitor belted cloak (Teshari)" - path = /obj/item/clothing/suit/storage/teshari/beltcloak/jobs/jani - allowed_roles = list(JOB_JANITOR) - -/datum/gear/suit/dept/cloak/command/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/command,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/command)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/cargo/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/cargo,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cargo)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/mining/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/mining,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/mining)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/qm/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/qm,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/qm)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/security/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/sec,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sec)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/service/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/service,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/service)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/ce/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/ce,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/ce)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/engineer/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/eningeer,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/eningeer)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/atmos/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/atmos,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/atmos)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/research/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/sci,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/sci)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/robo/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/robo,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/robo)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/cmo/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/cmo,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cmo)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/medical/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/medical,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/medical)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/chemistry/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/chemistry,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/chemistry)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/virology/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/viro,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/viro)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/paramedic/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/para,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/para)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - -/datum/gear/suit/dept/cloak/iaa/New() - ..() - var/list/cloaks = list() - for(var/cloak in typesof(/obj/item/clothing/suit/storage/teshari/cloak/jobs/iaa,/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/iaa)) - var/obj/item/clothing/suit/storage/teshari/beltcloak/jobs/cloak_type = cloak - cloaks[initial(cloak_type.name)] = cloak_type - gear_tweaks += new/datum/gear_tweak/path(sortAssoc(cloaks)) - /datum/gear/uniform/harness_white display_name = "white gear harness (Full Body Prosthetic, Diona)" path = /obj/item/clothing/under/harness_white diff --git a/modular_chomp/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/modular_chomp/code/modules/client/preference_setup/loadout/loadout_xeno.dm deleted file mode 100644 index 6d2bb58da7..0000000000 --- a/modular_chomp/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ /dev/null @@ -1,2 +0,0 @@ -/datum/gear/suit/dept/cloak/cap - path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/cap diff --git a/vorestation.dme b/vorestation.dme index 6f0fe4cded..41437c19d3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2287,7 +2287,6 @@ #include "code\modules\client\preference_setup\loadout\loadout_cyberware.dm" #include "code\modules\client\preference_setup\loadout\loadout_ears.dm" #include "code\modules\client\preference_setup\loadout\loadout_eyes.dm" -#include "code\modules\client\preference_setup\loadout\loadout_eyes_yw.dm" #include "code\modules\client\preference_setup\loadout\loadout_fluffitems.dm" #include "code\modules\client\preference_setup\loadout\loadout_fluffitems_ch.dm" #include "code\modules\client\preference_setup\loadout\loadout_general.dm" @@ -4946,7 +4945,6 @@ #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_mask.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_shoes.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_suit.dm" -#include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_xeno.dm" #include "modular_chomp\code\modules\client\preferences\types\misc.dm" #include "modular_chomp\code\modules\client\preferences\types\sound.dm" #include "modular_chomp\code\modules\client\verbs\ping.dm"