-
Notifications
You must be signed in to change notification settings - Fork 522
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix global list lookups by name for 3 GLOBs (#6421)
# About the pull request This PR adds key uniqueness checks for `GLOB.gear_name_presets_list`, `GLOB.all_yautja_capes`, and `GLOB.all_species` and rectifies various `/datum/equipment_preset` that offended this check. Any that conflicted like this would just not get displayed or looked up correctly. This change applies to more than just the create_humans list. Species and predator cloaks had no offenders to correct. ~~This does make inheritance a bit weird (see changes needed for `/datum/equipment_preset/synth/survivor/wy` that wanted to share an access list), but should we want to address that we need to define when a type is abstract so `setup_gear_name_presets` knows to skip it and ensure all inherited types unset the abstract setting.~~ This relies on the equipment `flags` being set to `EQUIPMENT_PRESET_STUB` when abstract, and then unset for non-abstract types. I also applied this change to predator cloaks and species which do the same thing, but they had no offenders. # Explain why it's good for the game Fixes all these key collisions (and more if any had multiple collisions): ``` [22:39:26]RUNTIME: USCM Surgeon from /datum/equipment_preset/uscm_ship/uscm_medical/doctor/surgeon overlaps with /datum/equipment_preset/uscm_ship/uscm_medical/doctor! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: Combat Correspondent from /datum/equipment_preset/uscm_ship/reporter_uscm overlaps with /datum/equipment_preset/uscm_ship/reporter! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: USCM Senior Enlisted Advisor (SEA) from /datum/equipment_preset/uscm_ship/sea/access overlaps with /datum/equipment_preset/uscm_ship/sea! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: USCM Squad Smartgunner from /datum/equipment_preset/uscm/sg/full overlaps with /datum/equipment_preset/uscm/sg! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: Survivor - PMC from /datum/equipment_preset/survivor/pmc/miner overlaps with /datum/equipment_preset/survivor/pmc! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: CLF Survivor from /datum/equipment_preset/survivor/clf/cold overlaps with /datum/equipment_preset/survivor/clf! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: Corpse from /datum/equipment_preset/corpse/wy overlaps with /datum/equipment_preset/corpse! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: Tutorial from /datum/equipment_preset/tutorial/fed overlaps with /datum/equipment_preset/tutorial! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: Whiteout Team Medic from /datum/equipment_preset/pmc/w_y_whiteout/low_threat/medic overlaps with /datum/equipment_preset/pmc/w_y_whiteout/medic! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: Survivor - Synthetic - Classic Joe from /datum/equipment_preset/synth/survivor/wy overlaps with /datum/equipment_preset/synth/survivor! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: Survivor - Synthetic - Classic Joe from /datum/equipment_preset/synth/survivor/corporate_synth overlaps with /datum/equipment_preset/synth/survivor/wy! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: Survivor - Synthetic - Classic Joe from /datum/equipment_preset/synth/survivor/cmb overlaps with /datum/equipment_preset/synth/survivor/corporate_synth! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 [22:39:26]RUNTIME: USCM O-7 - Brigadier General (High Command) from /datum/equipment_preset/uscm_event/general/o7 overlaps with /datum/equipment_preset/uscm_event/general! It must have a unique name for lookup! - code/__HELPERS/unsorted.dm@1467 ``` # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> Put screenshots and videos here with an empty line between the screenshots and the `<details>` tags. </details> # Changelog :cl: Drathek fix: Fixed various equipment_presets not getting cached or looked up correctly /:cl:
- Loading branch information
Showing
13 changed files
with
74 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters