Merge remote-tracking branch 'upstream/master'

code/__DEFINES/color_defines.dm

@@ -153,3 +153,6 @@
 #define COMPLEMENTARY_COLOR_CRYOGENIC_LIQUID "#a8b7df"
 #define COMPLEMENTARY_COLOR_SORIUM "#a2a256"
 #define COMPLEMENTARY_COLOR_TESLIUM_PASTE "#412968"
+
+/// Color for dead external organs/zombies
+#define	COLORTONE_DEAD_EXT_ORGAN "#0A3200"

code/__DEFINES/gamemode.dm

@@ -54,6 +54,7 @@
 #define SPECIAL_ROLE_XENOMORPH_DRONE "Xenomorph Drone"
 #define SPECIAL_ROLE_XENOMORPH_SENTINEL "Xenomorph Sentinel"
 #define SPECIAL_ROLE_XENOMORPH_LARVA "Xenomorph Larva"
+#define SPECIAL_ROLE_ZOMBIE "Zombie"
 #define SPECIAL_ROLE_EVENTMISC "Event Role"
 
 // Constants used by code which checks the status of nuclear blasts during a

code/__DEFINES/hud.dm

@@ -56,6 +56,7 @@
 #define DATA_HUD_ABDUCTOR	19
 #define ANTAG_HUD_EVENTMISC 20
 #define ANTAG_HUD_BLOB 21
+#define ANTAG_HUD_ZOMBIE 22
 
 // Notification action types
 #define NOTIFY_JUMP "jump"

code/__DEFINES/misc_defines.dm

@@ -171,25 +171,26 @@
 #define MFOAM_IRON 		2
 
 //Human Overlays Indexes/////////
-#define EYES_OVERLAY_LAYER		42
-#define WING_LAYER				41
-#define WING_UNDERLIMBS_LAYER	40
-#define MUTANTRACE_LAYER		39
-#define TAIL_UNDERLIMBS_LAYER	38	//Tail split-rendering.
-#define LIMBS_LAYER				37
-#define MARKINGS_LAYER			36
-#define INTORGAN_LAYER			35
-#define UNDERWEAR_LAYER			34
-#define MUTATIONS_LAYER			33
-#define H_DAMAGE_LAYER			32
-#define UNIFORM_LAYER			31
-#define ID_LAYER				30
-#define HANDS_LAYER				29	//Exists to overlay hands over jumpsuits
-#define SHOES_LAYER				28
-#define GLOVES_LAYER			27
-#define EARS_LAYER				26
-#define BELT_LAYER				25	//Possible make this an overlay of something required to wear a belt?
-#define SUIT_LAYER				24
+#define EYES_OVERLAY_LAYER		43
+#define WING_LAYER				42
+#define WING_UNDERLIMBS_LAYER	41
+#define MUTANTRACE_LAYER		40
+#define TAIL_UNDERLIMBS_LAYER	39	//Tail split-rendering.
+#define LIMBS_LAYER				38
+#define MARKINGS_LAYER			37
+#define INTORGAN_LAYER			36
+#define UNDERWEAR_LAYER			35
+#define MUTATIONS_LAYER			34
+#define H_DAMAGE_LAYER			33
+#define UNIFORM_LAYER			32
+#define ID_LAYER				31
+#define HANDS_LAYER				30	//Exists to overlay hands over jumpsuits
+#define SHOES_LAYER				29
+#define GLOVES_LAYER			28
+#define EARS_LAYER				27
+#define BELT_LAYER				26	//Possible make this an overlay of something required to wear a belt?
+#define SUIT_LAYER				25
+#define SPECIAL_BELT_LAYER		24
 #define SUIT_STORE_LAYER		23
 #define BACK_LAYER				22
 #define HEAD_ACCESSORY_LAYER	21
@@ -213,7 +214,7 @@
 #define FIRE_LAYER				3	//If you're on fire
 #define MISC_LAYER				2
 #define FROZEN_LAYER			1
-#define TOTAL_LAYERS			42
+#define TOTAL_LAYERS			43
 
 ///Access Region Codes///
 #define REGION_ALL			0

code/__DEFINES/surgery_defines.dm

@@ -26,11 +26,13 @@
 #define ORGAN_ORGANIC_OPEN 1
 /// An organ that's encased, probably with bone, where that casing has been cut through.
 #define ORGAN_ORGANIC_ENCASED_OPEN 2
+/// An organ that has been violently opened, likely via damage.
+#define ORGAN_ORGANIC_VIOLENT_OPEN 3
 
 /// Synthetic organ that's been unscrewed.
-#define ORGAN_SYNTHETIC_LOOSENED 3
+#define ORGAN_SYNTHETIC_LOOSENED 4
 /// Synthetic organ that's had its panel opened.
-#define ORGAN_SYNTHETIC_OPEN 4
+#define ORGAN_SYNTHETIC_OPEN 5
 
 // Return defines for surgery steps
 

code/__HELPERS/_logging.dm

@@ -28,8 +28,9 @@ GLOBAL_PROTECT(log_end)
 #define testing(msg)
 #endif
 
-/proc/log_admin(text)
-	GLOB.admin_log.Add(text)
+/proc/log_admin(text, skip_glob = FALSE)
+	if(!skip_glob)
+		GLOB.admin_log.Add(text)
 	if(GLOB.configuration.logging.admin_logging)
 		rustg_log_write(GLOB.world_game_log, "ADMIN: [text][GLOB.log_end]")
 

code/__HELPERS/game.dm

@@ -375,45 +375,6 @@
 			active_players++
 	return active_players
 
-/datum/projectile_data
-	var/src_x
-	var/src_y
-	var/time
-	var/distance
-	var/power_x
-	var/power_y
-	var/dest_x
-	var/dest_y
-
-/datum/projectile_data/New(var/src_x, var/src_y, var/time, var/distance, \
-						var/power_x, var/power_y, var/dest_x, var/dest_y)
-	src.src_x = src_x
-	src.src_y = src_y
-	src.time = time
-	src.distance = distance
-	src.power_x = power_x
-	src.power_y = power_y
-	src.dest_x = dest_x
-	src.dest_y = dest_y
-
-/proc/projectile_trajectory(src_x, src_y, rotation, angle, power)
-
-	// returns the destination (Vx,y) that a projectile shot at [src_x], [src_y], with an angle of [angle],
-	// rotated at [rotation] and with the power of [power]
-	// Thanks to VistaPOWA for this function
-
-	var/power_x = power * cos(angle)
-	var/power_y = power * sin(angle)
-	var/time = 2* power_y / 10 //10 = g
-
-	var/distance = time * power_x
-
-	var/dest_x = src_x + distance*sin(rotation);
-	var/dest_y = src_y + distance*cos(rotation);
-
-	return new /datum/projectile_data(src_x, src_y, time, distance, power_x, power_y, dest_x, dest_y)
-
-
 /proc/mobs_in_area(area/the_area, client_needed=0, moblist=GLOB.mob_list)
 	var/list/mobs_found[0]
 	for(var/mob/M in moblist)

code/__HELPERS/lists.dm

@@ -9,34 +9,6 @@
  * Misc
  */
 
- // binary search sorted insert
-// IN: Object to be inserted
-// LIST: List to insert object into
-// TYPECONT: The typepath of the contents of the list
-// COMPARE: The variable on the objects to compare
-#define BINARY_INSERT(IN, LIST, TYPECONT, COMPARE) \
-	var/__BIN_CTTL = length(LIST);\
-	if(!__BIN_CTTL) {\
-		LIST += IN;\
-	} else {\
-		var/__BIN_LEFT = 1;\
-		var/__BIN_RIGHT = __BIN_CTTL;\
-		var/__BIN_MID = (__BIN_LEFT + __BIN_RIGHT) >> 1;\
-		var/##TYPECONT/__BIN_ITEM;\
-		while(__BIN_LEFT < __BIN_RIGHT) {\
-			__BIN_ITEM = LIST[__BIN_MID];\
-			if(__BIN_ITEM.##COMPARE <= IN.##COMPARE) {\
-				__BIN_LEFT = __BIN_MID + 1;\
-			} else {\
-				__BIN_RIGHT = __BIN_MID;\
-			};\
-			__BIN_MID = (__BIN_LEFT + __BIN_RIGHT) >> 1;\
-		};\
-		__BIN_ITEM = LIST[__BIN_MID];\
-		__BIN_MID = __BIN_ITEM.##COMPARE > IN.##COMPARE ? __BIN_MID : __BIN_MID + 1;\
-		LIST.Insert(__BIN_MID, IN);\
-	}
-
 /// Passed into BINARY_INSERT to compare keys
 #define COMPARE_KEY __BIN_LIST[__BIN_MID]
 /// Passed into BINARY_INSERT to compare values

code/__HELPERS/trait_helpers.dm

@@ -150,8 +150,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_PACIFISM			"pacifism"
 #define TRAIT_IGNORESLOWDOWN	"ignoreslow"
 #define TRAIT_IGNOREDAMAGESLOWDOWN "ignoredamageslowdown"
-#define TRAIT_GOTTAGOFAST		"gottagofast"
-#define TRAIT_GOTTAGONOTSOFAST	"gottagonotsofast"
+#define TRAIT_GOTTAGOFAST		"gottagofast" // -1 slowdown. Trait given by meth and similar substances for running fast.
+#define TRAIT_GOTTAGONOTSOFAST	"gottagonotsofast" // -0.5 slowdown. Trait given by nuka cola and umbrae shade, for a slight speed/
+#define TRAIT_GOTTAGOSLOW		"gottagoslow" // +1 slowdown. Trait given by being a zombie.
 #define TRAIT_FAKEDEATH			"fakedeath" //Makes the owner appear as dead to most forms of medical examination
 #define TRAIT_XENO_HOST			"xeno_host"	//Tracks whether we're gonna be a baby alien's mummy.
 #define TRAIT_SHOCKIMMUNE		"shock_immunity"
@@ -181,7 +182,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_FLASH_PROTECTION	"flash_protection"
 #define TRAIT_NIGHT_VISION		"night_vision"
 #define TRAIT_EMOTE_MUTE		"emote_mute"
-#define TRAIT_PUNCTURE_IMMUNE	"punctureimmune" //prevents RSG syringes from piercing your clothing
+#define TRAIT_RSG_IMMUNE		"rsgimmune" //prevents RSG syringes from piercing your clothing
 
 #define TRAIT_NO_BONES 			"no_bones"
 #define TRAIT_STURDY_LIMBS		"sturdy_limbs"
@@ -227,6 +228,10 @@ 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_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.
+#define TRAIT_LANGUAGE_LOCKED "language_locked" // cant add/remove languages until removed (excludes babel because fuck everything i guess)
 
 //***** MIND TRAITS *****/
 #define TRAIT_HOLY "is_holy" // The mob is holy in regards to religion
@@ -281,6 +286,10 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 ///e.g. a storage container or a modsuit.
 #define TRAIT_ADJACENCY_TRANSPARENT "adjacency_transparent"
 
+//****** ATOM/MOVABLE TRAITS *****//
+/// A trait for determining if a atom/movable is currently crossing into another z-level by using of /turf/space z-level "destination-xyz" transfers
+#define TRAIT_CURRENTLY_Z_MOVING "currently_z_moving" // please dont adminbus this
+
 //
 // common trait sources
 #define TRAIT_GENERIC "generic"
@@ -295,6 +304,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define CULT_TRAIT "cult"
 #define INNATE_TRAIT "innate"
 #define VAMPIRE_TRAIT "vampire"
+#define ZOMBIE_TRAIT "zombie"
 #define CHANGELING_TRAIT "changeling"
 #define LYING_DOWN_TRAIT "lying_down"
 #define SLIME_TRAIT "slime"

code/_globalvars/traits.dm

@@ -20,6 +20,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_IGNOREDAMAGESLOWDOWN" = TRAIT_IGNOREDAMAGESLOWDOWN,
 		"TRAIT_GOTTAGOFAST" = TRAIT_GOTTAGOFAST,
 		"TRAIT_GOTTAGONOTSOFAST" = TRAIT_GOTTAGONOTSOFAST,
+		"TRAIT_GOTTAGOSLOW" = TRAIT_GOTTAGOSLOW,
 		"TRAIT_FAKEDEATH" = TRAIT_FAKEDEATH,
 		"TRAIT_XENO_HOST" = TRAIT_XENO_HOST,
 		"TRAIT_SHOCKIMMUNE" = TRAIT_SHOCKIMMUNE,
@@ -90,7 +91,11 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_SCOPED" = TRAIT_SCOPED,
 		"TRAIT_MEPHEDRONE_ADAPTED" = TRAIT_MEPHEDRONE_ADAPTED,
 		"TRAIT_NOKNOCKDOWNSLOWDOWN" = TRAIT_NOKNOCKDOWNSLOWDOWN,
-		"TRAIT_CAN_STRIP" = TRAIT_CAN_STRIP
+		"TRAIT_CAN_STRIP" = TRAIT_CAN_STRIP,
+		"TRAIT_I_WANT_BRAINS" = TRAIT_I_WANT_BRAINS,
+		"TRAIT_ABSTRACT_HANDS" = TRAIT_ABSTRACT_HANDS,
+		"TRAIT_SLOW_GRABBER" = TRAIT_SLOW_GRABBER,
+		"TRAIT_LANGUAGE_LOCKED" = TRAIT_LANGUAGE_LOCKED,
 	),
 
 	/datum/mind = list(

code/_onclick/click.dm

@@ -51,7 +51,7 @@
 	if(QDELETED(A))
 		return
 
-	if(client.click_intercept)
+	if(client?.click_intercept)
 		client.click_intercept.InterceptClickOn(src, params, A)
 		return
 

code/_onclick/hud/radial.dm

@@ -260,8 +260,9 @@ GLOBAL_LIST_EMPTY(radial_menus)
 		return
 	if(!uniqueid)
 		uniqueid = "defmenu_[user.UID()]_[anchor.UID()]"
-
-	if(GLOB.radial_menus[uniqueid])
+	if(GLOB.radial_menus[uniqueid]) // Calls the close button an already existing radial menu.
+		var/datum/radial_menu/existing_menu = GLOB.radial_menus[uniqueid]
+		existing_menu.finished = TRUE
 		return
 
 	var/datum/radial_menu/menu = new

code/controllers/subsystem/SSspacedrift.dm

@@ -53,7 +53,7 @@ SUBSYSTEM_DEF(spacedrift)
 		var/old_dir = AM.dir
 		var/old_loc = AM.loc
 		AM.inertia_moving = TRUE
-		step(AM, AM.inertia_dir)
+		AM.Move(get_step(AM, AM.inertia_dir), AM.inertia_dir, AM.inertia_move_delay)
 		AM.inertia_moving = FALSE
 		AM.inertia_next_move = world.time + AM.inertia_move_delay
 		if(AM.loc == old_loc)

code/controllers/subsystem/SSticker.dm

@@ -141,6 +141,8 @@ SUBSYSTEM_DEF(ticker)
 				var/list/pickable_types = list()
 				for(var/x in subtypesof(/datum/map))
 					var/datum/map/M = x
+					if(istype(SSmapping.map_datum, M)) // Random will never choose the same map twice in a row.
+						continue
 					if(initial(M.voteable) && length(GLOB.clients) >= initial(M.min_players_random))
 						pickable_types += M
 

code/datums/atom_hud.dm

@@ -23,7 +23,8 @@ GLOBAL_LIST_INIT(huds, list(
 	ANTAG_HUD_ABDUCTOR = new/datum/atom_hud/antag/hidden(),
 	DATA_HUD_ABDUCTOR = new/datum/atom_hud/abductor(),
 	ANTAG_HUD_EVENTMISC = new/datum/atom_hud/antag/hidden(),
-	ANTAG_HUD_BLOB = new/datum/atom_hud/antag/hidden()
+	ANTAG_HUD_BLOB = new/datum/atom_hud/antag/hidden(),
+	ANTAG_HUD_ZOMBIE = new/datum/atom_hud/antag()
 	))
 
 /datum/atom_hud