Phantastic-SwanandGitHub
32b1ec3a97
## About The Pull Request I was trying to fix the job display order CI for the upcoming upstream sync. I searched for the `/datum/job/prisoner` and found this <img width="395" height="291" alt="image" src="https://github.com/user-attachments/assets/b77518d2-b6cf-4360-a73b-daf9cbe31f65" /> > Holy jesus. What is that? WHAT. THE FUCK. IS THAT?! **WHAT IS THAT?!** As such, I have decided to go and find every override for `/datum/job` in `modular_zubbers` and `modular_skyrat` folders and organised them so that we don't have YES overrides for the same classes. ## Why It's Good For The Game I shall quote myself from my last PR > Do you understand how cancer inducing it is to try and figure out how code is executed when there are 3 separate overrides for a single proc? > I am of the opinion that any codebase should override any proc AT MOST once. Multiple overrides for a proc make for worse stack traces, less clarity in the order of code execution, and more difficulty in finding original declarations of procs. They also make it harder to keep procs up to date with upstreams if say, the arguments change (I know BYOND doesn't enforce proc overrides to have the same arguments as the original proc; however I consider that a load of bullshit and a major flaw in the language) ## Proof Of Testing This mainly moves code around rather than changes any of it. Regardless, it compiled and it seems that all procs that have been running previously are being hit now, so I assume it works. ## Changelog No player facing changes
Title: Customization
MODULE ID: CUSTOMIZATION
Description:
IF YOU WANT TO ADD AN EXTRA FEATURE TO SOMEONES DNA LOOK AT "code/__DEFINES/~skyrat_defines/DNA.dm"
Re-writes how mutant bodyparts exist and how they're handled. Adds in a per limb body marking system. Adds in loadout, with lots of clothing ported over. Adds in all the missing species. Adds in flavor text and OOC prefs. Adds in special rendering cases for digitigrades, taurs, snouts, voxes etc. Adds in changeable PDA ringtone message.
TG Proc Changes:
./code/__HELPERS/global_lists.dm > /proc/make_datum_references_lists() ./code/__HELPERS/mobs.dm > /proc/random_features() ./code/controllers/subsystem/job.dm > /datum/controller/subsystem/job/proc/EquipRank() ./code/datums/dna.dm > /datum/dna/proc/initialize_dna() , /mob/living/carbon/set_species() ./code/modules/admin/create_mob.dm > /proc/randomize_human() ./code/modules/client/preferences.dm > ALMOST THE ENTIRETY OF THE FILE ./code/modules/client/preferences_savefile.dm > ONCE AGAIN, THE ENTIRE FILE ./code/modules/mob/dead/new_player/preferences_setup.dm > /datum/preferences/proc/random_character(), /datum/preferences/proc/random_species(), /datum/preferences/proc/update_preview_icon() ./code/modules/mob/living/carbon/carbon_update_icons.dm > /mob/living/carbon/update_inv_wear_mask(), /mob/living/carbon/update_inv_head(), /mob/living/carbon/proc/update_body_parts(), /mob/living/carbon/proc/generate_icon_render_key() ./code/modules/mob/living/carbon/human/emote.dm > /datum/emote/living/carbon/human/wag/run_emote(), /datum/emote/living/carbon/human/wag/can_run_emote() ./code/modules/mob/living/carbon/human/examine.dm > /mob/living/carbon/human/examine() ./code/modules/mob/living/carbon/human/human_update_icons.dm > /mob/living/carbon/human/update_inv_w_uniform(), /mob/living/carbon/human/update_inv_glasses(), /mob/living/carbon/human/update_inv_shoes(), /mob/living/carbon/human/update_inv_wear_suit(), /obj/item/proc/build_worn_icon(), /mob/living/carbon/human/generate_icon_render_key() ./code/modules/mob/living/carbon/human/species.dm > /datum/species/proc/on_species_gain(), /datum/species/proc/handle_body(), /datum/species/proc/handle_mutant_bodyparts(), /datum/species/proc/can_equip(), /datum/species/proc/handle_hair() ./code/modules/mob/living/carbon/human/species_types/felinid.dm > the 5 procs related to wagging tail ./code/modules/mob/living/carbon/human/species_types/lizardpeople.dm the 5 procs related to wagging tail and - /datum/species/lizard/on_species_gain() ./code/modules/surgery/bodyparts/_bodyparts.dm > /obj/item/bodypart/proc/get_limb_icon() ./code/modules/surgery/organs/ears.dm > /obj/item/organ/ears/cat/Insert(), /obj/item/organ/ears/cat/Remove() ./code/modules/surgery/organs/tails.dm > /obj/item/organ/tail/cat/Insert(), /obj/item/organ/tail/cat/Remove(), /obj/item/organ/tail/lizard/Initialize(mapload), /obj/item/organ/tail/lizard/Insert(), /obj/item/organ/tail/lizard/Remove() ./code/modules/surgery/bodyparts/dismemberment.dm > /mob/living/carbon/regenerate_limb() ./code/modules/mob/living/carbon/human/status_procs.dm > /mob/living/carbon/human/become_husk() > APPENDED ./code/modules/reagents/chemistry/holder.dm > /datum/reagents/metabolize() ./code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm > /obj/item/reagent_containers/cup/glass/drinkingglass/on_reagent_change() ./code/modules/mob/living/carbon/human/human_defense.dm > /mob/living/carbon/human/emp_act() ./code/modules/mob/living/carbon/human.dm > /mob/living/carbon/human/revive() > APPENDED ./code/modules/reagents/chemistry/reagents/food_reagents.dm > datum/reagent/consumable/on_mob_life() ./code/datums/traits/negative.dm > /datum/quirk/prosthetic_limb .\code\modules\client.dm > /client/proc/update_special_keybinds() ./code/datums/traits/negative.dm > /datum/quirk/prosthetic_limb
./code/modules/mob/living/carbon/human/species.dm > /datum/species/regenerate_organs() > APPENDED
./code/controllers/subsystem/job.dm > /datum/controller/subsystem/job/proc/FindOccupationCandidates(), /datum/controller/subsystem/job/proc/GiveRandomJob(), /datum/controller/subsystem/job/proc/DivideOccupations(), /datum/controller/subsystem/job/proc/AssignRole() ./code/modules/mob/dead/new_player/new_player.dm > /mob/dead/new_player/proc/IsJobUnavailable(), /proc/get_job_unavailable_error_message()
Defines:
./code/modules/surgery/organs/tongue.dm > var/static/list/languages_possible_base - added 2 languages ./code/modules/mob/living/carbon/human/species_types/lizardpeople.dm > commented out "mutant_organs = list(/obj/item/organ/tail/lizard)" ./code/modules/mob/living/carbon/human/species_types/felinid.dm > commented out "mutantears = /obj/item/organ/ears/cat" and "mutant_organs = list(/obj/item/organ/tail/cat)" ./code/modules/mob/living/carbon/human/species.dm > var/list/list/mutant_bodyparts (added typed list type) ./code/_globalvars/lists/flavor_misc.dm > Removed accessory list defines .\code\datums\keybindings\living.dm > /datum/keybinding/living/look_up > from L to P
./code/__DEFINES/~skyrat_defines/DNA.dm > A TON of defines ./code/__DEFINES/~skyrat_defines/obj_flags.dm > Organ flags ./code/__DEFINES/~skyrat_defines/say.dm > MAX_FLAVOR_LEN ./code/__DEFINES/~skyrat_defines/traits.dm > TRAIT_NO_HUSK
.\modular_skyrat\modules\customization\modules\reagents\chemistry\reagents.dm > var/process_flags
Master file additions
.\modular_skyrat\master_files\icons\mob\clothing\eyes_vox.dmi .\modular_skyrat\master_files\icons\mob\clothing\feet_digi.dmi .\modular_skyrat\master_files\icons\mob\clothing\head_muzzled.dmi .\modular_skyrat\master_files\icons\mob\clothing\head_vox.dmi .\modular_skyrat\master_files\icons\mob\clothing\mask_muzzled.dmi .\modular_skyrat\master_files\icons\mob\clothing\mask_vox.dmi .\modular_skyrat\master_files\icons\mob\clothing\suit_digi.dmi .\modular_skyrat\master_files\icons\mob\clothing\suit_taur_hoof.dmi .\modular_skyrat\master_files\icons\mob\clothing\suit_taur_paw.dmi .\modular_skyrat\master_files\icons\mob\clothing\suit_taur_snake.dmi .\modular_skyrat\master_files\icons\mob\clothing\uniform_digi.dmi .\modular_skyrat\master_files\icons\mob\clothing\under\uniform_digi.dmi .\modular_skyrat\master_files\icons\mob\clothing\under\uniform_taur_hoof.dmi .\modular_skyrat\master_files\icons\mob\clothing\under\uniform_taur_paw.dmi .\modular_skyrat\master_files\icons\mob\clothing\under\uniform_taur_snake.dmi
./modular_skyrat/master_files/icons/obj/drinks.dmi
Included files that are not contained in this module:
- N/A
Credits:
Azarak