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

Author: cowbot92

code/datums/elements/strippable.dm

@@ -502,19 +502,8 @@
 /datum/strip_menu/ui_host(mob/user)
 	return owner
 
-/datum/strip_menu/ui_status(mob/user, datum/ui_state/state)
-	. = ..()
-
-	if (isliving(user))
-		var/mob/living/living_user = user
-
-		if (
-			. == UI_UPDATE \
-			&& user.stat == CONSCIOUS \
-			&& living_user.body_position == LYING_DOWN \
-			&& user.Adjacent(owner)
-		)
-			return UI_INTERACTIVE
+/datum/strip_menu/ui_state(mob/user)
+	return GLOB.strip_state
 
 /// Creates an assoc list of keys to /datum/strippable_item
 /proc/create_strippable_list(types)

code/modules/admin/holder2.dm

@@ -122,6 +122,8 @@ GLOBAL_PROTECT(href_token)
 
 		if (deadmined)
 			activate()
+		if(C.mentor_datum)
+			C.mentor_position = C.mentor_datum.position
 		owner = C
 		ip_cache = C.address
 		cid_cache = C.computer_id

code/modules/tgui/states/strip.dm

@@ -0,0 +1,13 @@
+GLOBAL_DATUM_INIT(strip_state, /datum/ui_state/strip_state, new)
+
+/// Carbons and cyborgs can strip mobs, other living can view but not strip
+/datum/ui_state/strip_state/can_use_topic(src_object, mob/user)
+	if(iscarbon(user) || iscyborg(user))
+		if(!user.Adjacent(src_object))
+			return UI_DISABLED
+		return UI_INTERACTIVE
+	if(isliving(user))
+		if(!user.Adjacent(src_object))
+			return UI_DISABLED
+		return UI_UPDATE
+	return UI_CLOSE

html/changelog.html

@@ -57,6 +57,15 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">31 December 2024</h2>
+			<h3 class="author">Oblisk234 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Mentorwho will no longer remind you that mentorhelps are also sent to discord multiplied by the amount of mentors that are on the server.</li>
+				<li class="bugfix">You can now see your messages to mentors on discord again.</li>
+				<li class="bugfix">Mentor-maintainers/issue hunters' OOC tag will no longer evaporate into [] after readminning, deadminning, and rementoring.</li>
+				<li class="bugfix">Discord mentor messages are now recorded in mhelp database and mentor tickets.</li>
+			</ul>
+
 			<h2 class="date">30 December 2024</h2>
 			<h3 class="author">SapphicOverload, UselessTheremin updated:</h3>
 			<ul class="changes bgimages16">
@@ -728,12 +737,6 @@ <h3 class="author">tattax updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">fixed lizard prison jumpsuit sprite + offset</li>
 			</ul>
-
-			<h2 class="date">01 October 2024</h2>
-			<h3 class="author">ynot01 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixed changelog changes not word wrapping, which made the window horizontally cut off</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -45876,3 +45876,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
 2024-12-30:
   SapphicOverload, UselessTheremin:
   - rscadd: Adds a skills system
+2024-12-31:
+  Oblisk234:
+  - bugfix: Mentorwho will no longer remind you that mentorhelps are also sent to
+      discord multiplied by the amount of mentors that are on the server.
+  - bugfix: You can now see your messages to mentors on discord again.
+  - bugfix: Mentor-maintainers/issue hunters' OOC tag will no longer evaporate into
+      [] after readminning, deadminning, and rementoring.
+  - bugfix: Discord mentor messages are now recorded in mhelp database and mentor
+      tickets.

html/changelogs/AutoChangelog-pr-22915.yml

@@ -0,0 +1,4 @@
+author: "ynot01"
+delete-after: true 
+changes: 
+  - bugfix: "Fixed xenos & monkeys being unable to strip"

yogstation.dme

@@ -3960,6 +3960,7 @@
 #include "code\modules\tgui\states\physical.dm"
 #include "code\modules\tgui\states\pilot.dm"
 #include "code\modules\tgui\states\self.dm"
+#include "code\modules\tgui\states\strip.dm"
 #include "code\modules\tgui\states\zlevel.dm"
 #include "code\modules\tgui_input\alert.dm"
 #include "code\modules\tgui_input\checkboxes.dm"

yogstation/code/datums/world_topic.dm

@@ -86,6 +86,16 @@ GLOBAL_VAR_INIT(mentornoot, FALSE)
 		SEND_SOUND(C, sound('sound/misc/nootnoot.ogg'))
 	else
 		SEND_SOUND(C, sound('sound/items/bikehorn.ogg'))
+	var/datum/DBQuery/add_mhelp_query = SSdbcore.NewQuery(
+		"INSERT INTO `[format_table_name("mentor_interactions")]` (round_id, ckey, ckey_mentor, target_ckey, target_mentor, message) VALUES (:round, :send, :smentor, :receive, :rmentor, :msg);",
+		list("round" = GLOB.round_id, "send" = from, "smentor" = TRUE, "receive" = C.ckey, "rmentor" = C.is_mentor(), "msg" = msg)
+	)
+	if(!add_mhelp_query.Execute())
+		message_admins("Failed insert mhelp into mhelp DB. Check the SQL error logs for more details.")
+	qdel(add_mhelp_query)
+	if(C.ckey in SSYogs.mentortickets)
+		var/datum/mentorticket/T = SSYogs.mentortickets[C.ckey]
+		T.log += "<b>[from]:</b> [msg]"
 	to_chat(C, "<font color='purple'>Mentor PM from-<b>[discord_mentor_link(from, from_id)]</b>: [msg]</font>", confidential = TRUE)
 	var/show_char_recip = !C.is_mentor() && CONFIG_GET(flag/mentors_mobname_only)
 	for(var/client/X in GLOB.mentors | GLOB.permissions.admins)

yogstation/code/modules/mentor/mentor_verbs.dm

@@ -64,9 +64,8 @@ GLOBAL_PROTECT(mentor_verbs)
 
 			if(C.is_afk())
 				msg += " (AFK)"
-		else
-			msg += span_info("Mentorhelps are also sent to Discord. If no mentors are available in game mentorhelp anyways and a mentor on Discord may see it and respond.")
 		msg += "\n"
+	msg += span_info("Mentorhelps are also sent to Discord. If no mentors are available in game mentorhelp anyways and a mentor on Discord may see it and respond.")
 
 	to_chat(src, msg, confidential=TRUE)
 

yogstation/code/modules/mentor/mentorpm.dm

@@ -90,7 +90,7 @@
 
 	var/datum/DBQuery/add_mhelp_query = SSdbcore.NewQuery(
 		"INSERT INTO `[format_table_name("mentor_interactions")]` (round_id, ckey, ckey_mentor, target_ckey, target_mentor, message) VALUES (:round, :send, :smentor, :receive, :rmentor, :msg);",
-		list("round" = GLOB.round_id, "send" = ckey, "smentor" = is_mentor(), "receive" = C.ckey, "rmentor" = C.is_mentor(), "msg" = msg)
+		list("round" = GLOB.round_id, "send" = ckey, "smentor" = is_mentor(), "receive" = discord_id ? whom : C.ckey, "rmentor" = discord_id ? TRUE : C.is_mentor(), "msg" = msg)
 	)
 	if(!add_mhelp_query.Execute())
 		message_admins("Failed insert mhelp into mhelp DB. Check the SQL error logs for more details.")