Merge remote-tracking branch 'upstream/master' into PortsPsionics

Author: cowbot92

_maps/map_files/IceMeta/IceMeta.dmm

@@ -60258,10 +60258,6 @@
 /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower,
 /turf/open/floor/plasteel,
 /area/storage/primary)
-"rts" = (
-/obj/effect/turf_decal/trimline/secred/filled/corner/lower,
-/turf/closed/wall,
-/area/security/brig)
 "rtz" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -69984,7 +69980,6 @@
 	pixel_y = -38
 	},
 /obj/effect/turf_decal/trimline/secred/filled/line/lower,
-/obj/effect/turf_decal/trimline/secred/filled/corner/lower,
 /turf/open/floor/plasteel,
 /area/security/brig)
 "udI" = (
@@ -245192,7 +245187,7 @@ xvh
 iSo
 gNR
 udn
-rts
+ulr
 ulr
 ulr
 qin

…de/__DEFINES/dcs/signals/signals_huds.dm code/__DEFINES/dcs/signals/signals_hud.dmcode/__DEFINES/dcs/signals/signals_huds.dm renamed to code/__DEFINES/dcs/signals/signals_hud.dm code/__DEFINES/dcs/signals/signals_huds.dm renamed to code/__DEFINES/dcs/signals/signals_hud.dm

@@ -1,5 +1,7 @@
 /// Sent from /datum/hud/proc/on_eye_change(): (atom/old_eye, atom/new_eye)
 #define COMSIG_HUD_EYE_CHANGED "hud_eye_changed"
+/// Sent from /datum/hud/proc/eye_z_changed() : (new_z)
+#define COMSIG_HUD_Z_CHANGED "hud_z_changed"
 /// Sent from /datum/hud/proc/eye_z_changed() : (old_offset, new_offset)
 #define COMSIG_HUD_OFFSET_CHANGED "hud_offset_changed"
 /// Sent from /atom/movable/screen/lobby/button/collapse/proc/collapse_buttons() : ()

code/__DEFINES/dcs/signals/signals_object.dm

@@ -130,7 +130,7 @@
 #define COMSIG_ITEM_DROPPED "item_drop"
 ///from base of mob/dropItemToGround(): (mob/user)
 #define COMSIG_ITEM_PREDROPPED "item_predrop"
-///from base of /mob/living/stripPanelUnequip(): (obj/item/what, mob/who, where)
+///from base of /start_unequip_mob(): (obj/item/what, mob/who, where)
 #define COMSIG_ITEM_PRESTRIP "item_prestrip"
 
 ///from base of obj/item/pickup(): (/mob/taker)
@@ -144,25 +144,25 @@
 ///from base of mob/living/carbon/attacked_by(): (mob/living/carbon/target, mob/living/user, hit_zone)
 #define COMSIG_ITEM_ATTACK_ZONE "item_attack_zone"
 
-/// from /datum/component/cleave_attack/perform_sweep(): (atom/target, obj/item/item, mob/living/user, params) 
+/// from /datum/component/cleave_attack/perform_sweep(): (atom/target, obj/item/item, mob/living/user, params)
 #define COMSIG_ATOM_CLEAVE_ATTACK "atom_cleave_attack"
 	// allows cleave attack to hit things it normally wouldn't
 	#define ATOM_ALLOW_CLEAVE_ATTACK (1<<0)
 
 /// Called before an item is embedded (mob/living/carbon/target = carbon that it is getting embedded into)
-#define COMSIG_ITEM_EMBEDDED "mob_carbon_embedded" 
+#define COMSIG_ITEM_EMBEDDED "mob_carbon_embedded"
 	// Prevents the embed
 	#define COMSIG_ITEM_BLOCK_EMBED (1 << 0)
 
 /// Called before an item is removed from being embedded (mob/living/carbon/embedded = carbon that is currently embedded)
-#define COMSIG_ITEM_EMBED_REMOVAL "mob_carbon_embed_removal" 
+#define COMSIG_ITEM_EMBED_REMOVAL "mob_carbon_embed_removal"
 	// Prevents the removal of the embed
 	#define COMSIG_ITEM_BLOCK_EMBED_REMOVAL (1 << 0)
 	// Qdels the object when it is removed instead of droping it
 	#define COMSIG_ITEM_QDEL_EMBED_REMOVAL (1 << 1)
 
 /// Called every life tick for the embedded mob when the item is embedded (mob/living/carbon/embedded = carbon that is currently embedded)
-#define COMSIG_ITEM_EMBED_TICK "mob_carbon_embed_tick" 
+#define COMSIG_ITEM_EMBED_TICK "mob_carbon_embed_tick"
 	// Prevents the rest of the tick logic for the item from proccessing
 	#define COMSIG_ITEM_BLOCK_EMBED_TICK (1 << 0)
 

code/__DEFINES/dcs/signals/signals_plane_master_group.dm

@@ -0,0 +1,2 @@
+/// from /datum/plane_master_group/proc/set_hud(): (datum/hud/new_hud)
+#define COMSIG_GROUP_HUD_CHANGED "group_hud_changed"

code/__DEFINES/layers.dm

@@ -13,29 +13,31 @@
 #define PLANE_SPACE -21
 #define PLANE_SPACE_PARALLAX -20
 
-#define GRAVITY_PULSE_PLANE -12
+#define GRAVITY_PULSE_PLANE -19
 #define GRAVITY_PULSE_RENDER_TARGET "*GRAVPULSE_RENDER_TARGET"
 
-#define RENDER_PLANE_TRANSPARENT -11 //Transparent plane that shows openspace underneath the floor
+#define RENDER_PLANE_TRANSPARENT -18 //Transparent plane that shows openspace underneath the floor
+#define TRANSPARENT_FLOOR_PLANE -13
 
-#define TRANSPARENT_FLOOR_PLANE -10
+#define FLOOR_PLANE -12
+#define FLOOR_PLANE_RENDER_TARGET "*FLOOR_PLANE"
+#define WALL_PLANE -11
+#define GAME_PLANE -10
+#define ABOVE_GAME_PLANE -9
 
-#define FLOOR_PLANE -6
-
-#define WALL_PLANE -5
-#define GAME_PLANE -4
-#define ABOVE_GAME_PLANE -3
 ///Slightly above the game plane but does not catch mouse clicks. Useful for certain visuals that should be clicked through, like seethrough trees
 #define SEETHROUGH_PLANE -2
 
 #define RENDER_PLANE_GAME_WORLD -1
 
 #define DEFAULT_PLANE 0 //Marks out the default plane, even if we don't use it
 
+#define WEATHER_PLANE 1
 #define AREA_PLANE 2
-#define MASSIVE_OBJ_PLANE 3
-#define GHOST_PLANE 4
-#define POINT_PLANE 5
+
+#define MASSIVE_OBJ_PLANE 6
+#define GHOST_PLANE 7
+#define POINT_PLANE 8
 
 //---------- LIGHTING -------------
 ///Normal 1 per turf dynamic lighting underlays
@@ -64,6 +66,7 @@
 
 ///Things that should render ignoring lighting
 #define ABOVE_LIGHTING_PLANE 17
+#define WEATHER_GLOW_PLANE 18
 
 ///---------------- MISC -----------------------
 

code/__DEFINES/say.dm

@@ -128,3 +128,6 @@
 
 
 #define MAX_FLAVOR_LEN 4096		//double the maximum message length.
+
+/// Default volume of speech sound effects (this is actually multiplied by 5 when used)
+#define DEFAULT_SPEECH_VOLUME 60

code/__DEFINES/weather.dm

@@ -0,0 +1,7 @@
+//A reference to this list is passed into area sound managers, and it's modified in a manner that preserves that reference in ash_storm.dm
+GLOBAL_LIST_EMPTY(ash_storm_sounds)
+
+#define STARTUP_STAGE 1
+#define MAIN_STAGE 2
+#define WIND_DOWN_STAGE 3
+#define END_STAGE 4

code/__DEFINES/{yogs_defines}/mobs.dm

@@ -16,27 +16,3 @@
 #define SPECIES_VOX "vox"
 
 #define BUTT_SPRITE_VOX "vox"
-
-
-GLOBAL_REAL_VAR(list/voice_type2sound = list(
-	"1" = list(
-		"1" = sound('goon/sound/speak_1.ogg'),
-		"!" = sound('goon/sound/speak_1_exclaim.ogg'),
-		"?" = sound('goon/sound/speak_1_ask.ogg')
-	),
-	"2" = list(
-		"2" = sound('goon/sound/speak_2.ogg'),
-		"!" = sound('goon/sound/speak_2_exclaim.ogg'),
-		"?" = sound('goon/sound/speak_2_ask.ogg')
-	),
-	"3" = list(
-		"3" = sound('goon/sound/speak_3.ogg'),
-		"!" = sound('goon/sound/speak_3_exclaim.ogg'),
-		"?" = sound('goon/sound/speak_3_ask.ogg')
-	),
-	"4" = list(
-		"4" = sound('goon/sound/speak_4.ogg'),
-		"!" = sound('goon/sound/speak_4_exclaim.ogg'),
-		"?" = sound('goon/sound/speak_4_ask.ogg')
-	),
-))

code/_onclick/hud/alert.dm

@@ -308,11 +308,14 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 	add_overlay(receiving)
 	src.receiving = receiving
 	src.giver = giver
+	// if any of these move the alert should go away
+	RegisterSignal(receiving, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom/movable/screen/alert/give, removeAlert))
+	RegisterSignal(giver, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom/movable/screen/alert/give, removeAlert))
 	RegisterSignal(taker, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom/movable/screen/alert/give, removeAlert))
 
 /atom/movable/screen/alert/give/proc/removeAlert()
 	to_chat(mob_viewer, span_warning("You moved out of range of [giver]!"))
-	mob_viewer.clear_alert("[giver]")
+	mob_viewer.clear_alert("[REF(giver)]-[REF(receiving)]")
 
 /atom/movable/screen/alert/give/Click(location, control, params)
 	. = ..()

code/_onclick/hud/hud.dm

@@ -195,6 +195,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	SIGNAL_HANDLER
 	update_parallax_pref() // If your eye changes z level, so should your parallax prefs
 	var/turf/eye_turf = get_turf(eye)
+	SEND_SIGNAL(src, COMSIG_HUD_Z_CHANGED, eye_turf.z)
 	var/new_offset = GET_TURF_PLANE_OFFSET(eye_turf)
 	if(current_plane_offset == new_offset)
 		return