mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 08:37:43 +01:00
## 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
https://github.com/Skyrat-SS13/Skyrat-tg/pull/127
Title: Blueshield
MODULE ID: BLUESHIELD
Description:
Adds the blueshield job to the game. It does not however add the blueshield office to the map. This includes all the blueshields items and job descriptors.
TG Proc Changes:
- code/modules/jobs/jobs.dm > GLOBAL_LIST_INIT(security_positions, list()
- code/modules/jobs/access.dm > /proc/get_all_accesses()
Defines:
- #define JOB_DISPLAY_ORDER_BLUESHIELD 34
- #define ACCESS_BLUESHIELD 71
Master file additions
- ./modular_skyrat/master_files/icons/mob/hud.dmi #NEW
- ./modular_skyrat/master_files/icons/clothing/hands.dmi #NEW
- ./modular_skyrat/master_files/icons/obj/clothing/gloves.dmi #NEW
Included files that are not contained in this module:
- N/A
Credits:
Gandalf2k15 - Porting