Merge branch 'dev-sierra' of https://github.com/Rochehendson/SierraBay12 into dev-sierra

Author: Rochehendson

baystation12.dme

@@ -94,6 +94,7 @@
 #include "code\__defines\~mods\items_clothing.dm"
 #include "code\__defines\~mods\mechs.dm"
 #include "code\__defines\~mods\misc.dm"
+#include "code\__defines\~mods\mobs.dm"
 #include "code\__defines\~mods\rust_g.dm"
 #include "code\__defines\~mods\tg_signals.dm"
 #include "code\__defines\~mods\~master_defines.dm"
@@ -3444,6 +3445,7 @@
 #include "mods\_master_files\code\modules\events\gravity.dm"
 #include "mods\_master_files\code\modules\maps\map_template.dm"
 #include "mods\_master_files\code\modules\mob\living\life.dm"
+#include "mods\_master_files\code\modules\mob\living\carbon\viruses.dm"
 #include "mods\_master_files\code\modules\mob\living\carbon\human\human_helpers.dm"
 #include "mods\_master_files\code\modules\mob\new_player\new_player.dm"
 #include "mods\_master_files\code\modules\multiz\turf.dm"

code/__defines/MC.dm

@@ -107,28 +107,28 @@ if(Datum.is_processing) {\
 ****/
 
 /// The subsystem's Initialize() will not be called.
-#define SS_NO_INIT FLAG(0)
+#define SS_NO_INIT FLAG_01
 
 /// The subsystem's fire() will not be called. This is preferable to can_fire = FALSE because it will not be added to the MC's list of active systems.
-#define SS_NO_FIRE FLAG(1)
+#define SS_NO_FIRE FLAG_02
 
 /// The subsystem runs on spare CPU time, after all non-background subsystems have run that tick. Priority is considered against other SS_BACKGROUND subsystems.
-#define SS_BACKGROUND FLAG(2)
+#define SS_BACKGROUND FLAG_03
 
 /// The subsystem does not tick check and should not run unless enough time can be guaranteed or it must to stay current.
-#define SS_NO_TICK_CHECK FLAG(3)
+#define SS_NO_TICK_CHECK FLAG_04
 
 /// Treat the value of the subsystem's wait as ticks, not time. Forces it to run in the first tick. Implicitly has all runlevels. Ignores SS_BACKGROUND if set. Intended for systems that act like a mini-MC, like timers.
-#define SS_TICKER FLAG(4)
+#define SS_TICKER FLAG_05
 
 /// Attempt to keep the subsystem's timing real-world regular by adjusting fire timing to be earlier the later it previously ran.
-#define SS_KEEP_TIMING FLAG(5)
+#define SS_KEEP_TIMING FLAG_06
 
 /// Calculate the subsystem's next fire time from when it finished, not when it started.
-#define SS_POST_FIRE_TIMING FLAG(6)
+#define SS_POST_FIRE_TIMING FLAG_07
 
 /// Run Shutdown() on server shutdown so the SS can finalize state.
-#define SS_NEEDS_SHUTDOWN FLAG(7)
+#define SS_NEEDS_SHUTDOWN FLAG_08
 
 
 /****

code/__defines/__initialization.dm

@@ -7,7 +7,7 @@
 #define INITIALIZE_HINT_LATELOAD 2  //Call LateInitialize
 #define INITIALIZE_HINT_QDEL     3  //Call qdel on the atom
 
-#define ATOM_FLAG_INITIALIZED FLAG(0) // The atom has been initialized. Also see flags.dm
+#define ATOM_FLAG_INITIALIZED FLAG_01
 
 //type and all subtypes should always call Initialize in New()
 #define INITIALIZE_IMMEDIATE(X) ##X/New(loc, ...){\

code/__defines/__renderer.dm

@@ -16,7 +16,6 @@
 
 	FLOAT_PLANE = -32767
 */
-
 #define LOWEST_PLANE -200
 
 #define CLICKCATCHER_PLANE -100
@@ -139,35 +138,37 @@
 	#define OBFUSCATION_LAYER           5.2
 	#define BASE_AREA_LAYER             999
 
-#define OBSERVER_PLANE             200
+#define GAME_PLANE_FOV_HIDDEN 		2	//[SIERRA-ADD] - VISION CONE
+#define GAME_PLANE_ABOVE_FOV		3	//[SIERRA-ADD] - VISION CONE
+#define OBSERVER_PLANE				4	//[SIERRA-EDIT] - VISION CONE (2 became 4)
 
-#define LIGHTING_PLANE             300 // For Lighting. - The highest plane (ignoring all other even higher planes)
+#define LIGHTING_PLANE             5 // For Lighting. - The highest plane (ignoring all other even higher planes) 	//[SIERRA-EDIT] - VISION CONE (3 became 5)
 	#define LIGHTBULB_LAYER        0
 	#define LIGHTING_LAYER         1
 	#define ABOVE_LIGHTING_LAYER   2
 
-#define EFFECTS_ABOVE_LIGHTING_PLANE   400 // For glowy eyes, laser beams, etc. that shouldn't be affected by darkness
+#define EFFECTS_ABOVE_LIGHTING_PLANE   6 // For glowy eyes, laser beams, etc. that shouldn't be affected by darkness	//[SIERRA-EDIT] - VISION CONE (4 became 6)
 	#define EYE_GLOW_LAYER         1
 	#define BEAM_PROJECTILE_LAYER  2
 	#define SUPERMATTER_WALL_LAYER 3
 	#define SPEECH_INDICATOR_LAYER 4
 
-#define FULLSCREEN_PLANE                500 // for fullscreen overlays that do not cover the hud.
+#define FULLSCREEN_PLANE                7 // for fullscreen overlays that do not cover the hud.	//[SIERRA-EDIT] - VISION CONE (5 became 7)
 
 	#define FULLSCREEN_LAYER    0
 	#define DAMAGE_LAYER        1
 	#define IMPAIRED_LAYER      2
 	#define BLIND_LAYER         3
 	#define CRIT_LAYER          4
 
-#define HUD_PLANE                    600
+#define HUD_PLANE                    8	//[SIERRA-EDIT] - VISION CONE (6 became 8)
 	#define UNDER_HUD_LAYER              0
 	#define HUD_BASE_LAYER               2
 	#define HUD_ITEM_LAYER               3
 	#define HUD_ABOVE_ITEM_LAYER         4
 	#define HUD_ABOVE_HUD_LAYER          5
 
-#define RUNECHAT_PLANE               7
+#define RUNECHAT_PLANE               9	//[SIERRA-EDIT] - VISION CONE (7 became 9)
 
 /// This plane masks out lighting, to create an "emissive" effect for e.g glowing screens in otherwise dark areas.
 #define EMISSIVE_PLANE 700

code/__defines/_renderer.dm

@@ -9,17 +9,17 @@
 
 
 /// Main renderers are expected to always be on mobs with clients.
-#define RENDERER_MAIN FLAG(0)
+#define RENDERER_MAIN FLAG_01
 
 /**
  * Shared renderers have a single instance and are added/removed instead of created/deleted.
  * Many renderers can be shared - only ones that depend on the state of the mob seeing them,
  * such as effects with preferences, require an owner.
  */
-#define RENDERER_SHARED FLAG(1)
+#define RENDERER_SHARED FLAG_02
 
 /// Renderers with non-default setup behavior in hook/startup/proc/setup_renderers.
-#define RENDERER_SHARED_CUSTOM FLAG(2)
+#define RENDERER_SHARED_CUSTOM FLAG_03
 
 
 /// The base /renderer definition and defaults.
@@ -31,7 +31,7 @@
 	blend_mode = BLEND_OVERLAY
 
 	/// A bitfield of RENDERER_* defines.
-	var/renderer_flags = EMPTY_BITFIELD
+	var/renderer_flags = FLAGS_OFF
 
 	/// The compositing renderer this renderer belongs to.
 	var/group = RENDER_GROUP_FINAL

code/__defines/admin.dm

@@ -1,11 +1,11 @@
 // A set of constants used to determine which type of mute an admin wishes to apply.
-#define MUTE_IC        FLAG(0)
-#define MUTE_OOC       FLAG(1)
-#define MUTE_PRAY      FLAG(2)
-#define MUTE_ADMINHELP FLAG(3)
-#define MUTE_DEADCHAT  FLAG(4)
-#define MUTE_AOOC      FLAG(5)
-#define MUTE_ALL       (~EMPTY_BITFIELD)
+#define MUTE_IC        FLAG_01
+#define MUTE_OOC       FLAG_02
+#define MUTE_PRAY      FLAG_03
+#define MUTE_ADMINHELP FLAG_04
+#define MUTE_DEADCHAT  FLAG_05
+#define MUTE_AOOC      FLAG_06
+#define MUTE_ALL       FLAGS_ON
 
 // Some constants for DB_Ban
 #define BANTYPE_PERMA       1
@@ -17,31 +17,31 @@
 #define ROUNDSTART_LOGOUT_REPORT_TIME 6000 // Amount of time (in deciseconds) after the rounds starts, that the player disconnect report is issued.
 
 // Admin permissions.
-#define R_BUILDMODE      FLAG(0)
-#define R_ADMIN          FLAG(1)
-#define R_BAN            FLAG(2)
-#define R_FUN            FLAG(3)
-#define R_SERVER         FLAG(4)
-#define R_DEBUG          FLAG(5)
-#define R_POSSESS        FLAG(6)
-#define R_PERMISSIONS    FLAG(7)
-#define R_STEALTH        FLAG(8)
-#define R_REJUVINATE     FLAG(9)
-#define R_VAREDIT        FLAG(10)
-#define R_SOUNDS         FLAG(11)
-#define R_SPAWN          FLAG(12)
-#define R_MOD            FLAG(13)
+#define R_BUILDMODE      FLAG_01
+#define R_ADMIN          FLAG_02
+#define R_BAN            FLAG_03
+#define R_FUN            FLAG_04
+#define R_SERVER         FLAG_05
+#define R_DEBUG          FLAG_06
+#define R_POSSESS        FLAG_07
+#define R_PERMISSIONS    FLAG_08
+#define R_STEALTH        FLAG_09
+#define R_REJUVINATE     FLAG_10
+#define R_VAREDIT        FLAG_11
+#define R_SOUNDS         FLAG_12
+#define R_SPAWN          FLAG_13
+#define R_MOD            FLAG_14
 // [SIERRA-EDIT] - XENO WHITELIST
 //#define R_HOST           FLAG(14) // SIERRA-EDIT - ORIGINAL
-#define R_XENO           FLAG(14)
-#define R_HOST           FLAG(15)
+#define R_XENO           FLAG_15
+#define R_HOST           FLAG_16
 // [SIERRA-EDIT]
 #define R_INVESTIGATE    (R_ADMIN | R_MOD)
 #define R_MAXPERMISSION  R_HOST
 
-#define ADDANTAG_PLAYER    FLAG(0)  // Any player may call the add antagonist vote.
-#define ADDANTAG_ADMIN     FLAG(1)  // Any player with admin privilegies may call the add antagonist vote.
-#define ADDANTAG_AUTO      FLAG(2)  // The add antagonist vote is available as an alternative for transfer vote.
+#define ADDANTAG_PLAYER    FLAG_01  // Any player may call the add antagonist vote.
+#define ADDANTAG_ADMIN     FLAG_02  // Any player with admin privilegies may call the add antagonist vote.
+#define ADDANTAG_AUTO      FLAG_03  // The add antagonist vote is available as an alternative for transfer vote.
 
 #define TICKET_CLOSED 0   // Ticket has been resolved or declined
 #define TICKET_OPEN     1 // Ticket has been created, but not responded to

code/__defines/chemistry.dm

@@ -44,8 +44,8 @@
 #define CE_STIMULANT     "stimulants"   // Makes it harder to disarm someone
 
 //reagent flags
-#define IGNORE_MOB_SIZE    FLAG(0)
-#define AFFECTS_DEAD       FLAG(1)
+#define IGNORE_MOB_SIZE    FLAG_01
+#define AFFECTS_DEAD       FLAG_02
 
 #define HANDLE_REACTIONS(_reagents)  SSchemistry.active_reagents[_reagents] = TRUE
 #define UNQUEUE_REACTIONS(_reagents) SSchemistry.active_reagents -= _reagents

code/__defines/damage_organs.dm

@@ -19,38 +19,38 @@
 #define  AIR_DAMAGE_MODIFIER 2.025  // More means less damage from hot air scalding lungs, less = more damage. (default 2.025)
 
 // Organ defines.
-#define ORGAN_CUT_AWAY   FLAG(0)  // The organ is in the process of being surgically removed.
-#define ORGAN_BLEEDING   FLAG(1)  // The organ is currently bleeding.
-#define ORGAN_BROKEN     FLAG(2)  // The organ is broken.
-#define ORGAN_DEAD       FLAG(3)  // The organ is necrotic.
-#define ORGAN_MUTATED    FLAG(4)  // The organ is unusable due to genetic damage.
-#define ORGAN_ARTERY_CUT FLAG(6)  // The organ has had its artery cut.
-#define ORGAN_TENDON_CUT FLAG(7)  // The organ has had its tendon cut.
-#define ORGAN_DISFIGURED FLAG(8)  // The organ is scarred/disfigured. Alters whether or not the face can be recognised.
-#define ORGAN_SABOTAGED  FLAG(9)  // The organ will explode if exposed to EMP, if prosthetic.
-#define ORGAN_ASSISTED   FLAG(10) // The organ is partially prosthetic. No mechanical effect.
-#define ORGAN_ROBOTIC    FLAG(11) // The organ is robotic. Changes numerous behaviors, search BP_IS_ROBOTIC for checks.
-#define ORGAN_BRITTLE    FLAG(12) // The organ takes additional blunt damage. If robotic, cannot be repaired through normal means.
-#define ORGAN_CRYSTAL    FLAG(13) // The organ does not suffer laser damage, but shatters on droplimb.
-#define ORGAN_CONFIGURE  FLAG(14) // The organ has an extra configuration step for surgery that it handles itself.
+#define ORGAN_CUT_AWAY   FLAG_01  // The organ is in the process of being surgically removed.
+#define ORGAN_BLEEDING   FLAG_02  // The organ is currently bleeding.
+#define ORGAN_BROKEN     FLAG_03  // The organ is broken.
+#define ORGAN_DEAD       FLAG_04  // The organ is necrotic.
+#define ORGAN_MUTATED    FLAG_05  // The organ is unusable due to genetic damage.
+#define ORGAN_ARTERY_CUT FLAG_07  // The organ has had its artery cut.
+#define ORGAN_TENDON_CUT FLAG_08  // The organ has had its tendon cut.
+#define ORGAN_DISFIGURED FLAG_09  // The organ is scarred/disfigured. Alters whether or not the face can be recognised.
+#define ORGAN_SABOTAGED  FLAG_10  // The organ will explode if exposed to EMP, if prosthetic.
+#define ORGAN_ASSISTED   FLAG_11 // The organ is partially prosthetic. No mechanical effect.
+#define ORGAN_ROBOTIC    FLAG_12 // The organ is robotic. Changes numerous behaviors, search BP_IS_ROBOTIC for checks.
+#define ORGAN_BRITTLE    FLAG_13 // The organ takes additional blunt damage. If robotic, cannot be repaired through normal means.
+#define ORGAN_CRYSTAL    FLAG_14 // The organ does not suffer laser damage, but shatters on droplimb.
+#define ORGAN_CONFIGURE  FLAG_15 // The organ has an extra configuration step for surgery that it handles itself.
 
 // Flags for proc/take_organ_damage
-#define ORGAN_DAMAGE_SHARP       FLAG(0) // Damage should be treated as sharp when applied
-#define ORGAN_DAMAGE_EDGE        FLAG(1) // Damage should be treated as edged when applied
-#define ORGAN_DAMAGE_FLESH_ONLY  FLAG(2) // Damage should not be applied to robotic organs
-#define ORGAN_DAMAGE_ROBOT_ONLY  FLAG(3) // Damage should not be applied to flesh organs
-#define ORGAN_DAMAGE_SILICON_EMP FLAG(4) // Damage should be treated as bypassing armor for silicons
+#define ORGAN_DAMAGE_SHARP       FLAG_01 // Damage should be treated as sharp when applied
+#define ORGAN_DAMAGE_EDGE        FLAG_02 // Damage should be treated as edged when applied
+#define ORGAN_DAMAGE_FLESH_ONLY  FLAG_03 // Damage should not be applied to robotic organs
+#define ORGAN_DAMAGE_ROBOT_ONLY  FLAG_04 // Damage should not be applied to flesh organs
+#define ORGAN_DAMAGE_SILICON_EMP FLAG_05 // Damage should be treated as bypassing armor for silicons
 
 // Organ flag defines.
-#define ORGAN_FLAG_CAN_AMPUTATE   FLAG(0) // The organ can be amputated.
-#define ORGAN_FLAG_CAN_BREAK      FLAG(1) // The organ can be broken.
-#define ORGAN_FLAG_CAN_GRASP      FLAG(2) // The organ contributes to grasping.
-#define ORGAN_FLAG_CAN_STAND      FLAG(3) // The organ contributes to standing.
-#define ORGAN_FLAG_HAS_TENDON     FLAG(4) // The organ can have its tendon cut.
-#define ORGAN_FLAG_FINGERPRINT    FLAG(5) // The organ has a fingerprint.
-#define ORGAN_FLAG_GENDERED_ICON  FLAG(6) // The icon state for this organ appends _m/_f.
-#define ORGAN_FLAG_HEALS_OVERKILL FLAG(7) // The organ heals from overkill damage.
-#define ORGAN_FLAG_DEFORMED       FLAG(8) // The organ is permanently disfigured.
+#define ORGAN_FLAG_CAN_AMPUTATE   FLAG_01 // The organ can be amputated.
+#define ORGAN_FLAG_CAN_BREAK      FLAG_02 // The organ can be broken.
+#define ORGAN_FLAG_CAN_GRASP      FLAG_03 // The organ contributes to grasping.
+#define ORGAN_FLAG_CAN_STAND      FLAG_04 // The organ contributes to standing.
+#define ORGAN_FLAG_HAS_TENDON     FLAG_05 // The organ can have its tendon cut.
+#define ORGAN_FLAG_FINGERPRINT    FLAG_06 // The organ has a fingerprint.
+#define ORGAN_FLAG_GENDERED_ICON  FLAG_07 // The icon state for this organ appends _m/_f.
+#define ORGAN_FLAG_HEALS_OVERKILL FLAG_08 // The organ heals from overkill damage.
+#define ORGAN_FLAG_DEFORMED       FLAG_09 // The organ is permanently disfigured.
 
 // Droplimb types.
 #define DROPLIMB_EDGE 0

code/__defines/dna.dm

@@ -28,15 +28,15 @@
 #define mSmallsize     110 // Table climbing.
 
 // disabilities
-#define NEARSIGHTED    FLAG(0)
-#define EPILEPSY       FLAG(1)
-#define COUGHING       FLAG(2)
-#define NERVOUS        FLAG(3)
+#define NEARSIGHTED    FLAG_01
+#define EPILEPSY       FLAG_02
+#define COUGHING       FLAG_03
+#define NERVOUS        FLAG_04
 
 // sdisabilities
-#define BLINDED     FLAG(0)
-#define MUTED       FLAG(1)
-#define DEAFENED    FLAG(2)
+#define BLINDED     FLAG_01
+#define MUTED       FLAG_02
+#define DEAFENED    FLAG_03
 
 // The way blocks are handled badly needs a rewrite, this is horrible.
 // Too much of a project to handle at the moment, TODO for later.

code/__defines/doors.dm

@@ -9,10 +9,10 @@
 
 // Flags for `/obj/machinery/door/airlock/var/paintable`
 /// The main airlock body is paintable.
-#define AIRLOCK_PAINTABLE_MAIN FLAG(0)
+#define AIRLOCK_PAINTABLE_MAIN FLAG_01
 /// The stripe decal is paintable.
-#define AIRLOCK_PAINTABLE_STRIPE FLAG(1)
+#define AIRLOCK_PAINTABLE_STRIPE FLAG_02
 /// Other detailing is paintable.
-#define AIRLOCK_PAINTABLE_DETAIL FLAG(2)
+#define AIRLOCK_PAINTABLE_DETAIL FLAG_03
 /// The window is paintable.
-#define AIRLOCK_PAINTABLE_WINDOW FLAG(3)
+#define AIRLOCK_PAINTABLE_WINDOW FLAG_04