Merge branch 'master' into nabbers

Monkestation · May 7, 2024 · 2d46685 · 2d46685
2 parents 84cd2a5 + f8f3088
commit 2d46685
Show file tree

Hide file tree

Showing 18 changed files with 1 addition and 654 deletions.
diff --git a/code/__DEFINES/~monkestation/span.dm b/code/__DEFINES/~monkestation/span.dm
@@ -6,5 +6,3 @@
 #define span_ratvar(str) ("<span class='ratvar'>" + str + "</span>")
 
 #define REQUEST_MENTORHELP "request_mentorhelp"
-
-#define span_italics(str) ("<span class='italics'>" + str + "</span>")
diff --git a/code/__HELPERS/pronouns.dm b/code/__HELPERS/pronouns.dm
@@ -38,9 +38,6 @@
 /datum/proc/p_theyve(capitalized, temp_gender)
 	. = p_they(capitalized, temp_gender) + "'" + copytext_char(p_have(temp_gender), 3)
 
-/datum/proc/p_Theyve(capitalized, temp_gender)
-	. = p_They(capitalized, temp_gender) + "'" + copytext_char(p_have(temp_gender), 3)
-
 /datum/proc/p_theyre(capitalized, temp_gender)
 	. = p_they(capitalized, temp_gender) + "'" + copytext_char(p_are(temp_gender), 2)
 

diff --git a/code/modules/antagonists/abductor/machinery/experiment.dm b/code/modules/antagonists/abductor/machinery/experiment.dm
@@ -120,7 +120,7 @@
 	LAZYINITLIST(history)
 	var/mob/living/carbon/human/H = occupant
 
-	if(istype(H)) //We shouldn't be processing anything other than humans, and if we do we runtime.
+	if(!istype(H)) //We shouldn't be processing anything other than humans, and if we do we runtime.
 		return
 
 	var/datum/antagonist/abductor/user_abductor = user.mind.has_antag_datum(/datum/antagonist/abductor)

diff --git a/monkestation/code/__DEFINES/_module_defines.dm b/monkestation/code/__DEFINES/_module_defines.dm
diff --git a/monkestation/code/__DEFINES/antag_defines.dm b/monkestation/code/__DEFINES/antag_defines.dm
diff --git a/monkestation/code/__DEFINES/signals.dm b/monkestation/code/__DEFINES/signals.dm
diff --git a/monkestation/code/__HELPERS/text_helpers.dm b/monkestation/code/__HELPERS/text_helpers.dm
diff --git a/monkestation/code/modules/antagonists/_common/antag_datum.dm b/monkestation/code/modules/antagonists/_common/antag_datum.dm
@@ -1,6 +1,4 @@
 /datum/antagonist
-	/// Allows antags to check exploitable info
-	antag_flags = FLAG_CAN_SEE_EXPOITABLE_INFO
 	///The list of keys that are valid to see our antag hud/of huds we can see
 	var/list/hud_keys
 

diff --git a/monkestation/code/modules/client/preferences/_preferences.dm b/monkestation/code/modules/client/preferences/_preferences.dm
diff --git a/monkestation/code/modules/client/preferences/multiline_preferences.dm b/monkestation/code/modules/client/preferences/multiline_preferences.dm
diff --git a/monkestation/code/modules/flavor_text/flavor_examine.dm b/monkestation/code/modules/flavor_text/flavor_examine.dm
diff --git a/monkestation/code/modules/flavor_text/flavor_helpers.dm b/monkestation/code/modules/flavor_text/flavor_helpers.dm
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,5 +6,3 @@
		#define span_ratvar(str) ("<span class='ratvar'>" + str + "</span>")

		#define REQUEST_MENTORHELP "request_mentorhelp"

		#define span_italics(str) ("<span class='italics'>" + str + "</span>")