From a8897084237415a92ec8129cae927d06cac525e9 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sun, 29 Dec 2024 17:12:00 -0700 Subject: [PATCH] [MIRROR] Makes viruses (and borers and death icons) not show up on everyone. (#9727) Co-authored-by: Cameron Lennox Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/__defines/mobs.dm | 21 ++++++++++++++++++++- code/__defines/mobs_vr.dm | 14 -------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm index fa689a1b48..05be224f43 100644 --- a/code/__defines/mobs.dm +++ b/code/__defines/mobs.dm @@ -379,6 +379,14 @@ #define STRUCTURE_MIN_DAMAGE_THRESHOLD 5 //Vision flags, for dealing with plane visibility +/// AS A SIDE NOTE, PLEASE PLEASE PLEASE PLEASE PLEASE PLEAS PLEASE PLEASE PLEASE for the LOVE OF ALL THAT IS HOLY +/// IF YOU ARE ADDING MORE VISION PLANES, ADD THEM IN HERE. DO NOT ADD THEM TO A _VR FILE. DO NOT ADD THEM TO A _CH FILE. DON'T ADD THEM TO A _VFX FILE. +/// ADD. THEM. HERE. YES, YOU CAN OVERRIDE THE VIS_COUNT IN ANOTHER FILE AND ADD A NEW DEFINE THERE AS WELL, BUT IT WILL LEAD TO +/// HEADACHES AND SUFFERING LATER DOWN THE LINE WHEN SOMEONE ADDS A NEW VISION LAYER HERE AND IT CONFLICTS WITH ONE IN ANOTHER FILE +/// AND EVERYONE SCRATCHES THEIR HEAD AND GOES "WHY IS THIS SUDDENLY BROKE" +/// AND THEN SOMEONE HAD TO DIG THROUGH VISION, PLANE, AND LAYER CODE. THEY WILL NOT BE HAPPY. +/// SO PLEASE, ADD THEM H E R E +/// Thank you :) #define VIS_FULLBRIGHT 1 #define VIS_LIGHTING 2 #define VIS_O_LIGHT 3 @@ -416,7 +424,18 @@ #define VIS_STATUS 28 -#define VIS_COUNT 28 //Must be highest number from above. +#define VIS_CH_STATUS_R 29 +#define VIS_CH_HEALTH_VR 30 +#define VIS_CH_BACKUP 31 +#define VIS_CH_VANTAG 32 + +#define VIS_AUGMENTED 33 + +#define VIS_CH_STOMACH 34 + +#define VIS_SOULCATCHER 35 // CHOMPAdd + +#define VIS_COUNT 35 //Must be highest number from above. // CHOMPEdit //Some mob icon layering defines #define BODY_LAYER -100 diff --git a/code/__defines/mobs_vr.dm b/code/__defines/mobs_vr.dm index 6b18837e4e..af0eddf426 100644 --- a/code/__defines/mobs_vr.dm +++ b/code/__defines/mobs_vr.dm @@ -1,17 +1,3 @@ -#undef VIS_COUNT - -#define VIS_CH_STATUS_R 28 -#define VIS_CH_HEALTH_VR 29 -#define VIS_CH_BACKUP 30 -#define VIS_CH_VANTAG 31 - -#define VIS_AUGMENTED 32 - -#define VIS_CH_STOMACH 33 -#define VIS_SOULCATCHER 34 // CHOMPAdd - -#define VIS_COUNT 34 - //Protean organs #define O_ORCH "orchestrator" #define O_FACT "refactory"