Partial revert of `Minor refactors` (#26305) by @Cyberboss
Partial revert of `Minor refactors` (#26305) by @Cyberboss

Partial revert of `Minor refactors` (#26305) by @Cyberboss
tgstation/tgstation,HippieStation/HippieStation,Jordie0608/-tg-station,TheVekter/-tg-station,coiax/-tg-station,Poojawa/tgstation-fork,Razharas/-tg-station,tgstation/tgstation,JJRcop/tgstation,GunHog/-tg-station,Thunder12345/-tg-station,coiax/-tg-station,Aranclanos/-tg-station,Niknakflak/-tg-station,XDTM/tgstation,securitycopper/-tg-station,Fox-McCloud/-tg-station,Jordie0608/-tg-station,tgstation/-tg-station,ShizCalev/tgstation,HippieStation/HippieStation,Cruix/-tg-station,SamuelRowe/-tg-station,WJohn/-tg-station,Niknakflak/-tg-station,McBawbaggings/HippieStation,infinitystation/-tg-station,tgstation/tgstation,infinitystation/-tg-station,JStheguy/tgstation,Jordie0608/tgstation,JJRcop/-tg-station,JJRcop/tgstation,Bawhoppen/-tg-station,TheRealGLH/-tg-station,PKPenguin321/-tg-station,Cruix/-tg-station,securitycopper/-tg-station,McBawbaggings/HippieStation,CPTANT/-tg-station,MicroWorldwide/SS13-TG-station,Poojawa/tgstation-fork,MrStonedOne/tgstation,TalkingCactus/tgstation,MrStonedOne/tgstation,securitycopper/-tg-station,Cyberboss/tgstation,MicroWorldwide/SS13-TG-station,Poojawa/tgstation-fork,AnturK/-tg-station,Razharas/-tg-station,Niknakflak/-tg-station,JJRcop/tgstation,Mark9013100/tgstation-m9,optimumtact/-tg-station,Poojawa/tgstation-fork,Jordie0608/-tg-station,coiax/-tg-station,MrStonedOne/tgstation,Fox-McCloud/-tg-station,Profakos/tgstation,Bawhoppen/-tg-station,Poojawa/tgstation-fork,ShizCalev/tgstation,AnturK/-tg-station,QualityVan/tgstation,tgstation/tgstation,TheVekter/-tg-station,GunHog/-tg-station,Cyberboss/tgstation,securitycopper/-tg-station,MrStonedOne/tgstation,Aranclanos/-tg-station,optimumtact/-tg-station,TalkingCactus/tgstation,Profakos/tgstation,WJohn/-tg-station,Bawhoppen/-tg-station,Jordie0608/tgstation,GunHog/-tg-station,coiax/-tg-station,CPTANT/-tg-station,Jordie0608/tgstation,NicholasM10/-tg-station,PKPenguin321/-tg-station,optimumtact/-tg-station,Arianya/tgstation,ohnopigeons/tgstation,NicholasM10/-tg-station,CPTANT/-tg-station,kingofkosmos/-tg-station,Bawhoppen/-tg-station,MicroWorldwide/SS13-TG-station,kingofkosmos/-tg-station,nicbn/tgstation,Aranclanos/-tg-station,nicbn/tgstation,PKPenguin321/-tg-station,kingofkosmos/-tg-station,McBawbaggings/HippieStation,anconfuzedrock/tgstation,Bawhoppen/-tg-station,WJohn/-tg-station,Jordie0608/tgstation,Aranclanos/-tg-station,Thunder12345/-tg-station,QualityVan/tgstation,MrStonedOne/tgstation,AnturK/-tg-station,QualityVan/tgstation,AnturK/-tg-station,MicroWorldwide/SS13-TG-station,Incoming5643/-tg-station,JStheguy/tgstation,WJohn/-tg-station,HippieStation/HippieStation,tgstation/-tg-station,NicholasM10/-tg-station,Jordie0608/tgstation,Cyberboss/tgstation,Razharas/-tg-station,Arianya/tgstation,Cruix/-tg-station,nicbn/tgstation,kingofkosmos/-tg-station,HippieStation/HippieStation,JStheguy/tgstation,optimumtact/-tg-station,TheVekter/-tg-station,kingofkosmos/-tg-station,CPTANT/-tg-station,McBawbaggings/HippieStation,Arianya/tgstation,Thunder12345/-tg-station,erwgd/-tg-station,XDTM/tgstation,nicbn/tgstation,Bawhoppen/-tg-station,tgstation/tgstation,MicroWorldwide/SS13-TG-station,tgstation/-tg-station,ShizCalev/tgstation,Cyberboss/tgstation,Jordie0608/tgstation,Jordie0608/-tg-station,CPTANT/-tg-station,Niknakflak/-tg-station,Mark9013100/tgstation-m9,anconfuzedrock/tgstation,infinitystation/-tg-station,TheRealGLH/-tg-station,JStheguy/tgstation,QualityVan/tgstation,coiax/-tg-station,Arianya/tgstation,McBawbaggings/HippieStation,Profakos/tgstation,nicbn/tgstation,kingofkosmos/-tg-station,coiax/-tg-station,HippieStation/HippieStation,anconfuzedrock/tgstation,Poojawa/tgstation-fork,ohnopigeons/tgstation,GunHog/-tg-station,Fox-McCloud/-tg-station,anconfuzedrock/tgstation,Fox-McCloud/-tg-station,PKPenguin321/-tg-station,Incoming5643/-tg-station,CPTANT/-tg-station,ShizCalev/tgstation,MrStonedOne/tgstation,PKPenguin321/-tg-station,tgstation/-tg-station,securitycopper/-tg-station,XDTM/tgstation,Jordie0608/tgstation,HippieStation/HippieStation,XDTM/tgstation,NicholasM10/-tg-station,Cruix/-tg-station,JJRcop/-tg-station,Mark9013100/tgstation-m9,coiax/-tg-station,infinitystation/-tg-station,Razharas/-tg-station,Fox-McCloud/-tg-station,ShizCalev/tgstation,PKPenguin321/-tg-station,JJRcop/-tg-station,Profakos/tgstation,CPTANT/-tg-station,JJRcop/-tg-station,Razharas/-tg-station,Mark9013100/tgstation-m9,anconfuzedrock/tgstation,Incoming5643/-tg-station,MicroWorldwide/SS13-TG-station,Bawhoppen/-tg-station,Thunder12345/-tg-station,Niknakflak/-tg-station,NicholasM10/-tg-station,MicroWorldwide/SS13-TG-station,Aranclanos/-tg-station,Arianya/tgstation,Cyberboss/tgstation,securitycopper/-tg-station,optimumtact/-tg-station,Thunder12345/-tg-station,Incoming5643/-tg-station,JStheguy/tgstation,Cyberboss/tgstation,QualityVan/tgstation,JStheguy/tgstation,AnturK/-tg-station,Mark9013100/tgstation-m9,TheVekter/-tg-station,Thunder12345/-tg-station,GunHog/-tg-station,Poojawa/tgstation-fork,Incoming5643/-tg-station,Aranclanos/-tg-station,MrStonedOne/tgstation,SamuelRowe/-tg-station,TheVekter/-tg-station,MrStonedOne/tgstation,Thunder12345/-tg-station,securitycopper/-tg-station,Bawhoppen/-tg-station,ShizCalev/tgstation,Fox-McCloud/-tg-station,JStheguy/tgstation,securitycopper/-tg-station,ohnopigeons/tgstation,anconfuzedrock/tgstation,ohnopigeons/tgstation,QualityVan/tgstation,anconfuzedrock/tgstation,WJohn/-tg-station,GunHog/-tg-station,optimumtact/-tg-station,Profakos/tgstation,ShizCalev/tgstation,Aranclanos/-tg-station,HippieStation/HippieStation,McBawbaggings/HippieStation,PKPenguin321/-tg-station,McBawbaggings/HippieStation,Cyberboss/tgstation,erwgd/-tg-station,TheVekter/-tg-station,Incoming5643/-tg-station,Incoming5643/-tg-station,Cruix/-tg-station,GunHog/-tg-station,XDTM/tgstation,XDTM/tgstation,AnturK/-tg-station,Fox-McCloud/-tg-station,Cruix/-tg-station,ShizCalev/tgstation,Razharas/-tg-station,McBawbaggings/HippieStation,JJRcop/tgstation,JJRcop/tgstation,WJohn/-tg-station,PKPenguin321/-tg-station,TheRealGLH/-tg-station,QualityVan/tgstation,Aranclanos/-tg-station,Razharas/-tg-station,Niknakflak/-tg-station,NicholasM10/-tg-station,infinitystation/-tg-station,nicbn/tgstation,SamuelRowe/-tg-station,infinitystation/-tg-station,CPTANT/-tg-station,nicbn/tgstation,Mark9013100/tgstation-m9,JJRcop/tgstation,MicroWorldwide/SS13-TG-station,TalkingCactus/tgstation,erwgd/-tg-station,tgstation/tgstation,SamuelRowe/-tg-station,NicholasM10/-tg-station,kingofkosmos/-tg-station,tgstation/tgstation,Profakos/tgstation,Arianya/tgstation,Mark9013100/tgstation-m9,Cruix/-tg-station,TalkingCactus/tgstation,Niknakflak/-tg-station,Profakos/tgstation,tgstation/tgstation,Incoming5643/-tg-station,TheRealGLH/-tg-station,optimumtact/-tg-station,XDTM/tgstation,WJohn/-tg-station,TheVekter/-tg-station,Arianya/tgstation,infinitystation/-tg-station,infinitystation/-tg-station,Jordie0608/tgstation,JJRcop/tgstation,AnturK/-tg-station,Cruix/-tg-station,NicholasM10/-tg-station,Razharas/-tg-station