diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm
index 2bd24af5a0ff..2d07228e8e3d 100644
--- a/code/_globalvars/global_lists.dm
+++ b/code/_globalvars/global_lists.dm
@@ -311,6 +311,9 @@ GLOBAL_LIST_INIT(hj_emotes, setup_hazard_joe_emotes())
rkey++
var/datum/species/S = new T
S.race_key = rkey //Used in mob icon caching.
+ var/datum/species/existing = all_species[S.name]
+ if(existing)
+ stack_trace("[S.name] from [T] overlaps with [existing.type]! It must have a unique name for lookup!")
all_species[S.name] = S
return all_species
@@ -353,6 +356,9 @@ GLOBAL_LIST_INIT(hj_emotes, setup_hazard_joe_emotes())
if (!initial(EP.flags))
continue
EP = new T
+ var/datum/equipment_preset/existing = gear_path_presets_list[EP.name]
+ if(existing)
+ stack_trace("[EP.name] from [T] overlaps with [existing.type]! It must have a unique name for lookup!")
gear_path_presets_list[EP.name] = EP
return sortAssoc(gear_path_presets_list)
@@ -464,7 +470,11 @@ GLOBAL_LIST_INIT(hj_emotes, setup_hazard_joe_emotes())
/proc/setup_yautja_capes()
var/list/cape_list = list()
for(var/obj/item/clothing/yautja_cape/cape_type as anything in typesof(/obj/item/clothing/yautja_cape))
- cape_list[initial(cape_type.name)] = cape_type
+ var/cape_name = initial(cape_type.name)
+ var/obj/item/clothing/yautja_cape/existing = cape_list[cape_name]
+ if(existing)
+ stack_trace("[cape_name] from [cape_type] overlaps with [existing.type]! It must have a unique name for lookup!")
+ cape_list[cape_name] = cape_type
return cape_list
diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm
index fc527f07a9e0..978c7649d8e7 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 cbcd8f906ec8..2945193d7e26 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 4a6e5272ed05..63227bb797e9 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/cmb.dm b/code/modules/gear_presets/cmb.dm
index 8be44f94a2e8..45c06776a4a8 100644
--- a/code/modules/gear_presets/cmb.dm
+++ b/code/modules/gear_presets/cmb.dm
@@ -460,9 +460,6 @@
/datum/equipment_preset/uscm/cmb/leader
name = "USCM Anchorpoint Station Team Leader"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
-/datum/equipment_preset/uscm/cmb/leader/New()
- . = ..()
-
assignment = "Anchorpoint Station Marine Team Leader"
rank = JOB_SQUAD_LEADER
paygrade = PAY_SHORT_ME6
@@ -505,9 +502,6 @@
/datum/equipment_preset/uscm/cmb/rto
name = "USCM Anchorpoint Station Technical Specialist"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
-/datum/equipment_preset/uscm/cmb/rto/New()
- . = ..()
-
assignment = "Anchorpoint Station Marine Technical Specialist"
rank = JOB_SQUAD_TEAM_LEADER
paygrade = PAY_SHORT_ME4
@@ -550,9 +544,6 @@
/datum/equipment_preset/uscm/cmb/medic
name = "USCM Anchorpoint Station Corpsman"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
-/datum/equipment_preset/uscm/cmb/medic/New()
- . = ..()
-
assignment = "Anchorpoint Station Hospital Corpsman"
rank = JOB_SQUAD_MEDIC
paygrade = PAY_SHORT_ME3
@@ -611,9 +602,6 @@
/datum/equipment_preset/uscm/cmb/smartgunner
name = "USCM Anchorpoint Station Smartgunner"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
-/datum/equipment_preset/uscm/cmb/smartgunner/New()
- . = ..()
-
assignment = "Anchorpoint Station Marine Smartgunner"
rank = JOB_SQUAD_SMARTGUN
paygrade = PAY_SHORT_ME3
diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm
index b8330e0e4c70..b624e028b237 100644
--- a/code/modules/gear_presets/corpses.dm
+++ b/code/modules/gear_presets/corpses.dm
@@ -529,7 +529,7 @@
//Colonial Supervisor
-/datum/equipment_preset/corpse/wy/manager
+/datum/equipment_preset/corpse/wy_manager
name = "Corpse - Corporate Supervisor"
assignment = "Colony Supervisor"
flags = EQUIPMENT_PRESET_EXTRA
@@ -549,7 +549,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 +562,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/other.dm b/code/modules/gear_presets/other.dm
index 99b8bf634eed..dfe5816894eb 100644
--- a/code/modules/gear_presets/other.dm
+++ b/code/modules/gear_presets/other.dm
@@ -968,4 +968,5 @@
new_human.nutrition = NUTRITION_LOW
/datum/equipment_preset/tutorial/fed
+ name = "Tutorial (Fed)"
underfed = FALSE
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 3fdbe72c05be..aeb05b8c6bb7 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
@@ -84,7 +84,7 @@
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
+/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 +95,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 +224,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 +234,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/misc.dm b/code/modules/gear_presets/survivors/misc.dm
index 5b010a8cb8ea..329bac97a89f 100644
--- a/code/modules/gear_presets/survivors/misc.dm
+++ b/code/modules/gear_presets/survivors/misc.dm
@@ -204,8 +204,8 @@ Everything below isn't used or out of place.
// ----- Mercenary Survivors
-// after double check pmc/miner/one isn't being used anywhere.
-/datum/equipment_preset/survivor/pmc/miner/one
+// after double check pmc/miner isn't being used anywhere.
+/datum/equipment_preset/survivor/pmc/miner
name = "Survivor - Mercenary"
flags = EQUIPMENT_PRESET_START_OF_ROUND
@@ -214,7 +214,7 @@ Everything below isn't used or out of place.
flags = EQUIPMENT_PRESET_START_OF_ROUND
access = list(ACCESS_CIVILIAN_PUBLIC)
-/datum/equipment_preset/survivor/pmc/miner/one/load_gear(mob/living/carbon/human/new_human)
+/datum/equipment_preset/survivor/pmc/miner/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/mercenary/miner, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/mercenary/miner, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/mercenary/miner, WEAR_HEAD)
@@ -293,6 +293,7 @@ Everything below isn't used or out of place.
/// used in Shivas Snowball
/datum/equipment_preset/survivor/clf/cold
+ name = "CLF Survivor (Cold)"
//children of spawn rebel shoes proc
/datum/equipment_preset/survivor/clf/cold/spawn_rebel_suit(mob/living/carbon/human/human)
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 44d029d44c87..115b301cb009 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,43 +151,47 @@
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)
+ 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/restraint/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)
+ 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/restraint/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/synths.dm b/code/modules/gear_presets/synths.dm
index 9bfa2335e94a..46ef3ba4c1e5 100644
--- a/code/modules/gear_presets/synths.dm
+++ b/code/modules/gear_presets/synths.dm
@@ -143,14 +143,6 @@
. = ..()
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/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]
@@ -268,6 +260,9 @@
survivor_variant = ENGINEERING_SURVIVOR
+/datum/equipment_preset/synth/survivor/corporate_synth
+ name = "Survivor - Synthetic - Corporate Synth"
+
/datum/equipment_preset/synth/survivor/corporate_synth/load_gear(mob/living/carbon/human/new_human)
..()
add_random_cl_survivor_loot(new_human)
@@ -451,7 +446,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"
@@ -474,7 +469,11 @@
survivor_variant = SECURITY_SURVIVOR
-/datum/equipment_preset/synth/survivor/wy/protection_synth
+/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
name = "Survivor - Synthetic - Corporate Protection Synth"
idtype = /obj/item/card/id/pmc
role_comm_title = "WY Syn"
@@ -496,7 +495,11 @@
survivor_variant = SECURITY_SURVIVOR
-/datum/equipment_preset/synth/survivor/wy/corporate_synth
+/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
name = "Survivor - Synthetic - Corporate Clerical Synth"
idtype = /obj/item/card/id/data
role_comm_title = "WY Syn"
@@ -518,6 +521,10 @@
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
+
/datum/equipment_preset/synth/survivor/icc_synth
name = "Survivor - Synthetic - Interstellar Commerce Commission Synthetic"
idtype = /obj/item/card/id/silver/cl
diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm
index eec3b6157877..31fc89c0f0d6 100644
--- a/code/modules/gear_presets/uscm.dm
+++ b/code/modules/gear_presets/uscm.dm
@@ -131,7 +131,7 @@
//*****************************************************************************************************/
/datum/equipment_preset/uscm/sg/full
- name = "USCM Squad Smartgunner"
+ name = "USCM Squad Smartgunner (Full)"
flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE
/datum/equipment_preset/uscm/sg/full/load_gear(mob/living/carbon/human/new_human)
diff --git a/code/modules/gear_presets/uscm_event.dm b/code/modules/gear_presets/uscm_event.dm
index eb206c8259bf..1a03dc3f6b22 100644
--- a/code/modules/gear_presets/uscm_event.dm
+++ b/code/modules/gear_presets/uscm_event.dm
@@ -104,10 +104,6 @@
new_human.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES)
-/datum/equipment_preset/uscm_event/general/o7
- name = "USCM O-7 - Brigadier General (High Command)"
- paygrade = PAY_SHORT_MO7
-
/datum/equipment_preset/uscm_event/general/o8
name = "USCM O-8 - Major General (High Command)"
paygrade = PAY_SHORT_MO8
diff --git a/code/modules/gear_presets/uscm_medical.dm b/code/modules/gear_presets/uscm_medical.dm
index 019095f9ce38..75152268326c 100644
--- a/code/modules/gear_presets/uscm_medical.dm
+++ b/code/modules/gear_presets/uscm_medical.dm
@@ -62,7 +62,7 @@
//*****************************************************************************************************/
/datum/equipment_preset/uscm_ship/uscm_medical/doctor
- name = "USCM Surgeon"
+ name = "USCM Doctor"
assignment = JOB_DOCTOR
rank = JOB_DOCTOR
@@ -85,7 +85,7 @@
//Surgeon this part of the code is to change the name on your ID
/datum/equipment_preset/uscm_ship/uscm_medical/doctor/surgeon
-
+ name = "USCM Surgeon"
assignment = JOB_SURGEON
/datum/equipment_preset/uscm_ship/uscm_medical/doctor/surgeon/load_gear(mob/living/carbon/human/new_human)
diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm
index 9bccf2a2ec78..a53504fec0c9 100644
--- a/code/modules/gear_presets/uscm_ship.dm
+++ b/code/modules/gear_presets/uscm_ship.dm
@@ -102,7 +102,7 @@
//*****************************************************************************************************/
/datum/equipment_preset/uscm_ship/reporter
- name = "Combat Correspondent"
+ name = "Combat Correspondent (Press)"
flags = EQUIPMENT_PRESET_START_OF_ROUND
access = list(
@@ -586,7 +586,6 @@
flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
idtype = /obj/item/card/id/silver
- access
assignment = JOB_SEA
rank = JOB_SEA
paygrade = PAY_SHORT_ME7
diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm
index b9ca1a6e02d4..75e8e013c03f 100644
--- a/code/modules/gear_presets/whiteout.dm
+++ b/code/modules/gear_presets/whiteout.dm
@@ -270,7 +270,7 @@
//*****************************************************************************************************/
/datum/equipment_preset/pmc/w_y_whiteout/low_threat/medic
- name = "Whiteout Team Medic"
+ name = "Whiteout Team Operative Medic"
/datum/equipment_preset/pmc/w_y_whiteout/low_threat/medic/load_gear(mob/living/carbon/human/new_human)
// back