Merge remote-tracking branch 'upstream/master' into TGMC-Get_Angle

.vscode/settings.json

@@ -9,7 +9,7 @@
 		"**/.pnp.*": true
 	},
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	},
 	"files.eol": "\n",
 	"files.insertFinalNewline": true,

code/__DEFINES/alerts.dm

@@ -0,0 +1,7 @@
+#define ALERT_BUCKLED "buckled"
+#define ALERT_HANDCUFFED "handcuffed"
+#define ALERT_LEGCUFFED "legcuffed"
+#define ALERT_FLOORED "floored"
+#define ALERT_INCAPACITATED "incapacitated"
+#define ALERT_KNOCKEDOUT "knockedout"
+#define ALERT_IMMOBILIZED "immobilized"

code/__DEFINES/dcs/signals/atom/mob/living/signals_living.dm

@@ -23,11 +23,6 @@
 #define COMSIG_LIVING_SPEAK "living_speak"
 	#define COMPONENT_OVERRIDE_SPEAK (1<<0)
 
-#define COMSIG_LIVING_APPLY_EFFECT "living_apply_effect"
-#define COMSIG_LIVING_ADJUST_EFFECT "living_adjust_effect"
-#define COMSIG_LIVING_SET_EFFECT "living_set_effect"
-	#define COMPONENT_CANCEL_EFFECT (1<<0)
-
 /// From /obj/structure/proc/do_climb(var/mob/living/user, mods)
 #define COMSIG_LIVING_CLIMB_STRUCTURE "climb_over_structure"
 /// From /mob/living/Collide(): (atom/A)

code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm

@@ -95,6 +95,9 @@
 #define COMSIG_MOB_MOVE_OR_LOOK "mob_move_or_look"
 	#define COMPONENT_OVERRIDE_MOB_MOVE_OR_LOOK (1<<0)
 
+///from rejuv
+#define COMSIG_LIVING_POST_FULLY_HEAL "living_post_fully_heal"
+
 ///from /mob/living/emote(): ()
 #define COMSIG_MOB_EMOTE "mob_emote"
 

code/__DEFINES/maps.dm

@@ -32,6 +32,7 @@ require only minor tweaks.
 #define ZTRAIT_FOG "Fog"
 #define ZTRAIT_LOCKDOWN "Lockdown"
 #define ZTRAIT_BASIC_RT "BasicRT"
+#define ZTRAIT_IN_SPACE "InSpace" // Is our ground_level considered in space or on a space station
 
 // boolean - weather types that occur on the level
 #define ZTRAIT_SNOWSTORM "weather_snowstorm"

code/__DEFINES/mobs.dm

@@ -1,3 +1,6 @@
+/// Multiplier for Stun/KD/KO/etc durations in new backend, due to old system being based on life ticks
+#define GLOBAL_STATUS_MULTIPLIER 20 // each in-code unit is worth 20ds of duration
+
 #define HEALTH_THRESHOLD_DEAD -100
 #define HEALTH_THRESHOLD_CRIT -50
 

code/__DEFINES/status_effects.dm

@@ -0,0 +1,25 @@
+///if it allows multiple instances of the effect
+#define STATUS_EFFECT_MULTIPLE 0
+///if it allows only one, preventing new instances
+#define STATUS_EFFECT_UNIQUE 1
+///if it allows only one, but new instances replace
+#define STATUS_EFFECT_REPLACE 2
+/// if it only allows one, and new instances just instead refresh the timer
+#define STATUS_EFFECT_REFRESH 3
+
+///Processing flags - used to define the speed at which the status will work
+///This is fast - 0.2s between ticks (I believe!)
+#define STATUS_EFFECT_FAST_PROCESS 0
+///This is slower and better for more intensive status effects - 1s between ticks
+#define STATUS_EFFECT_NORMAL_PROCESS 1
+
+//Incapacitated status effect flags
+/// If the incapacitated status effect will ignore a mob in restraints (handcuffs)
+#define IGNORE_RESTRAINTS (1<<0)
+/// If the incapacitated status effect will ignore a mob in stasis (stasis beds)
+#define IGNORE_STASIS (1<<1)
+/// If the incapacitated status effect will ignore a mob being agressively grabbed
+#define IGNORE_GRAB (1<<2)
+
+/// Time threshold after which we launch ending timer - this should be higher than the slowest processing rate
+#define STATUS_EFFECT_TIME_THRESHOLD (2 SECONDS)

code/__DEFINES/subsystems.dm

@@ -179,9 +179,11 @@
 #define SS_PRIORITY_FAST_OBJECTS   105
 #define SS_PRIORITY_OBJECTS 104
 #define SS_PRIORITY_DECORATOR    99
+#define SS_PRIORITY_EFFECTS        97
+#define SS_PRIORITY_FASTEFFECTS    96
 #define SS_PRIORITY_HIJACK 97
 #define SS_PRIORITY_POWER   95
-#define SS_PRIORITY_EFFECTS 92
+#define SS_PRIORITY_OLDEFFECTS 92
 #define SS_PRIORITY_MACHINERY   90
 #define SS_PRIORITY_FZ_TRANSITIONS 88
 #define SS_PRIORITY_ROUND_RECORDING 83

code/__DEFINES/surgery.dm

@@ -38,6 +38,15 @@ unless the surgical tool is completely unsuited to what it's being used for.*/
 ///A tool that's perfect for the surgery.
 #define SURGERY_TOOL_MULT_IDEAL 1
 
+///The (no) chance of failure for surgery because the correct tools/conditions are used or skill compensates
+#define SURGERY_FAILURE_IMPOSSIBLE 0
+///The chance of failure for surgery because the the tool/ground is SURGERY_TOOL_MULT_BAD_SUBSTITUTE/SURGERY_SURFACE_MULT_UNSUITED and skill can't compensate enough
+#define SURGERY_FAILURE_UNLIKELY 5
+///The chance of failure for surgery because the the tool/ground is SURGERY_TOOL_MULT_AWFUL/SURGERY_SURFACE_MULT_AWFUL and skill can't compensate enough
+#define SURGERY_FAILURE_POSSIBLE 25
+///The chance of failure for surgery because the the tool and ground is some combination worse than awful and skill can't compensate enough
+#define SURGERY_FAILURE_LIKELY 50
+
 //When initiating surgeries, these define their order when listed in initiation selector or 'you can't use this tool for anything, but could x, y, or z' messages.
 ///Appears first in lists. Ex. larva surgery, opening incision. Immediately life-threatening or initiation surgeries.
 #define SURGERY_PRIORITY_MAXIMUM 5

code/__DEFINES/traits.dm

@@ -415,6 +415,8 @@ GLOBAL_LIST(trait_name_map)
 #define TRAIT_SOURCE_XENO_ACTION_CHARGE "t_s_xeno_action_charge"
 ///Status trait coming from a xeno nest
 #define XENO_NEST_TRAIT "xeno_nest"
+///Status trait from a generic throw by xeno abilities
+#define XENO_THROW_TRAIT "xeno_throw_trait"
 //-- structure traits --
 ///Status trait coming from being flipped or unflipped.
 #define TRAIT_SOURCE_FLIP_TABLE "t_s_flip_table"

code/__DEFINES/xeno.dm

@@ -580,9 +580,7 @@
 #define XENO_STRUCTURE_CORE  "hive core"
 #define XENO_STRUCTURE_CLUSTER   "hive cluster"
 #define XENO_STRUCTURE_PYLON "hive pylon"
-#define XENO_STRUCTURE_POOL  "spawn pool"
 #define XENO_STRUCTURE_EGGMORPH  "egg morpher"
-#define XENO_STRUCTURE_EVOPOD    "evolution pod"
 #define XENO_STRUCTURE_RECOVERY  "recovery node"
 #define XENO_STRUCTURE_NEST  "thick resin nest"
 

code/_onclick/hud/hud.dm

@@ -230,6 +230,7 @@
 	hud_version = display_hud_version
 	persistent_inventory_update(screenmob)
 	mymob.update_action_buttons(TRUE)
+	reorganize_alerts(screenmob)
 	mymob.reload_fullscreens()
 
 	// ensure observers get an accurate and up-to-date view

code/_onclick/hud/screen_objects.dm

@@ -523,17 +523,17 @@
 		if(user.observed_xeno == user.tracked_marker)
 			user.overwatch(user.tracked_marker, TRUE) //passing in an obj/effect into a proc that expects mob/xenomorph B)
 		else
-			to_chat(user, SPAN_XENONOTICE("You psychically observe the [user.tracked_marker.mark_meaning.name] resin mark in [get_area_name(user.tracked_marker)]."))
+			to_chat(user, SPAN_XENONOTICE("We psychically observe the [user.tracked_marker.mark_meaning.name] resin mark in [get_area_name(user.tracked_marker)]."))
 			user.overwatch(user.tracked_marker) //this is so scuffed, sorry if this causes errors
 		return
 	if(mods["alt"] && user.tracked_marker)
 		user.stop_tracking_resin_mark()
 		return
 	if(!user.hive)
-		to_chat(user, SPAN_WARNING("You don't belong to a hive!"))
+		to_chat(user, SPAN_WARNING("We don't belong to a hive!"))
 		return FALSE
 	if(!user.hive.living_xeno_queen)
-		to_chat(user, SPAN_WARNING("Without a queen your psychic link is broken!"))
+		to_chat(user, SPAN_WARNING("Without a queen our psychic link is broken!"))
 		return FALSE
 	if(HAS_TRAIT(user, TRAIT_ABILITY_BURROWED) || user.is_mob_incapacitated() || user.buckled)
 		return FALSE
@@ -551,10 +551,10 @@
 		return FALSE
 	if(mods["shift"])
 		var/area/current_area = get_area(user)
-		to_chat(user, SPAN_NOTICE("You are currently at: <b>[current_area.name]</b>."))
+		to_chat(user, SPAN_NOTICE("We are currently at: <b>[current_area.name]</b>."))
 		return
 	if(!user.hive)
-		to_chat(user, SPAN_WARNING("You don't belong to a hive!"))
+		to_chat(user, SPAN_WARNING("We don't belong to a hive!"))
 		return FALSE
 	if(mods["alt"])
 		var/list/options = list()
@@ -581,7 +581,7 @@
 			track_state = options[selected]
 		return
 	if(!user.hive.living_xeno_queen)
-		to_chat(user, SPAN_WARNING("Your hive doesn't have a living queen!"))
+		to_chat(user, SPAN_WARNING("Our hive doesn't have a living queen!"))
 		return FALSE
 	if(HAS_TRAIT(user, TRAIT_ABILITY_BURROWED) || user.is_mob_incapacitated() || user.buckled)
 		return FALSE

code/_onclick/ventcrawl.dm

@@ -7,7 +7,7 @@
 		return
 	for(var/atom/A as anything in src)
 		if(!(is_type_in_list(A, canEnterVentWith)))
-			to_chat(src, SPAN_WARNING("You can't be carrying items or have items equipped when vent crawling!"))
+			to_chat(src, SPAN_WARNING("We cannot be carrying items or have items equipped when vent crawling!"))
 			return FALSE
 
 /mob/living/click(atom/A, list/mods)
@@ -25,7 +25,7 @@
 		if(Adjacent(V) && !V.welded)
 			pipes |= V
 	if(!pipes || !pipes.len)
-		to_chat(src, SPAN_WARNING("There are no pipes that you can ventcrawl into within range!"))
+		to_chat(src, SPAN_WARNING("There are no pipes that we can ventcrawl into within range!"))
 		return
 	if(pipes.len == 1)
 		pipe = pipes[1]
@@ -42,11 +42,11 @@
 
 /mob/living/proc/handle_ventcrawl(atom/clicked_on)
 	if(stat)
-		to_chat(src, SPAN_WARNING("You must be conscious to do this!"))
+		to_chat(src, SPAN_WARNING("We must be conscious to do this!"))
 		return
 
 	if(is_mob_incapacitated())
-		to_chat(src, SPAN_WARNING("You can't vent crawl while you're stunned!"))
+		to_chat(src, SPAN_WARNING("We can't vent crawl while we are stunned!"))
 		return
 
 	var/obj/structure/pipes/vents/vent_found
@@ -59,11 +59,11 @@
 		vent_found = locate(/obj/structure/pipes/vents/) in range(1, src)
 
 	if(!vent_found)
-		to_chat(src, SPAN_WARNING("You must be standing on or beside an air vent to enter it."))
+		to_chat(src, SPAN_WARNING("We must be standing on or beside an air vent to enter it."))
 		return
 
 	if(vent_found.welded)
-		to_chat(src, SPAN_WARNING("This vent is closed off, you cannot climb through it."))
+		to_chat(src, SPAN_WARNING("This vent is closed off, we cannot climb through it."))
 		return
 
 	if(!ventcrawl_carry())
@@ -78,10 +78,10 @@
 
 	if(length(vent_found.connected_to))
 		if(src.action_busy)
-			to_chat(src, SPAN_WARNING("You are already busy with something."))
+			to_chat(src, SPAN_WARNING("We are already busy with something."))
 			return
 
-		visible_message(SPAN_NOTICE("[src] begins climbing into [vent_found]."), SPAN_NOTICE("You begin climbing into [vent_found]."))
+		visible_message(SPAN_NOTICE("[src] begins climbing into [vent_found]."), SPAN_NOTICE("We begin climbing into [vent_found]."))
 		vent_found.animate_ventcrawl()
 		if(!do_after(src, 45, INTERRUPT_NO_NEEDHAND, BUSY_ICON_GENERIC))
 			vent_found.animate_ventcrawl_reset()

code/_onclick/xeno.dm

@@ -73,10 +73,10 @@
 				playsound(loc, 'sound/weapons/alien_claw_swipe.ogg', 10, 1) //Quiet to limit spam/nuisance.
 				if(firepatted)
 					src.visible_message(SPAN_DANGER("\The [src] pats at the fire!"), \
-					SPAN_DANGER("You pat the fire!"), null, 5, CHAT_TYPE_XENO_COMBAT)
+					SPAN_DANGER("We pat the fire!"), null, 5, CHAT_TYPE_XENO_COMBAT)
 				else
 					src.visible_message(SPAN_DANGER("\The [src] swipes at \the [target]!"), \
-					SPAN_DANGER("You swipe at \the [target]!"), null, 5, CHAT_TYPE_XENO_COMBAT)
+					SPAN_DANGER("We swipe at \the [target]!"), null, 5, CHAT_TYPE_XENO_COMBAT)
 	return TRUE
 
 /mob/living/carbon/xenomorph/RangedAttack(atom/A)

code/controllers/subsystem/minimap.dm

@@ -883,7 +883,7 @@ SUBSYSTEM_DEF(minimaps)
 			else if(faction == XENO_HIVE_NORMAL)
 				var/mutable_appearance/appearance = mutable_appearance(icon('icons/mob/hud/actions_xeno.dmi'), "toggle_queen_zoom")
 				COOLDOWN_START(GLOB, xeno_canvas_cooldown, canvas_cooldown_time)
-				xeno_maptext("The Queen has updated your hive mind map", "You sense something unusual...", faction)
+				xeno_maptext("The Queen has updated our hive mind map", "We sense something unusual...", faction)
 				notify_ghosts(header = "Tactical Map", message = "The Xenomorph tactical map has been updated.", ghost_sound = "sound/voice/alien_distantroar_3.ogg", notify_volume = 50, action = NOTIFY_XENO_TACMAP, enter_link = "xeno_tacmap=1", enter_text = "View", source = user, alert_overlay = appearance)
 
 			toolbar_updated_selection = toolbar_color_selection

code/controllers/subsystem/processing/effects.dm

@@ -1,5 +1,4 @@
 PROCESSING_SUBSYSTEM_DEF(effects)
 	name  = "Effects"
 	wait  = 1 SECONDS
-	flags = SS_NO_INIT | SS_KEEP_TIMING
 	priority = SS_PRIORITY_EFFECTS

code/controllers/subsystem/processing/fasteffects.dm

@@ -0,0 +1,4 @@
+PROCESSING_SUBSYSTEM_DEF(fasteffects)
+	name     = "Fast Effects"
+	wait     = 0.2 SECONDS
+	priority = SS_PRIORITY_FASTEFFECTS

code/controllers/subsystem/processing/oldeffects.dm

@@ -0,0 +1,5 @@
+PROCESSING_SUBSYSTEM_DEF(oldeffects)
+	name     = "Old Effects"
+	wait     = 1 SECONDS
+	flags    = SS_NO_INIT | SS_KEEP_TIMING
+	priority = SS_PRIORITY_OLDEFFECTS

code/datums/ammo/ammo.dm

@@ -164,7 +164,8 @@
 /datum/ammo/proc/knockback_effects(mob/living/living_mob, obj/projectile/fired_projectile)
 	if(iscarbonsizexeno(living_mob))
 		var/mob/living/carbon/xenomorph/target = living_mob
-		target.apply_effect(0.7, WEAKEN) // 0.9 seconds of stun, per agreement from Balance Team when switched from MC stuns to exact stuns
+		target.Stun(0.7) // Previous comment said they believed 0.7 was 0.9s and that the balance team approved this. Geez...
+		target.KnockDown(0.7)
 		target.apply_effect(1, SUPERSLOW)
 		target.apply_effect(2, SLOW)
 		to_chat(target, SPAN_XENODANGER("You are shaken by the sudden impact!"))

code/datums/ammo/bullet/rifle.dm

@@ -175,7 +175,8 @@
 	if(iscarbonsizexeno(living_mob))
 		var/mob/living/carbon/xenomorph/target = living_mob
 		to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!"))
-		target.apply_effect(0.5, WEAKEN)
+		target.KnockDown(0.5) // purely for visual effect, noone actually cares
+		target.Stun(0.5)
 		target.apply_effect(2, SUPERSLOW)
 		target.apply_effect(5, SLOW)
 	else

code/datums/ammo/bullet/shotgun.dm

@@ -25,7 +25,8 @@
 	if(iscarbonsizexeno(living_mob))
 		var/mob/living/carbon/xenomorph/target = living_mob
 		to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!"))
-		target.apply_effect(0.5, WEAKEN)
+		target.KnockDown(0.5) // If you ask me the KD should be left out, but players like their visual cues
+		target.Stun(0.5)
 		target.apply_effect(1, SUPERSLOW)
 		target.apply_effect(3, SLOW)
 	else
@@ -249,7 +250,8 @@
 	if(iscarbonsizexeno(living_mob))
 		var/mob/living/carbon/xenomorph/target = living_mob
 		to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!"))
-		target.apply_effect(0.5, WEAKEN)
+		target.KnockDown(0.5) // If you ask me the KD should be left out, but players like their visual cues
+		target.Stun(0.5)
 		target.apply_effect(2, SUPERSLOW)
 		target.apply_effect(5, SLOW)
 	else
@@ -338,7 +340,8 @@
 		return
 
 	shake_camera(M, 3, 4)
-	M.apply_effect(2, WEAKEN)
+	M.KnockDown(2) // If you ask me the KD should be left out, but players like their visual cues
+	M.Stun(2)
 	M.apply_effect(4, SLOW)
 	if(iscarbonsizexeno(M))
 		to_chat(M, SPAN_XENODANGER("The impact knocks you off your feet!"))
@@ -351,7 +354,8 @@
 	if(iscarbonsizexeno(living_mob))
 		var/mob/living/carbon/xenomorph/target = living_mob
 		to_chat(target, SPAN_XENODANGER("You are shaken and slowed by the sudden impact!"))
-		target.apply_effect(0.5, WEAKEN)
+		target.KnockDown(0.5) // If you ask me the KD should be left out, but players like their visual cues
+		target.Stun(0.5)
 		target.apply_effect(2, SUPERSLOW)
 		target.apply_effect(5, SLOW)
 	else

code/datums/ammo/bullet/special_ammo.dm

@@ -108,6 +108,9 @@
 		BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff)
 	))
 
+/datum/ammo/bullet/machinegun/doorgun
+	flags_ammo_behavior = AMMO_BALLISTIC | AMMO_IGNORE_COVER
+
 /datum/ammo/bullet/machinegun/auto // for M2C, automatic variant for M56D, stats for bullet should always be moderately overtuned to fulfill its ultra-offense + flank-push purpose
 	name = "heavy machinegun bullet"
 

code/datums/ammo/energy.dm

@@ -103,8 +103,8 @@
 	icon_state = "shrapnel_plasma"
 	damage_type = BURN
 
-/datum/ammo/bullet/shrapnel/plasma/on_hit_mob(mob/hit_mob, obj/projectile/hit_projectile)
-	hit_mob.apply_effect(2, WEAKEN)
+/datum/ammo/bullet/shrapnel/plasma/on_hit_mob(mob/living/hit_mob, obj/projectile/hit_projectile)
+	hit_mob.Stun(2)
 
 /datum/ammo/energy/yautja/caster
 	name = "root caster bolt"
@@ -141,12 +141,8 @@
 		log_attack("[key_name(C)] was stunned by a high power stun bolt from [key_name(P.firer)] at [get_area(P)]")
 
 		if(ishuman(C))
-			var/mob/living/carbon/human/H = C
 			stun_time++
-			H.apply_effect(stun_time, WEAKEN)
-		else
-			M.apply_effect(stun_time, WEAKEN)
-
+		C.apply_effect(stun_time, WEAKEN)
 		C.apply_effect(stun_time, STUN)
 	..()
 
@@ -217,12 +213,7 @@
 			continue
 		to_chat(M, SPAN_DANGER("A powerful electric shock ripples through your body, freezing you in place!"))
 		M.apply_effect(stun_time, STUN)
-
-		if (ishuman(M))
-			var/mob/living/carbon/human/H = M
-			H.apply_effect(stun_time, WEAKEN)
-		else
-			M.apply_effect(stun_time, WEAKEN)
+		M.apply_effect(stun_time, WEAKEN)
 
 /datum/ammo/energy/yautja/rifle/bolt
 	name = "plasma rifle bolt"