Merge remote-tracking branch 'upstream/master'

ItsMarmite · Jun 6, 2024 · 97c7907 · 97c7907
2 parents b5f09eb + 7a4c487
commit 97c7907
Show file tree

Hide file tree

Showing 91 changed files with 373 additions and 277 deletions.
diff --git a/code/__DEFINES/directions.dm b/code/__DEFINES/directions.dm
@@ -28,3 +28,6 @@
 #define IS_DIR_DIAGONAL(dir) (dir & (dir - 1))
 /// returns TRUE if direction is cardinal and false if not
 #define IS_DIR_CARDINAL(dir) (!IS_DIR_DIAGONAL(dir))
+
+/// Inverse direction, taking into account UP|DOWN if necessary.
+#define REVERSE_DIR(dir) ( ((dir & 85) << 1) | ((dir & 170) >> 1) )
diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm
@@ -362,7 +362,7 @@ DEFINE_BITFIELD(smoothing_junction, list(
 				icon_state = "[base_icon_state]-[smoothing_junction]-d"
 				if(!fixed_underlay && new_junction != .) // Mutable underlays?
 					var/junction_dir = reverse_ndir(smoothing_junction)
-					var/turned_adjacency = reverse_direction(junction_dir)
+					var/turned_adjacency = REVERSE_DIR(junction_dir)
 					var/turf/neighbor_turf = get_step(src, turned_adjacency & (NORTH|SOUTH))
 					var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER, plane = FLOOR_PLANE)
 					if(neighbor_turf && (!neighbor_turf.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency) || neighbor_turf.density)) //dense turfs are unwanted for underlays

diff --git a/code/__HELPERS/trait_helpers.dm b/code/__HELPERS/trait_helpers.dm
@@ -228,6 +228,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_MEPHEDRONE_ADAPTED "mephedrone_adapted" // Trait that changes the ending effects of twitch leaving your system
 #define TRAIT_NOKNOCKDOWNSLOWDOWN "noknockdownslowdown" //If this person has this trait, they are not slowed via knockdown, but they can be hit by bullets like a self knockdown
 #define TRAIT_CAN_STRIP "can_strip" // This mob can strip other mobs.
+#define TRAIT_CLING_BURSTING "cling_bursting" // This changeling is about to burst into a headslug, block cremation / gibber to prevent nullspace issues
 #define TRAIT_I_WANT_BRAINS "mob_zombie" // A general trait for tracking if the mob is a zombie.
 #define TRAIT_ABSTRACT_HANDS "abstract_hands" // Mobs with this trait can only pick up abstract items.
 #define TRAIT_SLOW_GRABBER "slow_grabber" // Adds a 1.5 * CLICK_CD_MELEE delay to upgrading into a aggressive grab.

diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
@@ -1143,25 +1143,6 @@ GLOBAL_LIST_INIT(can_embed_types, typecacheof(list(
 	if(is_type_in_typecache(W, GLOB.can_embed_types))
 		return TRUE
 
-/proc/reverse_direction(dir)
-	switch(dir)
-		if(NORTH)
-			return SOUTH
-		if(NORTHEAST)
-			return SOUTHWEST
-		if(EAST)
-			return WEST
-		if(SOUTHEAST)
-			return NORTHWEST
-		if(SOUTH)
-			return NORTH
-		if(SOUTHWEST)
-			return NORTHEAST
-		if(WEST)
-			return EAST
-		if(NORTHWEST)
-			return SOUTHEAST
-
 /*
 Checks if that loc and dir has a item on the wall
 */

diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
@@ -92,6 +92,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_MEPHEDRONE_ADAPTED" = TRAIT_MEPHEDRONE_ADAPTED,
 		"TRAIT_NOKNOCKDOWNSLOWDOWN" = TRAIT_NOKNOCKDOWNSLOWDOWN,
 		"TRAIT_CAN_STRIP" = TRAIT_CAN_STRIP,
+		"TRAIT_CLING_BURSTING" = TRAIT_CLING_BURSTING,
 		"TRAIT_I_WANT_BRAINS" = TRAIT_I_WANT_BRAINS,
 		"TRAIT_ABSTRACT_HANDS" = TRAIT_ABSTRACT_HANDS,
 		"TRAIT_SLOW_GRABBER" = TRAIT_SLOW_GRABBER,

diff --git a/code/datums/diseases/zombie_virus.dm b/code/datums/diseases/zombie_virus.dm
@@ -14,7 +14,7 @@
 	disease_flags = CAN_CARRY
 	virus_heal_resistant = TRUE
 	stage_prob = 1
-	cure_chance = 20
+	cure_chance = 80
 	/// How far this particular virus is in being cured (0-4)
 	var/cure_stage = 0
 

diff --git a/code/datums/spells/mimic.dm b/code/datums/spells/mimic.dm
@@ -3,10 +3,9 @@
 	desc =  "Learn a new form to mimic or become one of your known forms"
 	clothes_req = FALSE
 	base_cooldown = 3 SECONDS
-	action_icon_state = "genetic_morph"
+	action_icon_state = "morph_mimic"
 	selection_activated_message = "<span class='sinister'>Click on a target to remember it's form. Click on yourself to change form.</span>"
 	create_attack_logs = FALSE
-	action_icon_state = "morph_mimic"
 	/// Which form is currently selected
 	var/datum/mimic_form/selected_form
 	/// Which forms the user can become

diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
@@ -439,10 +439,9 @@
 				return
 
 /atom/movable/screen/alert/status_effect/regenerative_core
-	name = "Reinforcing Tendrils"
+	name = "Regenerative Core Tendrils"
 	desc = "You can move faster than your broken body could normally handle!"
 	icon_state = "regenerative_core"
-	name = "Regenerative Core Tendrils"
 
 /datum/status_effect/regenerative_core
 	id = "Regenerative Core"