Merge remote-tracking branch 'cmss13-devs/master' into project/ares/a…

…dmin_console

code/game/machinery/vending/vendor_types/crew/synthetic.dm

@@ -345,18 +345,20 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
 	return ..()
 
 /obj/structure/machinery/cm_vending/own_points/experimental_tools/get_listed_products(mob/user)
-	return list(
-		list("Autocompressor", 15, /obj/item/clothing/suit/auto_cpr, null, VENDOR_ITEM_REGULAR),
-		list("Backpack Firefighting Watertank", 15, /obj/item/reagent_container/glass/watertank/atmos, null, VENDOR_ITEM_REGULAR),
-		list("Breaching Hammer", 15, /obj/item/weapon/twohanded/breacher/synth, null, VENDOR_ITEM_REGULAR),
-		list("Compact Defibrillator", 15, /obj/item/device/defibrillator/compact, null, VENDOR_ITEM_REGULAR),
-		list("Compact Nailgun kit", 15, /obj/effect/essentials_set/cnailgun, null, VENDOR_ITEM_REGULAR),
-		list("Crew Monitor", 15, /obj/item/tool/crew_monitor, null, VENDOR_ITEM_REGULAR),
-		list("Experimental Meson Goggles", 15, /obj/item/clothing/glasses/night/experimental_mesons, null, VENDOR_ITEM_REGULAR),
-		list("Maintenance Jack", 15, /obj/item/maintenance_jack, null, VENDOR_ITEM_REGULAR),
-		list("Portable Dialysis Machine", 15, /obj/item/tool/portadialysis, null, VENDOR_ITEM_REGULAR),
-		list("Telescopic Baton", 15, /obj/item/weapon/telebaton, null, VENDOR_ITEM_REGULAR),
-	)
+	return GLOB.cm_vending_synth_tools
+
+GLOBAL_LIST_INIT(cm_vending_synth_tools, list(
+	list("Autocompressor", 15, /obj/item/clothing/suit/auto_cpr, null, VENDOR_ITEM_REGULAR),
+	list("Backpack Firefighting Watertank", 15, /obj/item/reagent_container/glass/watertank/atmos, null, VENDOR_ITEM_REGULAR),
+	list("Breaching Hammer", 15, /obj/item/weapon/twohanded/breacher/synth, null, VENDOR_ITEM_REGULAR),
+	list("Compact Defibrillator", 15, /obj/item/device/defibrillator/compact, null, VENDOR_ITEM_REGULAR),
+	list("Compact Nailgun kit", 15, /obj/effect/essentials_set/cnailgun, null, VENDOR_ITEM_REGULAR),
+	list("Crew Monitor", 15, /obj/item/tool/crew_monitor, null, VENDOR_ITEM_REGULAR),
+	list("Experimental Meson Goggles", 15, /obj/item/clothing/glasses/night/experimental_mesons, null, VENDOR_ITEM_REGULAR),
+	list("Maintenance Jack", 15, /obj/item/maintenance_jack, null, VENDOR_ITEM_REGULAR),
+	list("Portable Dialysis Machine", 15, /obj/item/tool/portadialysis, null, VENDOR_ITEM_REGULAR),
+	list("Telescopic Baton", 15, /obj/item/weapon/telebaton, null, VENDOR_ITEM_REGULAR),
+))
 
 //------------EXPERIMENTAL TOOL KITS---------------
 /obj/effect/essentials_set/cnailgun

code/game/machinery/vending/vendor_types/food.dm

@@ -38,8 +38,8 @@
 	unslashable = FALSE
 	wrenchable = TRUE
 
-/obj/structure/machinery/cm_vending/sorted/boozeomat/get_listed_products(mob/user)
-	return list(
+/obj/structure/machinery/cm_vending/sorted/boozeomat/populate_product_list(scale)
+	listed_products = list(
 		list("ALCOHOL", -1, null, null),
 		list("Ale", 6, /obj/item/reagent_container/food/drinks/cans/ale, VENDOR_ITEM_REGULAR),
 		list("Beer", 6, /obj/item/reagent_container/food/drinks/cans/beer, VENDOR_ITEM_REGULAR),
@@ -97,8 +97,8 @@
 	unslashable = FALSE
 	wrenchable = TRUE
 
-/obj/structure/machinery/cm_vending/sorted/boozeomat/chess/get_listed_products(mob/user)
-	return list(
+/obj/structure/machinery/cm_vending/sorted/boozeomat/chess/populate_product_list(scale)
+	listed_products = list(
 		list("White Pieces", -1, null, null),
 		list("Pawn", 2, /obj/item/reagent_container/food/drinks/bottle/vodka/chess/w_pawn, VENDOR_ITEM_REGULAR),
 		list("Bishop", 2, /obj/item/reagent_container/food/drinks/bottle/vodka/chess/w_bishop, VENDOR_ITEM_REGULAR),

code/modules/admin/admin_verbs.dm

@@ -67,7 +67,7 @@ GLOBAL_LIST_INIT(admin_verbs_default, list(
 	/datum/admins/proc/subtlemessageall,
 	/datum/admins/proc/alertall,
 	/datum/admins/proc/imaginary_friend,
-	/client/proc/toggle_ares_ping,
+	/client/proc/toggle_admin_pings,
 	/client/proc/cmd_admin_open_ares,
 	/client/proc/cmd_admin_say, /*staff-only ooc chat*/
 	/client/proc/cmd_mod_say, /* alternate way of typing asay, no different than cmd_admin_say  */
@@ -586,15 +586,15 @@ GLOBAL_LIST_INIT(roundstart_mod_verbs, list(
 	message_admins("[key_name(usr)] announced a random fact.")
 	SSticker.mode?.declare_fun_facts()
 
-/client/proc/toggle_ares_ping()
-	set name = "Toggle ARES notification sound"
-	set category = "Preferences.Logs"
+/client/proc/toggle_admin_pings()
+	set name = "Toggle StaffIC log sounds"
+	set category = "Preferences.Sound"
 
 	prefs.toggles_sound ^= SOUND_ARES_MESSAGE
 	if (prefs.toggles_sound & SOUND_ARES_MESSAGE)
-		to_chat(usr, SPAN_BOLDNOTICE("You will now hear a ping for ARES messages."))
+		to_chat(usr, SPAN_BOLDNOTICE("You will now hear an audio cue for ARES and Prayer messages."))
 	else
-		to_chat(usr, SPAN_BOLDNOTICE("You will no longer hear a ping for ARES messages."))
+		to_chat(usr, SPAN_BOLDNOTICE("You will no longer hear an audio cue for ARES and Prayer messages."))
 
 
 #undef MAX_WARNS

code/modules/admin/verbs/pray.dm

@@ -12,23 +12,20 @@
 		if(src.client.handle_spam_prevention(msg,MUTE_PRAY))
 			return
 
-	var/liaison = 0
-	if(job == "Corporate Liaison")
-		liaison = 1
+	var/prefix = SPAN_PURPLE("PRAY: ")
+	var/receipt = "Your prayers have been received by the gods."
+	if(job == JOB_CORPORATE_LIAISON)
+		prefix = SPAN_PURPLE("LIAISON: ")
+		receipt = "Your corporate overlords at Weyland-Yutani have received your message."
 
-	if(liaison)
-		msg = "<b><big>[SPAN_STAFF_IC("<font color=purple>LIAISON:</font>")][key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]</big></b>"
-	else
-		msg = "<b><big>[SPAN_STAFF_IC("<font color=purple>PRAY: </font>")][key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]</big></b>"
+	msg = SPAN_BIGNOTICE("[prefix][key_name(src, 1)] [CC_MARK(src)] [ADMIN_PP(src)] [ADMIN_VV(src)] [ADMIN_SM(src)] [ADMIN_JMP_USER(src)] [ADMIN_SC(src)]: [msg]")
 	log_admin(msg)
-	for(var/client/C in GLOB.admins)
-		if(AHOLD_IS_MOD(C.admin_holder) && C.prefs.toggles_chat & CHAT_PRAYER)
-			to_chat(C, msg)
-			C << 'sound/machines/terminal_alert.ogg'
-	if(liaison)
-		to_chat(usr, "Your corporate overlords at Weyland-Yutani have received your message.")
-	else
-		to_chat(usr, "Your prayers have been received by the gods.")
+	for(var/client/admin in GLOB.admins)
+		if(AHOLD_IS_MOD(admin.admin_holder))
+			to_chat(admin, SPAN_STAFF_IC(msg))
+			if(admin.prefs.toggles_sound & SOUND_ARES_MESSAGE)
+				admin << 'sound/machines/terminal_alert.ogg'
+		to_chat(usr, receipt)
 
 /proc/high_command_announce(text , mob/Sender , iamessage)
 	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)

code/modules/mob/living/carbon/xenomorph/abilities/carrier/carrier_powers.dm

@@ -10,6 +10,10 @@
 
 /datum/action/xeno_action/onclick/set_hugger_reserve/use_ability(atom/Atom)
 	var/mob/living/carbon/xenomorph/carrier/carrier = owner
-	carrier.huggers_reserved = tgui_input_number(usr, "How many facehuggers would you like to keep safe from Observers wanting to join as facehuggers?", "How many to reserve?", 0, carrier.huggers_max, carrier.huggers_reserved)
+	carrier.huggers_reserved = tgui_input_number(usr,
+		"How many facehuggers would you like to keep safe from Observers wanting to join as facehuggers?",
+		"How many to reserve?",
+		carrier.huggers_reserved, carrier.huggers_max, 0
+	)
 	to_chat(carrier, SPAN_XENONOTICE("We reserve [carrier.huggers_reserved] facehuggers for ourself."))
 	return ..()

code/modules/mob/living/carbon/xenomorph/update_icons.dm

@@ -301,7 +301,6 @@
 		return
 
 	var/health_threshold
-	wound_icon_holder.layer = layer + 0.01
 	health_threshold = max(CEILING((health * 4) / (maxHealth), 1), 0) //From 0 to 4, in 25% chunks
 	if(health > HEALTH_THRESHOLD_DEAD)
 		if(health_threshold > 3)
@@ -316,10 +315,9 @@
 		else
 			wound_icon_holder.icon_state = handle_special_wound_states(health_threshold)
 
-
 ///Used to display the xeno wounds/backpacks without rapidly switching overlays
 /atom/movable/vis_obj
-	vis_flags = VIS_INHERIT_ID|VIS_INHERIT_DIR
+	vis_flags = VIS_INHERIT_ID|VIS_INHERIT_DIR|VIS_INHERIT_LAYER|VIS_INHERIT_PLANE
 	appearance_flags = RESET_COLOR
 
 /atom/movable/vis_obj/xeno_wounds

code/span_macros.dm

@@ -106,3 +106,4 @@
 #define SPAN_MAROON(X) "<font color=Maroon>[X]</font>"
 
 #define SPAN_STAFF_IC(X) "<span class='staff_ic'>[X]</span>"
+#define SPAN_BIGNOTICE(X) "<span class='bigannounce'>[X]</span>"

html/changelogs/AutoChangeLog-pr-5185.yml

@@ -0,0 +1,6 @@
+author: "realforest2001"
+delete-after: True
+changes:
+  - code_imp: "Added a new span class that combines bold and big."
+  - code_imp: "Tweaked the way prayer sends notifications to be more efficient."
+  - admin: "Moved the prayer notification sound to a toggle preference, combined with ARES Interface notifications."

html/changelogs/AutoChangeLog-pr-5286.yml

@@ -0,0 +1,4 @@
+author: "SabreML"
+delete-after: True
+changes:
+  - bugfix: "Fixed carriers being unable to reduce their 'reserved facehuggers' number."

html/changelogs/AutoChangeLog-pr-5289.yml

@@ -0,0 +1,4 @@
+author: "Drathek"
+delete-after: True
+changes:
+  - bugfix: "Fix xeno wounds layering over weeds when merged with the weeds"

html/changelogs/AutoChangeLog-pr-5305.yml

@@ -0,0 +1,4 @@
+author: "SabreML"
+delete-after: True
+changes:
+  - bugfix: "Fixed being able to vend infinite alcohol."

tgui/packages/tgui-panel/styles/goon/chat-dark.scss

@@ -434,9 +434,9 @@ em {
   font-weight: bold;
 }
 
-.minorannounce {
+.bigannounce {
   font-weight: bold;
-  font-size: 185%;
+  font-size: 115%;
 }
 
 .greenannounce {

tgui/packages/tgui-panel/styles/goon/chat-light.scss

@@ -470,9 +470,9 @@ h2.alert {
   font-weight: bold;
 }
 
-.minorannounce {
+.bigannounce {
   font-weight: bold;
-  font-size: 185%;
+  font-size: 115%;
 }
 
 .greenannounce {