Merge branch 'master' into fixes-rgb-lighting

Author: PollardTheDragon

_maps/map_files/stations/emeraldstation.dmm

@@ -96809,7 +96809,7 @@
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/structure/flora/ausbushes/grassybush,
 /obj/structure/railing,
-/mob/living/simple_animal/deer{
+/mob/living/basic/deer{
 	name = "Reed"
 	},
 /turf/simulated/floor/grass,

_maps/map_files/stations/metastation.dmm

@@ -20361,10 +20361,10 @@
 /area/station/engineering/engine_foyer)
 "bCk" = (
 /obj/structure/table/wood,
-/obj/item/nullrod/fedora,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+/obj/item/clothing/head/fedora,
 /turf/simulated/floor/wood,
 /area/station/service/bar)
 "bCl" = (
@@ -32994,19 +32994,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/station/maintenance/medmaint)
-"cDY" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/glass/bottle/morphine{
-	pixel_y = 5
-	},
-/obj/item/clothing/glasses/hud/health,
-/obj/machinery/camera{
-	dir = 9;
-	c_tag = "Chief Medical Officer's Office"
-	},
-/obj/machinery/newscaster/directional/east,
-/turf/simulated/floor/carpet/blue,
-/area/station/command/office/cmo)
 "cEd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -61478,6 +61465,23 @@
 	icon_state = "white"
 	},
 /area/station/medical/surgery/primary)
+"mTF" = (
+/obj/structure/table/glass,
+/obj/machinery/camera{
+	dir = 9;
+	c_tag = "Chief Medical Officer's Office"
+	},
+/obj/machinery/newscaster/directional/east,
+/obj/item/storage/box/monkeycubes{
+	pixel_x = 6;
+	pixel_y = 4
+	},
+/obj/item/reagent_containers/glass/bottle/morphine{
+	pixel_y = 5
+	},
+/obj/item/clothing/glasses/hud/health,
+/turf/simulated/floor/carpet/blue,
+/area/station/command/office/cmo)
 "mUd" = (
 /obj/effect/turf_decal/stripes/line,
 /turf/simulated/floor/plating,
@@ -75838,6 +75842,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/item/food/monkeycube,
 /turf/simulated/floor/grass/no_creep,
 /area/station/maintenance/medmaint)
 "sXZ" = (
@@ -112035,7 +112040,7 @@ cvo
 cvo
 ifr
 dUb
-cDY
+mTF
 jJo
 coE
 cAT

code/__DEFINES/ai/blackboard_defines.dm

@@ -42,6 +42,15 @@
 ///List of mobs who have damaged us
 #define BB_BASIC_MOB_RETALIATE_LIST "BB_basic_mob_shitlist"
 
+//Hunting BB keys
+
+/// Key that holds our current hunting target
+#define BB_CURRENT_HUNTING_TARGET "BB_current_hunting_target"
+/// Key that holds our less priority hunting target
+#define BB_LOW_PRIORITY_HUNTING_TARGET "BB_low_priority_hunting_target"
+/// Key that holds the cooldown for our hunting subtree
+#define BB_HUNTING_COOLDOWN(type) "BB_HUNTING_COOLDOWN_[type]"
+
 // Food and eating
 
 /// list of foods this mob likes
@@ -62,6 +71,17 @@
 /// the motherfucker who tipped us
 #define BB_BASIC_MOB_TIPPER "BB_basic_tip_tipper"
 
+/// Is there something that scared us into being stationary? If so, hold the reference here
+#define BB_STATIONARY_CAUSE "BB_thing_that_made_us_stationary"
+///How long should we remain stationary for?
+#define BB_STATIONARY_SECONDS "BB_stationary_time_in_seconds"
+///Should we move towards the target that triggered us to be stationary?
+#define BB_STATIONARY_MOVE_TO_TARGET "BB_stationary_move_to_target"
+/// What targets will trigger us to be stationary? Must be a list.
+#define BB_STATIONARY_TARGETS "BB_stationary_targets"
+/// How often can we get spooked by a target?
+#define BB_STATIONARY_COOLDOWN "BB_stationary_cooldown"
+
 // Misc
 
 /// For /datum/ai_behavior/find_potential_targets, what if any field are we using currently

code/__DEFINES/basic_mob_defines.dm

@@ -0,0 +1,16 @@
+//deer
+
+/// Our water target
+#define BB_DEER_WATER_TARGET "deer_water_target"
+/// Our grass target
+#define BB_DEER_GRASS_TARGET "deer_grass_target"
+/// Our tree target
+#define BB_DEER_TREE_TARGET "deer_tree_target"
+/// Our temporary playmate
+#define BB_DEER_PLAYFRIEND "deer_playfriend"
+/// Our home target
+#define BB_DEER_TREEHOME "deer_home"
+/// Our resting duration
+#define BB_DEER_RESTING "deer_resting"
+/// Time till our next rest duration
+#define BB_DEER_NEXT_REST_TIMER "deer_next_rest_timer"

code/__DEFINES/chat.dm

@@ -21,6 +21,7 @@
 #define MESSAGE_TYPE_ADMINCHAT "adminchat"
 #define MESSAGE_TYPE_MENTORCHAT "mentorchat"
 #define MESSAGE_TYPE_DEVCHAT "devchat"
+#define MESSAGE_TYPE_STAFFCHAT "staffchat"
 #define MESSAGE_TYPE_EVENTCHAT "eventchat"
 #define MESSAGE_TYPE_ADMINLOG "adminlog"
 #define MESSAGE_TYPE_ATTACKLOG "attacklog"

code/__DEFINES/misc_defines.dm

@@ -435,6 +435,7 @@
 #define INVESTIGATE_SINGULO "singulo"
 #define INVESTIGATE_SUPERMATTER "supermatter"
 #define INVESTIGATE_WIRES "wires"
+#define INVESTIGATE_DEATHS "deaths"
 
 // The SQL version required by this version of the code
 #define SQL_VERSION 67
@@ -745,3 +746,8 @@ do { \
 
 //! The number of seconds between the start of the UNIX and BYOND epochs.
 #define BYOND_EPOCH_UNIX 946702800
+
+#define BRIDGE_SPAWN_SUCCESS 0
+#define BRIDGE_SPAWN_TOO_WIDE 1
+#define BRIDGE_SPAWN_TOO_NARROW 2
+#define BRIDGE_SPAWN_BAD_TERRAIN 3

code/__DEFINES/speech_channels.dm

@@ -9,4 +9,5 @@
 #define ADMIN_CHANNEL "Admin"
 #define DSAY_CHANNEL "Dsay"
 #define DEV_CHANNEL "Dev"
+#define STAFF_CHANNEL "Staff"
 

code/__HELPERS/_logging.dm

@@ -142,6 +142,12 @@ GLOBAL_PROTECT(log_end)
 		rustlibs_log_write(GLOB.world_game_log, "[message][GLOB.log_end]")
 		log_if_mismatch(speaker, message)
 
+/proc/log_staffsay(text, mob/speaker)
+	if(GLOB.configuration.logging.adminchat_logging)
+		var/message = "STAFFSAY: [speaker.simple_info_line()]: [html_decode(text)]"
+		rustlibs_log_write(GLOB.world_game_log, "[message][GLOB.log_end]")
+		log_if_mismatch(speaker, message)
+
 /proc/log_ghostsay(text, mob/speaker)
 	if(GLOB.configuration.logging.say_logging)
 		var/message = "DEADCHAT: [speaker.simple_info_line()]: [html_decode(text)]"

code/__HELPERS/mob_helpers.dm

@@ -606,9 +606,9 @@ GLOBAL_LIST_EMPTY(do_after_once_tracker)
 		var/mob/living/carbon/human/H = thing
 		H.sec_hud_set_security_status()
 
-/proc/update_all_mob_malf_hud(new_status)
+/proc/update_all_mob_malf_hud()
 	for(var/mob/living/carbon/human/H in GLOB.human_list)
-		H.malf_hud_set_status(new_status)
+		H.malf_hud_set_status()
 
 /proc/getviewsize(view)
 	var/viewX

code/__HELPERS/unsorted.dm

@@ -169,23 +169,6 @@
 	else
 		return FALSE
 
-// Returns true if direction is blocked from loc
-// Checks if doors are open
-/proc/DirBlocked(turf/loc, dir)
-	for(var/obj/structure/window/D in loc)
-		if(!D.density)
-			continue
-		if(D.fulltile)
-			return 1
-		if(D.dir == dir)
-			return 1
-
-	for(var/obj/machinery/door/D in loc)
-		if(!D.density)//if the door is open
-			continue
-		else return 1	// if closed, it's a real, air blocking door
-	return 0
-
 /////////////////////////////////////////////////////////////////////////
 
 /**
@@ -675,40 +658,6 @@ Returns 1 if the chain up to the area contains the given typepath
 			return TRUE
 	return FALSE
 
-/proc/get_step_towards2(atom/ref , atom/trg)
-	var/base_dir = get_dir(ref, get_step_towards(ref,trg))
-	var/turf/temp = get_step_towards(ref,trg)
-
-	if(is_blocked_turf(temp))
-		var/dir_alt1 = turn(base_dir, 90)
-		var/dir_alt2 = turn(base_dir, -90)
-		var/turf/turf_last1 = temp
-		var/turf/turf_last2 = temp
-		var/free_tile
-		var/breakpoint = 0
-
-		while(!free_tile && breakpoint < 10)
-			if(!is_blocked_turf(turf_last1))
-				free_tile = turf_last1
-				break
-			if(!is_blocked_turf(turf_last2))
-				free_tile = turf_last2
-				break
-			turf_last1 = get_step(turf_last1,dir_alt1)
-			turf_last2 = get_step(turf_last2,dir_alt2)
-			breakpoint++
-
-		if(!free_tile) return get_step(ref, base_dir)
-		else return get_step_towards(ref,free_tile)
-
-	else return get_step(ref, base_dir)
-
-//Takes: Anything that could possibly have variables and a varname to check.
-//Returns: 1 if found, 0 if not.
-/proc/hasvar(datum/A, varname)
-	if(A.vars.Find(lowertext(varname))) return 1
-	else return 0
-
 //Returns: all the areas in the world
 /proc/return_areas()
 	var/list/area/areas = list()
@@ -752,22 +701,6 @@ Returns 1 if the chain up to the area contains the given typepath
 				turfs += T
 	return turfs
 
-//Takes: Area type as text string or as typepath OR an instance of the area.
-//Returns: A list of all atoms	(objs, turfs, mobs) in areas of that type of that type in the world.
-/proc/get_area_all_atoms(areatype)
-	if(!areatype) return null
-	if(istext(areatype)) areatype = text2path(areatype)
-	if(isarea(areatype))
-		var/area/areatemp = areatype
-		areatype = areatemp.type
-
-	var/list/atoms = list()
-	for(var/area/N in world)
-		if(istype(N, areatype))
-			for(var/atom/A in N)
-				atoms += A
-	return atoms
-
 /// Simple datum for storing coordinates.
 /datum/coords
 	var/x_pos
@@ -1053,10 +986,6 @@ Returns 1 if the chain up to the area contains the given typepath
 	var/dy = abs(B.y - A.y)
 	return get_dir(A, B) & (rand() * (dx+dy) < dy ? 3 : 12)
 
-//chances are 1:value. anyprob(1) will always return true
-/proc/anyprob(value)
-	return (rand(1,value)==value)
-
 /proc/view_or_range(distance = world.view , center = usr , type)
 	switch(type)
 		if("view")
@@ -1148,17 +1077,6 @@ Returns 1 if the chain up to the area contains the given typepath
 	if(final_x || final_y)
 		return locate(final_x, final_y, T.z)
 
-//Finds the distance between two atoms, in pixels
-//centered = 0 counts from turf edge to edge
-//centered = 1 counts from turf center to turf center
-//of course mathematically this is just adding world.icon_size on again
-/proc/getPixelDistance(atom/A, atom/B, centered = 1)
-	if(!istype(A)||!istype(B))
-		return 0
-	. = bounds_dist(A, B) + sqrt((((A.pixel_x+B.pixel_x)**2) + ((A.pixel_y+B.pixel_y)**2)))
-	if(centered)
-		. += world.icon_size
-
 /proc/get(atom/loc, type)
 	while(loc)
 		if(istype(loc, type))
@@ -1211,17 +1129,6 @@ GLOBAL_LIST_INIT(wall_items, typecacheof(list(/obj/machinery/power/apc, /obj/mac
 /proc/format_text(text)
 	return replacetext(replacetext(text,"\proper ",""),"\improper ","")
 
-/*
-Standard way to write links -Sayu
-*/
-
-/proc/topic_link(datum/D, arglist, content)
-	if(islist(arglist))
-		arglist = list2params(arglist)
-	return "<a href='byond://?src=[D.UID()];[arglist]'>[content]</a>"
-
-
-
 /proc/get_location_accessible(mob/M, location)
 	var/covered_locations	= 0	//based on body_parts_covered
 	var/face_covered		= 0	//based on flags_inv
@@ -1326,16 +1233,6 @@ Standard way to write links -Sayu
 		chance = max(chance - (initial_chance / steps), 0)
 		steps--
 
-/proc/get_random_colour(simple, lower, upper)
-	var/colour
-	if(simple)
-		colour = pick("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF")
-	else
-		for(var/i=1;i<=3;i++)
-			var/temp_col = "[num2hex(rand(lower,upper), 2)]"
-			colour += temp_col
-	return colour
-
 /proc/get_distant_turf(turf/T, direction, distance)
 	if(!T || !direction || !distance)	return