From 313d20fb96ac2d75c90af7694f0cd5008cc2f164 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Tue, 18 Jun 2024 14:53:33 -0700 Subject: [PATCH] preset stub instead --- code/datums/map_config.dm | 6 ++-- .../effects/landmarks/corpsespawner.dm | 4 +-- .../effects/landmarks/survivor_spawner.dm | 10 +++--- .../modules/gear_presets/_select_equipment.dm | 3 +- code/modules/gear_presets/corpses.dm | 9 ++++-- ...ot_in_progress_insert_fiorina_nightmare.dm | 17 ++++++---- .../crashlanding-offices_insert_bigred.dm | 4 --- code/modules/gear_presets/synths.dm | 32 ++++++++++--------- 8 files changed, 45 insertions(+), 40 deletions(-) diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index 978c7649d8e7..fc527f07a9e0 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -93,9 +93,9 @@ /datum/equipment_preset/synth/survivor/bartender_synth, /datum/equipment_preset/synth/survivor/atc_synth, /datum/equipment_preset/synth/survivor/cmb_synth, - /datum/equipment_preset/synth/survivor/wy_security_synth, - /datum/equipment_preset/synth/survivor/wy_protection_synth, - /datum/equipment_preset/synth/survivor/wy_corporate_synth, + /datum/equipment_preset/synth/survivor/wy/security_synth, + /datum/equipment_preset/synth/survivor/wy/protection_synth, + /datum/equipment_preset/synth/survivor/wy/corporate_synth, /datum/equipment_preset/synth/survivor/icc_synth, /datum/equipment_preset/synth/survivor/radiation_synth, ) diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm index 2945193d7e26..cbcd8f906ec8 100644 --- a/code/game/objects/effects/landmarks/corpsespawner.dm +++ b/code/game/objects/effects/landmarks/corpsespawner.dm @@ -124,11 +124,11 @@ /obj/effect/landmark/corpsespawner/wy/manager name = "Corporate Supervisor" - equip_path = /datum/equipment_preset/corpse/wy_manager + equip_path = /datum/equipment_preset/corpse/wy/manager /obj/effect/landmark/corpsespawner/wy/manager/burst name = "Burst Corporate Supervisor" - equip_path = /datum/equipment_preset/corpse/wy_manager/burst + equip_path = /datum/equipment_preset/corpse/wy/manager/burst ///////////Faction Specific Corpses////////////////////// diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index 63227bb797e9..4a6e5272ed05 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -88,7 +88,7 @@ /obj/effect/landmark/survivor_spawner/lv624_corporate_dome_cl equipment = /datum/equipment_preset/survivor/wy/executive - synth_equipment = /datum/equipment_preset/synth/survivor/wy_security_synth + synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth intro_text = list("

You are the last alive Executive of Lazarus Landing!

",\ "You are aware of the xenomorph threat.",\ "Your primary objective is to survive the outbreak.") @@ -98,7 +98,7 @@ /obj/effect/landmark/survivor_spawner/lv624_corporate_dome_goon equipment = /datum/equipment_preset/survivor/goon - synth_equipment = /datum/equipment_preset/synth/survivor/wy_security_synth + synth_equipment = /datum/equipment_preset/synth/survivor/wy/security_synth intro_text = list("

You are a Corporate Security Officer!

",\ "You are aware of the xenomorph threat.",\ "Your primary objective is to survive the outbreak.") @@ -160,7 +160,7 @@ /obj/effect/landmark/survivor_spawner/shivas_panic_room_cl equipment = /datum/equipment_preset/survivor/wy/asstmanager - synth_equipment = /datum/equipment_preset/synth/survivor/wy_corporate_synth + synth_equipment = /datum/equipment_preset/synth/survivor/wy/corporate_synth intro_text = list("

You are the last alive Senior Administrator on the Colony!

",\ "You are aware of the xenomorph threat.",\ "Your primary objective is to survive the outbreak.") @@ -202,7 +202,7 @@ /obj/effect/landmark/survivor_spawner/fiorina_armory_cmb equipment = /datum/equipment_preset/survivor/cmb/standard - synth_equipment = /datum/equipment_preset/synth/survivor/cmb_synth + synth_equipment = /datum/equipment_preset/synth/survivor/cmb/synth intro_text = list("

You are a CMB Deputy!

",\ "You are aware of the 'alien' threat.",\ "Your primary objective is to survive the infestation.") @@ -212,7 +212,7 @@ /obj/effect/landmark/survivor_spawner/fiorina_armory_riot_control equipment = /datum/equipment_preset/survivor/cmb/ua - synth_equipment = /datum/equipment_preset/synth/survivor/cmb_ua_synth + synth_equipment = /datum/equipment_preset/synth/survivor/cmb/ua_synth intro_text = list("

You are a United Americas Riot Control Officer!

",\ "You are aware of the 'alien' threat.",\ "Your primary objective is to survive the infestation.") diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 5311a7a79a3b..50b52b3f7818 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -50,7 +50,8 @@ var/list/uniform_sets = null - + ///Contains the path for the deepest abstract type currently + var/abstract_type = /datum/equipment_preset /datum/equipment_preset/New() uniform_sets = list( diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index b624e028b237..7bf9592a6209 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -529,7 +529,10 @@ //Colonial Supervisor -/datum/equipment_preset/corpse/wy_manager +/datum/equipment_preset/corpse/wy + flags = EQUIPMENT_PRESET_STUB + +/datum/equipment_preset/corpse/wy/manager name = "Corpse - Corporate Supervisor" assignment = "Colony Supervisor" flags = EQUIPMENT_PRESET_EXTRA @@ -549,7 +552,7 @@ ACCESS_ILLEGAL_PIRATE, ) -/datum/equipment_preset/corpse/wy_manager/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/corpse/wy/manager/load_gear(mob/living/carbon/human/new_human) add_ice_colony_survivor_equipment(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/manager(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable/liaison(new_human), WEAR_BACK) @@ -562,7 +565,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) add_random_cl_survivor_loot(new_human) -/datum/equipment_preset/corpse/wy_manager/burst +/datum/equipment_preset/corpse/wy/manager/burst name = "Corpse - Burst Corporate Supervisor" xenovictim = TRUE diff --git a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm index aeb05b8c6bb7..c09e6eee9385 100644 --- a/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm +++ b/code/modules/gear_presets/survivors/fiorina_sciannex/riot_in_progress_insert_fiorina_nightmare.dm @@ -83,8 +83,11 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) -// cmb synth -/datum/equipment_preset/synth/survivor/cmb_synth +// cmb synth (of note /datum/equipment_preset/synth/survivor/cmb_synth also exists) +/datum/equipment_preset/synth/survivor/cmb + flags = EQUIPMENT_PRESET_STUB + +/datum/equipment_preset/synth/survivor/cmb/synth name = "Survivor - Synthetic - CMB Investigative Synthetic(Riot Response)" paygrade = PAY_SHORT_CMBS idtype = /obj/item/card/id/deputy @@ -95,10 +98,10 @@ languages = ALL_SYNTH_LANGUAGES skills = /datum/skills/synthetic/cmb -/datum/equipment_preset/synth/survivor/cmb_synth/load_race(mob/living/carbon/human/new_human) +/datum/equipment_preset/synth/survivor/cmb/synth/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_COLONY) -/datum/equipment_preset/synth/survivor/cmb_synth/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/synth/survivor/cmb/synth/load_gear(mob/living/carbon/human/new_human) //backpack new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/security, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/cmb/normalpoint, WEAR_IN_BACK) @@ -224,7 +227,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/mp5, WEAR_IN_R_STORE) // ua synth -/datum/equipment_preset/synth/survivor/cmb_ua_synth +/datum/equipment_preset/synth/survivor/cmb/ua_synth name = "Survivor - Synthetic - UA Police Synthetic(Riot Response)" paygrade = PAY_SHORT_CMBS role_comm_title = "UA Syn" @@ -234,10 +237,10 @@ skills = /datum/skills/colonial_synthetic idtype = /obj/item/card/id/silver -/datum/equipment_preset/synth/survivor/cmb_ua_synth/load_race(mob/living/carbon/human/new_human) +/datum/equipment_preset/synth/survivor/cmb/ua_synth/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_COLONY) -/datum/equipment_preset/synth/survivor/cmb_ua_synth/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/synth/survivor/cmb/ua_synth/load_gear(mob/living/carbon/human/new_human) //backpack new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/restraint/handcuffs, WEAR_IN_BACK) 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 index 115b301cb009..66992f2508c0 100644 --- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm +++ b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm @@ -151,10 +151,6 @@ rank = JOB_PMC_SYNTH role_comm_title = "WY Syn" -/datum/equipment_preset/synth/survivor/pmc/New() - . = ..() - access = get_access(ACCESS_LIST_WY_PMC) - /datum/equipment_preset/synth/survivor/pmc/load_race(mob/living/carbon/human/new_human) new_human.set_species(SYNTH_GEN_THREE) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 46ef3ba4c1e5..2fde67e931b9 100644 --- a/code/modules/gear_presets/synths.dm +++ b/code/modules/gear_presets/synths.dm @@ -143,6 +143,17 @@ . = ..() access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH //Access to civillians stuff + medbay stuff + engineering stuff + research +/datum/equipment_preset/synth/survivor/pmc/New() + . = ..() + access = get_access(ACCESS_LIST_WY_PMC) + +/datum/equipment_preset/synth/survivor/wy + flags = EQUIPMENT_PRESET_STUB + +/datum/equipment_preset/synth/survivor/wy/New() + . = ..() + access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_GENERAL // for WY synths - admin building and wy fax machines access + /datum/equipment_preset/synth/survivor/load_gear(mob/living/carbon/human/new_human) for(var/equipment in equipment_to_spawn) var/equipment_path = islist(equipment_to_spawn[equipment]) ? pick(equipment_to_spawn[equipment]) : equipment_to_spawn[equipment] @@ -446,7 +457,7 @@ survivor_variant = SECURITY_SURVIVOR -/datum/equipment_preset/synth/survivor/wy_security_synth +/datum/equipment_preset/synth/survivor/wy/security_synth name = "Survivor - Synthetic - Corporate Security Synth" idtype = /obj/item/card/id/silver/cl role_comm_title = "WY Syn" @@ -468,12 +479,9 @@ ) survivor_variant = SECURITY_SURVIVOR + flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/synth/survivor/wy_security_synth/New() - . = ..() - access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_GENERAL // for WY synths - admin building and wy fax machines access - -/datum/equipment_preset/synth/survivor/wy_protection_synth +/datum/equipment_preset/synth/survivor/wy/protection_synth name = "Survivor - Synthetic - Corporate Protection Synth" idtype = /obj/item/card/id/pmc role_comm_title = "WY Syn" @@ -494,12 +502,9 @@ ) survivor_variant = SECURITY_SURVIVOR + flags = EQUIPMENT_PRESET_EXTRA -/datum/equipment_preset/synth/survivor/wy_protection_synth/New() - . = ..() - access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_GENERAL // for WY synths - admin building and wy fax machines access - -/datum/equipment_preset/synth/survivor/wy_corporate_synth +/datum/equipment_preset/synth/survivor/wy/corporate_synth name = "Survivor - Synthetic - Corporate Clerical Synth" idtype = /obj/item/card/id/data role_comm_title = "WY Syn" @@ -520,10 +525,7 @@ ) survivor_variant = CORPORATE_SURVIVOR - -/datum/equipment_preset/synth/survivor/wy_corporate_synth/New() - . = ..() - access = get_access(ACCESS_LIST_COLONIAL_ALL) + get_region_accesses(2) + get_region_accesses(4) + ACCESS_MARINE_RESEARCH + ACCESS_WY_GENERAL // for WY synths - admin building and wy fax machines access + flags = EQUIPMENT_PRESET_EXTRA /datum/equipment_preset/synth/survivor/icc_synth name = "Survivor - Synthetic - Interstellar Commerce Commission Synthetic"