From 98f65321a5f28f5d9962c366ff7895cef7aa1294 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Thu, 18 Jul 2024 03:52:29 -0400 Subject: [PATCH] WIP --- code/__DEFINES/job.dm | 6 +- code/modules/cm_marines/marines_consoles.dm | 10 +- code/modules/gear_presets/corpses.dm | 202 +---------------- code/modules/gear_presets/fun.dm | 1 + code/modules/gear_presets/other.dm | 190 +--------------- .../survivors/corsat/preset_corsat.dm | 58 ----- .../preset_fiorina_sciannex.dm | 65 ------ .../survivors/kutjevo/preset_kutjevo.dm | 76 ------- .../survivors/lv_624/clfship_insert_lv624.dm | 30 --- .../survivors/lv_624/preset_lv.dm | 83 ------- code/modules/gear_presets/survivors/misc.dm | 111 ---------- .../new_varadero/preset_new_varadero.dm | 88 -------- .../shivas_snowball/preset_shivas_snowball.dm | 82 ------- .../crashlanding-offices_insert_bigred.dm | 193 ----------------- .../survivors/solaris/preset_solaris.dm | 94 -------- .../sorokyne_strata/preset_sorokyne_strata.dm | 60 ------ .../gear_presets/survivors/survivors.dm | 2 +- .../crashlanding_upp_bar_insert_trijent.dm | 203 ------------------ .../survivors/trijent/preset_trijent.dm | 67 ------ code/modules/gear_presets/synths.dm | 17 +- code/modules/gear_presets/uscm_dress.dm | 4 +- code/modules/gear_presets/uscm_event.dm | 2 +- code/modules/gear_presets/wy.dm | 52 ++--- colonialmarines.dme | 12 -- 24 files changed, 40 insertions(+), 1668 deletions(-) delete mode 100644 code/modules/gear_presets/survivors/corsat/preset_corsat.dm delete mode 100644 code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm delete mode 100644 code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm delete mode 100644 code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm delete mode 100644 code/modules/gear_presets/survivors/lv_624/preset_lv.dm delete mode 100644 code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm delete mode 100644 code/modules/gear_presets/survivors/shivas_snowball/preset_shivas_snowball.dm delete mode 100644 code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm delete mode 100644 code/modules/gear_presets/survivors/solaris/preset_solaris.dm delete mode 100644 code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm delete mode 100644 code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm delete mode 100644 code/modules/gear_presets/survivors/trijent/preset_trijent.dm diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm index 68a9d810b5..08663c1455 100644 --- a/code/__DEFINES/job.dm +++ b/code/__DEFINES/job.dm @@ -222,9 +222,9 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST //-------- WY Goons --------// #define JOB_WY_SEC "W-Y Corporate Security" #define JOB_WY_SEC_LEAD "W-Y Corporate Security Lead" -#define JOB_WY_GOON_RESEARCHER "W-Y Research Consultant" +#define JOB_WY_SEC_RESEARCHER "W-Y Research Consultant" -#define JOB_WY_GOON_LIST list(JOB_WY_GOON, JOB_WY_GOON_LEAD) +#define JOB_WY_SEC_LIST list(JOB_WY_SEC, JOB_WY_SEC_LEAD) //---- Contractors ----// #define JOB_CONTRACTOR "VAIPO Mercenary" @@ -398,4 +398,4 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST ///For denying certain traits being applied to people. ie. bad leg ///'Grunt' lists are for people who wouldn't logically get the bad leg trait, ie. UPP marine counterparts. -#define JOB_ERT_GRUNT_LIST list(DUTCH_JOB_LIST, RIOT_JOB_LIST, PROVOST_JOB_LIST, CMB_GRUNT_LIST, CLF_JOB_LIST, UPP_JOB_GRUNT_LIST, UPP_COMMANDO_JOB_LIST, CONTRACTOR_JOB_LIST, JOB_WY_GOON_LIST, JOB_PMC_GRUNT_LIST) +#define JOB_ERT_GRUNT_LIST list(DUTCH_JOB_LIST, RIOT_JOB_LIST, PROVOST_JOB_LIST, CMB_GRUNT_LIST, CLF_JOB_LIST, UPP_JOB_GRUNT_LIST, UPP_COMMANDO_JOB_LIST, CONTRACTOR_JOB_LIST, JOB_WY_SEC_LIST, JOB_PMC_GRUNT_LIST) diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index 14911faf85..8fa35aa531 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -995,8 +995,8 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) JOB_PMC_ENGINEER = 225, JOB_PMC_STANDARD = 226, JOB_PMC_DOCTOR = 227, - JOB_WY_GOON_LEAD = 228, - JOB_WY_GOON = 229, + JOB_WY_SEC_LEAD = 228, + JOB_WY_SEC = 229, // Appear at bottom of squad list JOB_MARINE_RAIDER_SL = 130, @@ -1040,13 +1040,13 @@ GLOBAL_LIST_EMPTY_TYPED(crewmonitor, /datum/crewmonitor) JOB_EXECUTIVE = 23, JOB_JUNIOR_EXECUTIVE = 24, // 30-39: Security - JOB_WY_GOON_LEAD = 30, - JOB_WY_GOON = 31, + JOB_WY_SEC_LEAD = 30, + JOB_WY_SEC = 31, // 40-49: MedSci JOB_PMC_SYNTH = 40, JOB_PMC_XENO_HANDLER = 41, JOB_PMC_DOCTOR = 42, - JOB_WY_GOON_RESEARCHER = 43, + JOB_WY_SEC_RESEARCHER = 43, // 50-59: Engineering & Vehicle Crew JOB_PMC_CREWMAN = 51, JOB_PMC_ENGINEER = 52, diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 7716678207..6e097e7dac 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -53,72 +53,6 @@ add_survivor_weapon_pistol(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/realpirate - name = "Corpse - Pirate" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_ILLEGAL_PIRATE, - ) - -/datum/equipment_preset/corpse/realpirate/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pirate(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - else - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bandana(new_human), WEAR_HEAD) - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/realpirate/ranged - name = "Corpse - Pirate Gunner" - -/datum/equipment_preset/corpse/realpirate/ranged/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/pirate(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/pirate(new_human), WEAR_HEAD) - . = ..() - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/russian - name = "Corpse - Russian" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/datum/equipment_preset/corpse/russian - -/datum/equipment_preset/corpse/russian/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/veteran/soviet_uniform_01(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - if(prob(25)) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bearpelt(new_human), WEAR_HEAD) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - //*****************************************************************************************************/ // Civilians @@ -140,24 +74,6 @@ //*****************************************************************************************************/ -/datum/equipment_preset/corpse/chef - name = "Corpse - Chef" - assignment = "Chef" - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/corpse/chef/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chef(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - else - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/chef/classic(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack(new_human), WEAR_BACK) - -//*****************************************************************************************************/ - /datum/equipment_preset/corpse/doctor name = "Corpse - Doctor" assignment = "Medical Doctor" @@ -798,8 +714,8 @@ /datum/equipment_preset/corpse/pmc/goon name = "Corpse - Weyland-Yutani Corporate (Goon)" languages = list(LANGUAGE_ENGLISH) - assignment = JOB_WY_GOON - rank = JOB_WY_GOON + assignment = JOB_WY_SEC + rank = JOB_WY_SEC paygrade = "WEY-GOON" skills = /datum/skills/MP @@ -820,8 +736,8 @@ /datum/equipment_preset/corpse/pmc/goon/lead name = "Corpse - Weyland-Yutani Corporate Security Lead (Goon Lead)" flags = EQUIPMENT_PRESET_EXTRA - assignment = JOB_WY_GOON_LEAD - rank = JOB_WY_GOON_LEAD + assignment = JOB_WY_SEC_LEAD + rank = JOB_WY_SEC_LEAD paygrade = "WEY-GOON-L" /datum/equipment_preset/corpse/pmc/goon/lead/load_gear(mob/living/carbon/human/new_human) @@ -868,39 +784,6 @@ name = "Corpse - Burst Freelancer Mercenary" xenovictim = TRUE -// Fun Faction Corpse - -// Dutch Dozen - -/datum/equipment_preset/corpse/dutchrifle - name = "Corpse - Dutch Dozen Rifleman" - assignment = "Dutch Dozen Rifleman" - idtype = /obj/item/card/id/silver - faction = FACTION_DUTCH - xenovictim = FALSE - -/datum/equipment_preset/corpse/dutchrifle/New() - . = ..() - access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL) - -/datum/equipment_preset/corpse/dutchrifle/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/dutch(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/dutch(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/dutch(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/dutch(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) - spawn_merc_helmet(new_human) - -/datum/equipment_preset/corpse/dutchrifle/burst - name = "Corpse - Burst Dutch Dozen Rifleman" - xenovictim = TRUE - // Pizza Planet /datum/equipment_preset/corpse/pizza @@ -940,80 +823,3 @@ name = "Corpse - Burst Pizza Deliverer" xenovictim = TRUE -// Gladiator - -/datum/equipment_preset/corpse/gladiator - name = "Corpse - Gladiator" - assignment = "Gladiator" - idtype = /obj/item/card/id/dogtag - faction = FACTION_GLADIATOR - xenovictim = FALSE - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_MARINE_MAINT, - ) - -/datum/equipment_preset/corpse/gladiator/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/gladiator, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chainshirt/hunter, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/gladiator, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot, WEAR_R_HAND) - new_human.equip_to_slot_or_del(new /obj/item/weapon/sword, WEAR_L_HAND) - - var/obj/item/lantern = new /obj/item/device/flashlight/lantern(new_human) - lantern.name = "Beacon of Holy Light" - -/datum/equipment_preset/corpse/gladiator/burst - name = "Corpse - Burst Gladiator" - xenovictim = TRUE - - -//FORECON - -/datum/equipment_preset/corpse/forecon_spotter - name = "Corpse - USCM Reconnaissance Spotter" - assignment = "Reconnaissance Spotter" - xenovictim = FALSE - paygrade = "ME5" - idtype = /obj/item/card/id/dogtag - role_comm_title = "FORECON" - faction_group = list(FACTION_USCM, FACTION_SURVIVOR) - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ) - -/datum/equipment_preset/corpse/forecon_spotter/load_gear(mob/living/carbon/human/new_human) - var/obj/item/clothing/under/marine/reconnaissance/uniform = new() - var/obj/item/clothing/accessory/storage/droppouch/pouch = new() - var/obj/item/clothing/accessory/ranks/marine/e5/pin = new() - var/obj/item/clothing/accessory/patch/patch_uscm = new() - var/obj/item/clothing/accessory/patch/forecon/patch_forecon = new() - uniform.attach_accessory(new_human,pouch) - uniform.attach_accessory(new_human,patch_uscm) - uniform.attach_accessory(new_human,pin) - uniform.attach_accessory(new_human,patch_forecon) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/marine(new_human), WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/facepaint/sniper(new_human), WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) diff --git a/code/modules/gear_presets/fun.dm b/code/modules/gear_presets/fun.dm index e3519b1ab5..8d3a4bb8a7 100644 --- a/code/modules/gear_presets/fun.dm +++ b/code/modules/gear_presets/fun.dm @@ -280,3 +280,4 @@ new_human.status_flags &= ~NO_PERMANENT_DAMAGE new_human.status_flags |= STATUS_FLAGS_DEBILITATE ADD_TRAIT(new_human, TRAIT_TWOBORE_TRAINING, TRAIT_SOURCE_ADMIN) //Means he can handle his gun and speak its hit lines. + diff --git a/code/modules/gear_presets/other.dm b/code/modules/gear_presets/other.dm index 3f9f60415a..c74c283457 100644 --- a/code/modules/gear_presets/other.dm +++ b/code/modules/gear_presets/other.dm @@ -4,34 +4,10 @@ //*****************************************************************************************************/ -/datum/equipment_preset/other/mutineer - name = "Mutineer" - flags = EQUIPMENT_PRESET_EXTRA - -/datum/equipment_preset/other/mutineer/load_status(mob/living/carbon/human/new_human) - . = ..() - new_human.mob_flags |= MUTINEER - new_human.hud_set_squad() - - to_chat(new_human, SPAN_HIGHDANGER("
You are now a Mutineer!")) - to_chat(new_human, SPAN_DANGER("Please check the rules to see what you can and can't do as a mutineer.
")) - -/datum/equipment_preset/other/mutineer/leader - name = "Mutineer Leader" - flags = EQUIPMENT_PRESET_EXTRA - -/datum/equipment_preset/other/mutineer/leader/load_status(mob/living/carbon/human/new_human) - for(var/datum/action/human_action/activable/mutineer/A in new_human.actions) - A.remove_from(new_human) - - var/list/abilities = subtypesof(/datum/action/human_action/activable/mutineer) - for(var/type in abilities) - give_action(new_human, type) - /datum/equipment_preset/other/freelancer name = "Freelancer" - assignment = "Freelancer" + assignment = "#$$%$^&%#$" rank = FACTION_FREELANCER idtype = /obj/item/card/id/data faction = FACTION_FREELANCER @@ -755,95 +731,6 @@ //*****************************************************************************************************/ -/datum/equipment_preset/other/xeno_cultist - name = "Cultist - Xeno Cultist" - faction = FACTION_XENOMORPH - flags = EQUIPMENT_PRESET_EXTRA - idtype = /obj/item/card/id/lanyard - skills = /datum/skills/civilian/survivor - - languages = list(LANGUAGE_XENOMORPH, LANGUAGE_ENGLISH) - - assignment = "Cultist" - rank = "Cultist" - -/datum/equipment_preset/other/xeno_cultist/New() - . = ..() - access = get_access(ACCESS_LIST_COLONIAL_ALL) - -/datum/equipment_preset/other/xeno_cultist/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chaplain/cultist(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) - - var/obj/item/clothing/suit/cultist_hoodie/hoodie = new /obj/item/clothing/suit/cultist_hoodie(new_human) - hoodie.flags_item |= NODROP|DELONDROP - new_human.equip_to_slot_or_del(hoodie, WEAR_JACKET) - - var/obj/item/clothing/head/cultist_hood/hood = new /obj/item/clothing/head/cultist_hood(new_human) - hood.flags_item |= NODROP|DELONDROP - new_human.equip_to_slot_or_del(hood, WEAR_HEAD) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - -//*****************************************************************************************************/ -/datum/equipment_preset/other/xeno_cultist/load_status(mob/living/carbon/human/new_human, hivenumber = XENO_HIVE_NORMAL) - if(SSticker.mode && new_human.mind) - SSticker.mode.xenomorphs += new_human.mind - - var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] - if(hive) - new_human.faction = hive.internal_faction - if(hive.leading_cult_sl == new_human) - hive.leading_cult_sl = null - new_human.hivenumber = hivenumber - - GLOB.xeno_cultists += new_human - - var/list/huds_to_add = list(MOB_HUD_XENO_INFECTION, MOB_HUD_XENO_STATUS) - - for(var/hud_to_add in huds_to_add) - var/datum/mob_hud/hud = huds[hud_to_add] - hud.add_hud_to(new_human, new_human) - - var/list/actions_to_add = subtypesof(/datum/action/human_action/activable/cult) - - if(istype(new_human.wear_suit, /obj/item/clothing/suit/cultist_hoodie) || istype(new_human.head, /obj/item/clothing/head/cultist_hood)) - actions_to_add -= /datum/action/human_action/activable/cult/obtain_equipment - - for(var/action_to_add in actions_to_add) - give_action(new_human, action_to_add) - - new_human.default_lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE - new_human.update_sight() - -/datum/equipment_preset/other/xeno_cultist/leader - name = "Cultist - Xeno Cultist Leader" - uses_special_name = TRUE - flags = EQUIPMENT_PRESET_EXTRA - skills = /datum/skills/cultist_leader - - assignment = "Cultist Leader" - rank = "Cultist Leader" - -/datum/equipment_preset/other/xeno_cultist/leader/load_gear(mob/living/carbon/human/new_human) - . = ..() - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/cultist(new_human), WEAR_EYES) - -/datum/equipment_preset/other/xeno_cultist/leader/load_status(mob/living/carbon/human/new_human) - . = ..() - - var/datum/hive_status/hive = GLOB.hive_datum[new_human.hivenumber] - hive.leading_cult_sl = new_human - - var/list/types = subtypesof(/datum/action/human_action/activable/cult_leader) - for(var/type in types) - give_action(new_human, type) - -//*****************************************************************************************************/ - /datum/equipment_preset/other/professor_dummy name = "DUMMY" flags = EQUIPMENT_PRESET_EXTRA @@ -874,80 +761,5 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical, WEAR_BODY) -//*****************************************************************************************************/ - -/datum/equipment_preset/other/tank - name = "Event Vehicle Crewman (CRMN)" - flags = EQUIPMENT_PRESET_EXTRA - - idtype = /obj/item/card/id/dogtag - assignment = JOB_CREWMAN - rank = JOB_CREWMAN - paygrade = "E4" - role_comm_title = "CRMN" - minimum_age = 30 - skills = /datum/skills/tank_crew - - faction = FACTION_NEUTRAL - -/datum/equipment_preset/other/tank/New() - . = ..() - access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) - -/datum/equipment_preset/other/tank/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/vc(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/tanker(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/weldpack(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/tech/tanker(new_human), WEAR_HEAD) - - spawn_weapon(/obj/item/weapon/gun/smg/m39, /obj/item/ammo_magazine/smg/m39/extended, new_human, 0, 3) - -/datum/equipment_preset/other/tank/load_status() - return - -//*****************************************************************************************************/ - -//*****************************************************************************************************/ -//adding one for VC training camp, cause I really need these -/datum/equipment_preset/other/tank/trainee - name = "Vehicle Crewman Trainee (CRTR)" - flags = EQUIPMENT_PRESET_EXTRA - - idtype = /obj/item/card/id/dogtag - assignment = "Crewman Trainee" - rank = "Crewman Trainee" - paygrade = "E3" - role_comm_title = "CRTR" - minimum_age = 25 - skills = /datum/skills/tank_crew - - faction = FACTION_NEUTRAL - -/datum/equipment_preset/other/tank/trainee/New() - . = ..() - access = list( - ACCESS_MARINE_PREP, - ACCESS_MARINE_CREWMAN, - ACCESS_MARINE_ALPHA, - ACCESS_MARINE_BRAVO, - ACCESS_MARINE_CHARLIE, - ACCESS_MARINE_DELTA, - ) - -/datum/equipment_preset/other/tank/trainee/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/tanker(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tank(new_human), WEAR_R_STORE) //*****************************************************************************************************/ diff --git a/code/modules/gear_presets/survivors/corsat/preset_corsat.dm b/code/modules/gear_presets/survivors/corsat/preset_corsat.dm deleted file mode 100644 index 2e3887c7ef..0000000000 --- a/code/modules/gear_presets/survivors/corsat/preset_corsat.dm +++ /dev/null @@ -1,58 +0,0 @@ -/datum/equipment_preset/survivor/security/corsat - name = "Survivor - CORSAT Security Guard" - assignment = "Weyland-Yutani Security Guard" - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - -/datum/equipment_preset/survivor/security/corsat/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/formal/servicedress(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/doctor/corsat - name = "Survivor - CORSAT Doctor" - assignment = "CORSAT Doctor" - -/datum/equipment_preset/survivor/doctor/corsat/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical/green(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/scientist/corsat - name = "Survivor - CORSAT Researcher" - assignment = "CORSAT Researcher" - -/datum/equipment_preset/survivor/scientist/corsat/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/offwhite(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/corsat - name = "Survivor - Interstellar Commerce Commission Liaison CORSAT" - assignment = "Interstellar Commerce Commission Corporate Liaison" - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/corsat/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/corporate_formal(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/engineer/corsat - name = "Survivor - Corsat Station Engineer" - assignment = "Corsat Station Engineer" - -/datum/equipment_preset/survivor/engineer/corsat/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/techofficer(new_human), WEAR_HEAD) - ..() diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm deleted file mode 100644 index 09b8fc4f23..0000000000 --- a/code/modules/gear_presets/survivors/fiorina_sciannex/preset_fiorina_sciannex.dm +++ /dev/null @@ -1,65 +0,0 @@ - -/datum/equipment_preset/survivor/scientist/florina - name = "Survivor - Florina Researcher" - assignment = "Florina Researcher" - -/datum/equipment_preset/survivor/scientist/florina/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical/purple(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/purple(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) - ..() - - -/datum/equipment_preset/survivor/doctor/florina - name = "Survivor - Florina Doctor" - assignment = "Florina Doctor" - -/datum/equipment_preset/survivor/doctor/florina/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/security/florina - name = "Survivor - Florina Prison Guard" - assignment = "Florina Prison Guard" - -/datum/equipment_preset/survivor/security/florina/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/security(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/colonial_marshal/florina - name = "Survivor - United Americas Riot Officer" - assignment = "United Americas Riot Officer" - -/datum/equipment_preset/survivor/colonial_marshal/florina/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - - ..() - -/datum/equipment_preset/survivor/engineer/florina - name = "Survivor - Florina Engineer" - assignment = "Florina Engineer" - -/datum/equipment_preset/survivor/engineer/florina/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) - ..() diff --git a/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm b/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm deleted file mode 100644 index af4e4aec2c..0000000000 --- a/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm +++ /dev/null @@ -1,76 +0,0 @@ -/datum/equipment_preset/survivor/engineer/kutjevo - name = "Survivor - Kutjevo Engineer" - assignment = "Kutjevo Engineer" - -/datum/equipment_preset/survivor/engineer/kutjevo/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - ..() - -/datum/equipment_preset/survivor/chaplain/kutjevo - name = "Survivor - Kutjevo Chaplain" - assignment = "Kutjevo Chaplain" - -/datum/equipment_preset/survivor/chaplain/kutjevo/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - - ..() - -/datum/equipment_preset/survivor/security/kutjevo - name = "Survivor - Kutjevo Security Guard" - assignment = "Kutjevo Security Guard" - - -/datum/equipment_preset/survivor/security/kutjevo/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/doctor/kutjevo - name = "Survivor - Kutjevo Doctor" - assignment = "Kutjevo Doctor" - -/datum/equipment_preset/survivor/doctor/kutjevo/load_gear(mob/living/carbon/human/new_human) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - ..() - -/datum/equipment_preset/survivor/colonial_marshal/kutjevo - name = "Survivor - Kutjevo Colonial Marshal Deputy" - assignment = "CMB Deputy" - -/datum/equipment_preset/survivor/colonial_marshal/kutjevo/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - ..() - -/datum/equipment_preset/survivor/trucker/kutjevo - name = "Survivor - Kutjevo Heavy Vehicle Operator" - assignment = "Kutjevo Heavy Vehicle Operator" - -/datum/equipment_preset/survivor/trucker/kutjevo/load_gear(mob/living/carbon/human/new_human) - add_random_kutjevo_survivor_uniform(new_human) - add_random_kutjevo_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - - ..() diff --git a/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm b/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm deleted file mode 100644 index 1bfeaaad9c..0000000000 --- a/code/modules/gear_presets/survivors/lv_624/clfship_insert_lv624.dm +++ /dev/null @@ -1,30 +0,0 @@ -// /obj/effect/landmark/survivor_spawner/lv624_crashed_clf -// clfship.dmm -/datum/equipment_preset/survivor/clf - name = "CLF Survivor" - flags = EQUIPMENT_PRESET_EXTRA - skills = /datum/skills/civilian/survivor/clf - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - faction = FACTION_CLF - faction_group = list(FACTION_CLF, FACTION_SURVIVOR) - access = list(ACCESS_CIVILIAN_PUBLIC) - survivor_variant = HOSTILE_SURVIVOR - -/datum/equipment_preset/survivor/clf/load_gear(mob/living/carbon/human/new_human) - - spawn_rebel_uniform(new_human) - spawn_rebel_suit(new_human) - spawn_rebel_helmet(new_human) - spawn_rebel_shoes(new_human) - spawn_rebel_gloves(new_human) - spawn_rebel_belt(new_human) - - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) - add_survivor_weapon_security(new_human) - add_survivor_weapon_pistol(new_human) - - ..() diff --git a/code/modules/gear_presets/survivors/lv_624/preset_lv.dm b/code/modules/gear_presets/survivors/lv_624/preset_lv.dm deleted file mode 100644 index a0d8bedee7..0000000000 --- a/code/modules/gear_presets/survivors/lv_624/preset_lv.dm +++ /dev/null @@ -1,83 +0,0 @@ -/datum/equipment_preset/survivor/scientist/lv - name = "Survivor - LV-624 Archeologist" - assignment = "LV-624 Archeologist" - -/datum/equipment_preset/survivor/scientist/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/offwhite(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/colonial_marshal/lv - name = "Survivor - LV-624 Head of Security" - assignment = "LV-624 Head of Security" - -/datum/equipment_preset/survivor/colonial_marshal/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/head_of_security/navyblue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/hos(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/trucker/lv - name = "Survivor - LV-624 Cargo Technician" - assignment = "LV-624 Cargo Technician" - -/datum/equipment_preset/survivor/trucker/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/cargo(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/yellow(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - ..() - -/datum/equipment_preset/survivor/engineer/lv - name = "Survivor - LV-624 Engineer" - assignment = "LV-624 Engineer" - -/datum/equipment_preset/survivor/engineer/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/dispatch(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/chaplain/lv - name = "Survivor - LV-624 Priest" - assignment = "LV-624 Priest" - -/datum/equipment_preset/survivor/chaplain/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chaplain(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/priest_robe(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/doctor/lv - name = "Survivor - LV-624 Emergency Medical Technician" - assignment = "LV-624 Emergency Medical Technician" - -/datum/equipment_preset/survivor/doctor/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human.back), WEAR_IN_BACK) - ..() - -/datum/equipment_preset/survivor/security/lv - name = "Survivor - LV-624 Security Guard" - assignment = "Weyland-Yutani Security Guard" - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - -/datum/equipment_preset/survivor/security/lv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/formal/servicedress(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle(new_human), WEAR_FEET) - ..() - diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index b347edd628..6790e48c96 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -97,117 +97,6 @@ everything bellow isn't used or out of place. ..() -// --- Salesman Survivor - -// after double check salesman isn't being used anywhere. -/datum/equipment_preset/survivor/salesman - name = "Survivor - Salesman" - assignment = "Salesman" - skills = /datum/skills/civilian/survivor - flags = EQUIPMENT_PRESET_START_OF_ROUND - idtype = /obj/item/card/id/data - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/salesman/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/wcoat(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - add_random_cl_survivor_loot(new_human) - add_survivor_weapon_civilian(new_human) - ..() - - -// ----- Roughneck Survivor - -// after double check roughneck isn't being used anywhere. -/datum/equipment_preset/survivor/roughneck - name = "Survivor - Roughneck" - assignment = "Roughneck" - skills = /datum/skills/civilian/survivor/pmc - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/roughneck/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf/tacticalmask/green(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(new_human), WEAR_R_STORE) - add_pmc_survivor_weapon(new_human) - - ..() - -// ----- Bum Survivor - -// after double check beachbum isn't being used anywhere. -/datum/equipment_preset/survivor/beachbum - name = "Survivor - Beach Bum" - assignment = "Beach Bum" - skills = /datum/skills/civilian/survivor/prisoner - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/beachbum/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/shorts/red(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/botanic_leather(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/beer_pack(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/knife/butcher(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/wypacket(new_human.back), WEAR_IN_BACK) - add_survivor_weapon_civilian(new_human) - - ..() - -// ----- WY Survivors - -// after double check goon isn't being used anywhere. -/datum/equipment_preset/survivor/goon - name = "Survivor - Corporate Security Goon" - flags = EQUIPMENT_PRESET_START_OF_ROUND - assignment = JOB_WY_GOON - paygrade = "WEY-GOON" - idtype = /obj/item/card/id/silver/cl - skills = /datum/skills/civilian/survivor/goon - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_BRIG) - - survivor_variant = SECURITY_SURVIVOR - -/datum/equipment_preset/survivor/goon/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_near_empty, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate/no_lock, WEAR_J_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) - - // ----- Mercenary Survivors // after double check pmc/miner/one isn't being used anywhere. diff --git a/code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm b/code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm deleted file mode 100644 index d51cdad461..0000000000 --- a/code/modules/gear_presets/survivors/new_varadero/preset_new_varadero.dm +++ /dev/null @@ -1,88 +0,0 @@ -/datum/equipment_preset/survivor/security/nv - name = "Survivor - New Varadero Security Guard" - assignment = "United Americas Peacekeeper" - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - -/datum/equipment_preset/survivor/security/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/doctor/nv - name = "Survivor - New Varadero Medical Technician" - assignment = "New Varadero Medical Technician" - -/datum/equipment_preset/survivor/doctor/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/synthetic/utility(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/scientist/nv - name = "Survivor - New Varadero Researcher" - assignment = "New Varadero Researcher" - -/datum/equipment_preset/survivor/scientist/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/offwhite(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv - name = "Survivor - Interstellar Commerce Commission Liaison New Varadero" - assignment = "Interstellar Commerce Commission Corporate Liaison" - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/corporate_formal(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/black(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clipboard, WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses, WEAR_EYES) - ..() - -/datum/equipment_preset/survivor/trucker/nv - name = "Survivor - New Varadero Cargo Technician" - assignment = "New Varadero Cargo Technician" - -/datum/equipment_preset/survivor/trucker/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/meson(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beanie/tan(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel/tech(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/brown(new_human), WEAR_HANDS) - ..() - -/datum/equipment_preset/survivor/engineer/nv - name = "Survivor - New Varadero Technician" - assignment = "New Varadero Engineer" - -/datum/equipment_preset/survivor/engineer/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/ua_civvies(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/blue(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/dblue(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/chaplain/nv - name = "Survivor - New Varadero Priest" - assignment = "New Varadero Priest" - -/datum/equipment_preset/survivor/chaplain/nv/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chaplain(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/priest_robe(new_human), WEAR_JACKET) - ..() diff --git a/code/modules/gear_presets/survivors/shivas_snowball/preset_shivas_snowball.dm b/code/modules/gear_presets/survivors/shivas_snowball/preset_shivas_snowball.dm deleted file mode 100644 index 39ba1a5f18..0000000000 --- a/code/modules/gear_presets/survivors/shivas_snowball/preset_shivas_snowball.dm +++ /dev/null @@ -1,82 +0,0 @@ -/datum/equipment_preset/survivor/corporate/shiva - name = "Survivor - Shivas Snowball Corporate Liaison" - assignment = "Shivas Snowball Corporate Liaison" - -/datum/equipment_preset/survivor/corporate/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/black(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/navy(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/doctor/shiva - name = "Survivor - Shivas Snowball Doctor" - assignment = "Shivas Snowball Doctor" - -/datum/equipment_preset/survivor/doctor/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical/green(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/green(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - ..() - -/datum/equipment_preset/survivor/scientist/shiva - name = "Survivor - Shivas Snowball Researcher" - assignment = "Shivas Snowball Researcher" - -/datum/equipment_preset/survivor/scientist/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/tox(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/purple(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/colonial_marshal/shiva - name = "Survivor - Shivas Colonial Marshal Deputy" - assignment = "CMB Deputy" - -/datum/equipment_preset/survivor/colonial_marshal/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/security/corp(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/red(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/engineer/shiva - name = "Survivor - Shivas Snowball Engineer" - assignment = "Shivas Snowball Engineer" - -/datum/equipment_preset/survivor/engineer/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/cyan(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor/parka/yellow(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/security/shiva - name = "Survivor - Shivas Snowball Security Guard" - assignment = "United Americas Peacekeeper" - -/datum/equipment_preset/survivor/security/shiva/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - ..() diff --git a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm deleted file mode 100644 index 0801dd43c2..0000000000 --- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm +++ /dev/null @@ -1,193 +0,0 @@ -//those preset are only used on this insert. -// /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc - -/datum/equipment_preset/survivor/pmc - name = "Survivor - PMC" - flags = EQUIPMENT_PRESET_START_OF_ROUND - assignment = "Weyland-Yutani PMC" - faction = FACTION_SURVIVOR - faction_group = list(FACTION_WY, FACTION_SURVIVOR) - paygrade = "PMC-OP" - idtype = /obj/item/card/id/pmc - skills = /datum/skills/civilian/survivor/pmc - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - access = list( - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_MEDICAL, - ACCESS_WY_SECURITY, - ACCESS_WY_RESEARCH, - ACCESS_WY_ARMORY, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/datum/equipment_preset/survivor/pmc/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - add_pmc_survivor_weapon(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) - - ..() -// /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic - -/datum/equipment_preset/survivor/pmc/medic - name = "Survivor - PMC Medic" - assignment = JOB_PMC_MEDIC - rank = JOB_PMC_MEDIC - paygrade = "PMC-MS" - skills = /datum/skills/civilian/survivor/pmc/medic - -/datum/equipment_preset/survivor/pmc/medic/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv(new_human), WEAR_IN_BACK) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_R_HAND) - - ..() -// /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer - -/datum/equipment_preset/survivor/pmc/engineer - name = "Survivor - PMC Engineer" - assignment = JOB_PMC_ENGINEER - rank = JOB_PMC_ENGINEER - paygrade = "PMC-TECH" - skills = /datum/skills/civilian/survivor/pmc/engineer - -/datum/equipment_preset/survivor/pmc/engineer/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/med_small_stack(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_R_HAND) - - ..() - -// /obj/effect/landmark/survivor_spawner/bigred_crashed_cl - -/datum/equipment_preset/survivor/wy/manager - name = "Survivor - Corporate Supervisor" - flags = EQUIPMENT_PRESET_EXTRA - paygrade = "WYC7" - skills = /datum/skills/civilian/survivor/manager - assignment = "Colony Supervisor" - role_comm_title = "Supervisor" - idtype = /obj/item/card/id/silver/clearance_badge/manager - faction_group = list(FACTION_WY, FACTION_SURVIVOR) - access = list( - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_MEDICAL, - ACCESS_WY_SECURITY, - ACCESS_WY_RESEARCH, - ACCESS_WY_ARMORY, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_ILLEGAL_PIRATE, - ) - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - - survivor_variant = CORPORATE_SURVIVOR - -/datum/equipment_preset/survivor/wy/manager/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/ivory(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/grant, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/black(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/manager(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) - add_pmc_survivor_weapon(new_human) - add_random_cl_survivor_loot(new_human) - - ..() -// only used on the spawner of all of those above... -/datum/equipment_preset/synth/survivor/pmc - name = "Survivor - Synthetic - PMC Support Synth" - faction = FACTION_SURVIVOR - faction_group = list(FACTION_WY, FACTION_SURVIVOR) - access = list( - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_MEDICAL, - ACCESS_WY_SECURITY, - ACCESS_WY_RESEARCH, - ACCESS_WY_ARMORY, - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - idtype = /obj/item/card/id/pmc - assignment = JOB_PMC_SYNTH - rank = JOB_PMC_SYNTH - role_comm_title = "WY Syn" - -/datum/equipment_preset/synth/survivor/pmc/load_race(mob/living/carbon/human/new_human) - new_human.set_species(SYNTH_GEN_THREE) - -/datum/equipment_preset/synth/survivor/pmc/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/scalpel/manager, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/weylandyutani, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/handcuffs/zip, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/synth, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/nailgun, WEAR_IN_JACKET) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/command/hvh, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/white, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crew_monitor, WEAR_IN_BACK) - - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/nailgun/compact, WEAR_J_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_R_STORE) diff --git a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm b/code/modules/gear_presets/survivors/solaris/preset_solaris.dm deleted file mode 100644 index 8f0cf6875c..0000000000 --- a/code/modules/gear_presets/survivors/solaris/preset_solaris.dm +++ /dev/null @@ -1,94 +0,0 @@ -/datum/equipment_preset/survivor/trucker/solaris - name = "Survivor - Solaris Heavy Vehicle Operator" - assignment = "Solaris Heavy Vehicle Operator" - skills = /datum/skills/civilian/survivor/trucker - -/datum/equipment_preset/survivor/trucker/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/worker_overalls(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/apron/overalls(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/red(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big(new_human), WEAR_EYES) - ..() - -/datum/equipment_preset/survivor/colonial_marshal/solaris - name = "Survivor - Solaris Colonial Marshal Deputy" - assignment = "CMB Deputy" - - -/datum/equipment_preset/survivor/colonial_marshal/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/engineer/solaris - name = "Survivor - Solaris Engineer" - assignment = "Solaris Engineer" - -/datum/equipment_preset/survivor/engineer/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/cyan(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/yellow(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - ..() - -/datum/equipment_preset/survivor/scientist/solaris - name = "Survivor - Solaris Scientist" - assignment = "Solaris Scientist" - -/datum/equipment_preset/survivor/scientist/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/virologist(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/green(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/green(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/doctor/solaris - name = "Survivor - Solaris Doctor" - assignment = "Solaris Doctor" - -/datum/equipment_preset/survivor/doctor/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical/purple(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/purple(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/chaplain/solaris - name = "Survivor - Solaris Chaplain" - assignment = "Solaris Chaplain" - -/datum/equipment_preset/survivor/chaplain/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/nun_hood(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/security/solaris - name = "Survivor - Solaris United Americas Peacekeepers" - assignment = "United Americas Peacekeeper" - -/datum/equipment_preset/survivor/security/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec/hos(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/corporate/solaris - name = "Survivor - Solaris Ridge Corporate Liaison" - assignment = "Solaris Ridge Corporate Liaison" - -/datum/equipment_preset/survivor/corporate/solaris/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/ivy(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - ..() diff --git a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm b/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm deleted file mode 100644 index 1dd9d6adf6..0000000000 --- a/code/modules/gear_presets/survivors/sorokyne_strata/preset_sorokyne_strata.dm +++ /dev/null @@ -1,60 +0,0 @@ -/datum/equipment_preset/survivor/engineer/soro - name = "Survivor - Sorokyne Strata Political Prisioner" - assignment = "Sorokyne Strata Political Prisioner" - -/datum/equipment_preset/survivor/engineer/soro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - ..() - -/datum/equipment_preset/survivor/security/soro - name = "Survivor - Sorokyne Strata Security" - assignment = "Sorokyne Strata Security" - -/datum/equipment_preset/survivor/security/soro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/veteran/soviet_uniform_01(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/soviet(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - ..() - -/datum/equipment_preset/survivor/doctor/soro - name = "Survivor - Sorokyne Strata Doctor" - assignment = "Sorokyne Strata Doctor" - -/datum/equipment_preset/survivor/doctor/soro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/veteran/soviet_uniform_01(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/scientist/soro - name = "Survivor - Sorokyne Strata Researcher" - assignment = "Sorokyne Strata Researcher" - -/datum/equipment_preset/survivor/scientist/soro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/regular(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/tox(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/interstellar_human_rights_observer/soro - name = "Survivor - Sorokyne Interstellar Human Rights Observer" - assignment = "Interstellar Human Rights Observer(Sorokyne)" - - -/datum/equipment_preset/survivor/interstellar_human_rights_observer/soro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/survivor(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD) - ..() diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm index 9b334daca1..c98230367a 100644 --- a/code/modules/gear_presets/survivors/survivors.dm +++ b/code/modules/gear_presets/survivors/survivors.dm @@ -36,7 +36,7 @@ /datum/equipment_preset/survivor/load_id(mob/living/carbon/human/new_human, client/mob_client) var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) - uniform.has_sensor = UNIFORM_HAS_SENSORS + uniform.has_sensor = UNIFORM_NO_SENSORS uniform.sensor_faction = FACTION_COLONIST return ..() diff --git a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm b/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm deleted file mode 100644 index c1ca81683c..0000000000 --- a/code/modules/gear_presets/survivors/trijent/crashlanding_upp_bar_insert_trijent.dm +++ /dev/null @@ -1,203 +0,0 @@ -// as far as i understand this is only done for one insert -//crashlanding-upp-bar.dmm map. -/datum/equipment_preset/survivor/upp - name = "Survivor - UPP" - paygrade = "UE1" - origin_override = ORIGIN_UPP - rank = JOB_SURVIVOR - skills = /datum/skills/military/survivor/upp_private - languages = list(LANGUAGE_RUSSIAN, LANGUAGE_GERMAN, LANGUAGE_CHINESE) - faction = FACTION_UPP - faction_group = list(FACTION_UPP, FACTION_SURVIVOR) - role_comm_title = "173/RECON" - idtype = /obj/item/card/id/dogtag - flags = EQUIPMENT_PRESET_EXTRA - access = list( - ACCESS_CIVILIAN_PUBLIC, - ) - -/datum/equipment_preset/survivor/upp/load_gear(mob/living/carbon/human/new_human) - var/obj/item/clothing/under/marine/veteran/UPP/uniform = new() - var/random_number = rand(1,2) - switch(random_number) - if(1) - uniform.roll_suit_jacket(new_human) - if(2) - uniform.roll_suit_sleeves(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp (new_human), WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp_knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/flare(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/recon(new_human), WEAR_L_EAR) - -// /obj/effect/landmark/survivor_spawner/upp/soldier -//crashlanding-upp-bar.dmm -/datum/equipment_preset/survivor/upp/soldier - name = "Survivor - UPP Soldier" - paygrade = "UE2" - assignment = JOB_UPP - rank = JOB_UPP - skills = /datum/skills/military/survivor/upp_private - -/datum/equipment_preset/survivor/upp/soldier/load_gear(mob/living/carbon/human/new_human) - var/obj/item/clothing/under/marine/veteran/UPP/uniform = new() - var/random_number = rand(1,2) - switch(random_number) - if(1) - uniform.roll_suit_jacket(new_human) - if(2) - uniform.roll_suit_sleeves(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - add_upp_weapon(new_human) - spawn_random_upp_headgear(new_human) - spawn_random_upp_armor(new_human) - spawn_random_upp_belt(new_human) - - ..() -// /obj/effect/landmark/survivor_spawner/upp_sapper -//crashlanding-upp-bar.dmm -/datum/equipment_preset/survivor/upp/sapper - name = "Survivor - UPP Sapper" - paygrade = "UE3" - assignment = JOB_UPP_ENGI - rank = JOB_UPP_ENGI - skills = /datum/skills/military/survivor/upp_sapper - -/datum/equipment_preset/survivor/upp/sapper/load_gear(mob/living/carbon/human/new_human) - - var/obj/item/clothing/under/marine/veteran/UPP/engi/uniform = new() - var/R = rand(1,2) - switch(R) - if(1) - uniform.roll_suit_jacket(new_human) - if(2) - uniform.roll_suit_sleeves(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - spawn_random_upp_armor(new_human) - add_upp_weapon(new_human) - spawn_random_upp_headgear(new_human) - - ..() -// /obj/effect/landmark/survivor_spawner/upp_medic -//crashlanding-upp-bar.dmm -/datum/equipment_preset/survivor/upp/medic - name = "Survivor - UPP Medic" - paygrade = "UE3" - assignment = JOB_UPP_MEDIC - rank = JOB_UPP_MEDIC - skills = /datum/skills/military/survivor/upp_medic - -/datum/equipment_preset/survivor/upp/medic/load_gear(mob/living/carbon/human/new_human) - var/obj/item/clothing/under/marine/veteran/UPP/medic/uniform = new() - var/random_number = rand(1,2) - switch(random_number) - if(1) - uniform.roll_suit_jacket(new_human) - if(2) - uniform.roll_suit_sleeves(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new/obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/partial(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/medic/upp(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/extinguisher/mini(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_BACK) - spawn_random_upp_armor(new_human) - add_upp_weapon(new_human) - spawn_random_upp_headgear(new_human) - - ..() -// /obj/effect/landmark/survivor_spawner/upp_specialist -//crashlanding-upp-bar.dmm -/datum/equipment_preset/survivor/upp/specialist - name = "Survivor - UPP Specialist" - assignment = JOB_UPP_SPECIALIST - rank = JOB_UPP_SPECIALIST - paygrade = "UE4" - skills = /datum/skills/military/survivor/upp_spec - -/datum/equipment_preset/survivor/upp/specialist/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP/heavy(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP (new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP/heavy (new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/type71/flamer(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/type71(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/t73(new_human), WEAR_WAIST) - - ..() -//crashlanding-upp-bar.dmm -// /obj/effect/landmark/survivor_spawner/squad_leader -/datum/equipment_preset/survivor/upp/squad_leader - name = "Survivor - UPP Squad Leader" - paygrade = "UE5" - assignment = JOB_UPP_LEADER - rank = JOB_UPP_LEADER - languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH, LANGUAGE_GERMAN, LANGUAGE_CHINESE) - role_comm_title = "173/RECON SL" - skills = /datum/skills/military/survivor/upp_sl - -/datum/equipment_preset/survivor/upp/squad_leader/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/UPP/officer (new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP (new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/type47/revolver(new_human), WEAR_WAIST) - add_upp_weapon(new_human) - - ..() - -//it's used on all of the above in their spawner. -/datum/equipment_preset/synth/survivor/upp - name = "Survivor - Synthetic - UPP Synth" - flags = EQUIPMENT_PRESET_EXTRA - languages = ALL_SYNTH_LANGUAGES_UPP - assignment = JOB_UPP_SUPPORT_SYNTH - rank = JOB_UPP_SUPPORT_SYNTH - faction = FACTION_UPP - faction_group = list(FACTION_UPP, FACTION_SURVIVOR) - skills = /datum/skills/colonial_synthetic - paygrade = "SYN" - idtype = /obj/item/card/id/dogtag - role_comm_title = "173/RECON Syn" - -/datum/equipment_preset/synth/survivor/upp/load_gear(mob/living/carbon/human/new_human) - var/obj/item/clothing/under/marine/veteran/UPP/medic/uniform = new() - var/random_number = rand(1,2) - switch(random_number) - if(1) - uniform.roll_suit_jacket(new_human) - if(2) - uniform.roll_suit_sleeves(new_human) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver, WEAR_R_EAR) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/recon, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/webbing, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/upp/partial, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/uppsynth, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) diff --git a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm b/code/modules/gear_presets/survivors/trijent/preset_trijent.dm deleted file mode 100644 index ea9be51936..0000000000 --- a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm +++ /dev/null @@ -1,67 +0,0 @@ -/datum/equipment_preset/survivor/chaplain/trijent - name = "Survivor - Trijent Chaplain" - assignment = "Trijent Chaplain" - -/datum/equipment_preset/survivor/chaplain/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/nun(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/nun_hood(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(new_human), WEAR_JACKET) - ..() - -/datum/equipment_preset/survivor/security/trijent - name = "Survivor - Trijent Security Guard" - assignment = "Trijent Dam Security Guard" - -/datum/equipment_preset/survivor/security/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/head_of_security/navyblue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/mp/mpcap(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/det_suit/black(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - ..() - -/datum/equipment_preset/survivor/doctor/trijent - name = "Survivor - Trijent Doctor" - assignment = "Trijent Dam Doctor" - -/datum/equipment_preset/survivor/doctor/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical/blue(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/trucker/trijent - name = "Survivor - Trijent Dam Heavy Vehicle Operator" - assignment = "Trijent Dam Heavy Vehicle Operator" - skills = /datum/skills/civilian/survivor/trucker - -/datum/equipment_preset/survivor/trucker/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank(new_human), WEAR_IN_BACK) - ..() - -/datum/equipment_preset/survivor/engineer/trijent/hydro - name = "Survivor - Hydro Electric Engineer" - assignment = "Hydro Electric Engineer" - -/datum/equipment_preset/survivor/engineer/trijent/hydro/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/cyan(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(new_human), WEAR_HEAD) - ..() - -/datum/equipment_preset/survivor/engineer/trijent - name = "Survivor - Dam Maintenance Technician" - assignment = "Dam Maintenance Technician" - -/datum/equipment_preset/survivor/engineer/trijent/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/engi(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - ..() diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 5c6138436b..d022140bf1 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -45,7 +45,6 @@ role_comm_title = "Syn" /datum/equipment_preset/synth/uscm/load_gear(mob/living/carbon/human/new_human) - var/back_item = /obj/item/storage/backpack/marine/satchel new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom/synth(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/synthetic(new_human), WEAR_BODY) @@ -199,17 +198,6 @@ survivor_variant = ENGINEERING_SURVIVOR -/datum/equipment_preset/synth/survivor/chef_synth - name = "Synthetic - Chef Synth" - equipment_to_spawn = list( - WEAR_HEAD = /obj/item/clothing/head/chefhat, - WEAR_FACE = /obj/item/clothing/mask/surgical, - WEAR_BODY = /obj/item/clothing/under/boiler/offwhite, - WEAR_BACK = /obj/item/storage/backpack/satchel/blue, - WEAR_HANDS = /obj/item/clothing/gloves/latex, - WEAR_FEET = /obj/item/clothing/shoes/laceup, - ) - /datum/equipment_preset/synth/survivor/freelancer_synth name = "Synthetic - Freelancer Synth" equipment_to_spawn = list( @@ -236,10 +224,7 @@ WEAR_BODY = /obj/item/clothing/under/businesswear/black, WEAR_ACCESSORY = /obj/item/clothing/accessory/black, WEAR_BACK = /obj/item/storage/backpack/satchel/black, - WEAR_IN_BACK = /obj/item/weapon/telebaton, - WEAR_JACKET = /obj/item/clothing/suit/storage/webbing/utility_vest, - WEAR_WAIST = /obj/item/storage/belt/security/CMB/full, - WEAR_R_STORE = /obj/item/storage/pouch/tools/full, + WEAR_WAIST = /obj/item/storage/belt/security/cmb/full, WEAR_FEET = /obj/item/clothing/shoes/laceup, ) diff --git a/code/modules/gear_presets/uscm_dress.dm b/code/modules/gear_presets/uscm_dress.dm index 77750c0e18..811b64c248 100644 --- a/code/modules/gear_presets/uscm_dress.dm +++ b/code/modules/gear_presets/uscm_dress.dm @@ -34,7 +34,7 @@ paygrade = "ME4" skills = /datum/skills/SL - dress_under = list(/obj/item/clothing/under/marine/blues/senior) + dress_under = list(/obj/item/clothing/under/marine/blues/nco) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/nco) /datum/equipment_preset/uscm_event/dress/nco/load_gear(mob/living/carbon/human/new_human) @@ -85,7 +85,7 @@ skills = /datum/skills/SO access = list(ACCESS_MARINE_COMMAND, ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_DATABASE, ACCESS_MARINE_MEDBAY) - dress_under = list(/obj/item/clothing/under/marine/blues/senior) + dress_under = list(/obj/item/clothing/under/marine/blues/nco) dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer) dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer) dress_gloves = list(/obj/item/clothing/gloves/marine/dress) diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm index eb8b97fa9b..b68f15f964 100644 --- a/code/modules/gear_presets/uscm_event.dm +++ b/code/modules/gear_presets/uscm_event.dm @@ -33,7 +33,7 @@ dress_under = list(/obj/item/clothing/under/marine/blues/nco) dress_hat = list(/obj/item/clothing/head/marine/dress_cover/officer) dress_shoes = list(/obj/item/clothing/shoes/laceup) - dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/blues/officer) + dress_over = list(/obj/item/clothing/suit/storage/jacket/marine/dress/officer) /datum/equipment_preset/uscm_event/colonel/New() . = ..() diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm index 65fb98df07..f330225b4f 100644 --- a/code/modules/gear_presets/wy.dm +++ b/code/modules/gear_presets/wy.dm @@ -40,7 +40,7 @@ rank = JOB_EXECUTIVE_SUPERVISOR paygrade = "WYC6" -/datum/equipment_preset/wy/division_manager +/datum/equipment_preset/wy/manager name = "Prop - WeyYu - Division Manager" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_DIVISION_MANAGER @@ -48,7 +48,6 @@ paygrade = "WYC8" skills = /datum/skills/civilian/manager idtype = /obj/item/card/id/silver/clearance_badge/manager - headset_type = /obj/item/device/radio/headset/distress/pmc/command /datum/equipment_preset/wy/manager/New() . = ..() @@ -59,15 +58,8 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/ivory(new_human), WEAR_JACKET) ..() -/datum/equipment_preset/wy/manager/division_manager - name = "Corporate - H - Division Manager" - flags = EQUIPMENT_PRESET_EXTRA - assignment = JOB_DIVISION_MANAGER - rank = JOB_DIVISION_MANAGER - paygrade = "WYC8" - /datum/equipment_preset/wy/manager/chief_executive - name = "Corporate - I - Chief Executive" + name = "Prop - WeyYu - Chief Executive" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_CHIEF_EXECUTIVE rank = JOB_CHIEF_EXECUTIVE @@ -77,26 +69,24 @@ . = ..() access = get_access(ACCESS_LIST_WY_ALL) -/datum/equipment_preset/wy/manager/director - name = "Corporate - J - Director" - flags = EQUIPMENT_PRESET_EXTRA - assignment = JOB_DIRECTOR - rank = JOB_DIRECTOR - paygrade = "WYC10" - skills = /datum/skills/civilian/manager/director - headset_type = /obj/item/device/radio/headset/distress/pmc/command/director - -/datum/equipment_preset/wy/manager/director/New() - . = ..() - access = get_access(ACCESS_LIST_WY_ALL) - -/datum/equipment_preset/wy/manager/director/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/ivory(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/ivory(new_human), WEAR_JACKET) - ..() - /datum/equipment_preset/wy/security - name = "Corporate - J - Director" + name = "Prop - WeyYu - Security Officer" flags = EQUIPMENT_PRESET_EXTRA - assignment = JOB_DIRECTOR - rank = JOB_WY_GOON + assignment = JOB_WY_SEC + rank = JOB_WY_SEC + paygrade = "WEY-GOON" + access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_BRIG) + languages = LANGUAGE_ENGLISH + +/datum/equipment_preset/wy/security/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/black(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black(new_human), WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower(new_human), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower(new_human), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(new_human), WEAR_IN_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack(new_human), WEAR_IN_BACK) + diff --git a/colonialmarines.dme b/colonialmarines.dme index 9c5facb8a6..91baf6fc92 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1691,19 +1691,7 @@ #include "code\modules\gear_presets\yautja.dm" #include "code\modules\gear_presets\survivors\misc.dm" #include "code\modules\gear_presets\survivors\survivors.dm" -#include "code\modules\gear_presets\survivors\corsat\preset_corsat.dm" -#include "code\modules\gear_presets\survivors\fiorina_sciannex\preset_fiorina_sciannex.dm" -#include "code\modules\gear_presets\survivors\kutjevo\preset_kutjevo.dm" #include "code\modules\gear_presets\survivors\lv_522\forcon_survivors.dm" -#include "code\modules\gear_presets\survivors\lv_624\clfship_insert_lv624.dm" -#include "code\modules\gear_presets\survivors\lv_624\preset_lv.dm" -#include "code\modules\gear_presets\survivors\new_varadero\preset_new_varadero.dm" -#include "code\modules\gear_presets\survivors\shivas_snowball\preset_shivas_snowball.dm" -#include "code\modules\gear_presets\survivors\solaris\crashlanding-offices_insert_bigred.dm" -#include "code\modules\gear_presets\survivors\solaris\preset_solaris.dm" -#include "code\modules\gear_presets\survivors\sorokyne_strata\preset_sorokyne_strata.dm" -#include "code\modules\gear_presets\survivors\trijent\crashlanding_upp_bar_insert_trijent.dm" -#include "code\modules\gear_presets\survivors\trijent\preset_trijent.dm" #include "code\modules\holidays\halloween\decorators.dm" #include "code\modules\holidays\halloween\pumpkins\patches.dm" #include "code\modules\holidays\halloween\pumpkins\wearable.dm"