Merge branch 'master' into Thruster

_maps/shuttles/inteq/inteq_colossus.dmm

@@ -832,17 +832,15 @@
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/clothing/head/warden/drill{
-	desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.";
-	name = "master at arms' campaign hat"
-	},
 /obj/item/megaphone/sec,
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
 	},
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/storage/belt/military/assault,
 /obj/item/reagent_containers/spray/pepper,
+/obj/item/clothing/head/warden/inteq,
+/obj/item/clothing/suit/armor/vest/security/warden/inteq,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "iT" = (

_maps/shuttles/inteq/inteq_talos.dmm

@@ -1920,16 +1920,14 @@
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/clothing/head/warden/drill{
-	desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.";
-	name = "master at arms' campaign hat"
-	},
 /obj/item/megaphone/sec,
 /obj/structure/sign/poster/contraband/eoehoma{
 	pixel_y = -32
 	},
 /obj/item/storage/belt/security/webbing/inteq/alt,
 /obj/item/storage/belt/security/webbing/inteq,
+/obj/item/clothing/head/warden/inteq,
+/obj/item/clothing/suit/armor/vest/security/warden/inteq,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "ms" = (

_maps/shuttles/inteq/inteq_vaquero.dmm

@@ -1971,10 +1971,6 @@
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/suit/armor/vest/bulletproof,
-/obj/item/clothing/head/warden/drill{
-	desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.";
-	name = "master at arms' campaign hat"
-	},
 /obj/item/megaphone/sec,
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
@@ -1986,6 +1982,8 @@
 	},
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/machinery/light/small/directional/south,
+/obj/item/clothing/head/warden/inteq,
+/obj/item/clothing/suit/armor/vest/security/warden/inteq,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Eh" = (

code/modules/autowiki/pages/ships.dm

@@ -75,7 +75,7 @@
 
 /datum/autowiki/ship/proc/get_dummy_image(datum/job/to_equip)
 	//Controlled randomisation
-	wiki_dummy.seeded_randomization(to_equip.type, list(/datum/species/ethereal, /datum/species/human, /datum/species/ipc, /datum/species/lizard, /datum/species/moth, /datum/species/spider))
+	wiki_dummy.seeded_randomization("[to_equip.outfit]", list(/datum/species/ethereal, /datum/species/human, /datum/species/ipc, /datum/species/lizard, /datum/species/moth, /datum/species/spider))
 	//Delete all the old stuff they had
 	wiki_dummy.wipe_state()
 

code/modules/client/client_procs.dm

@@ -93,13 +93,6 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 			cmd_mentor_pm(href_list["mentor_msg"],null)
 		return
 
-	// Mentor Follow
-	if(href_list["mentor_follow"])
-		var/mob/living/M = locate(href_list["mentor_follow"])
-		if(istype(M))
-			mentor_follow(M)
-		return
-
 	//byond bug ID:2256651
 	if (asset_cache_job && (asset_cache_job in completed_asset_jobs))
 		to_chat(src, "<span class='danger'>An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)</span>")

code/modules/clothing/head/jobs.dm

@@ -216,6 +216,11 @@
 
 	dog_fashion = /datum/dog_fashion/head/cowboy
 
+/obj/item/clothing/head/warden/inteq
+	name = "master at arms' campaign hat"
+	desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
+	icon_state = "maahat"
+
 /obj/item/clothing/head/warden/drill
 	name = "warden's campaign hat"
 	desc = "A special armored campaign hat with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."

code/modules/clothing/outfits/factions/inteq.dm

@@ -188,12 +188,12 @@
 	job_icon = "warden"
 
 	ears = /obj/item/radio/headset/inteq/alt
+	head = /obj/item/clothing/head/warden/inteq
 	uniform = /obj/item/clothing/under/syndicate/inteq
-	head = /obj/item/clothing/head/beret/sec/hos/inteq
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
 	mask = /obj/item/clothing/mask/gas/sechailer/inteq
 	belt = /obj/item/storage/belt/military/assault
-	suit = /obj/item/clothing/suit/armor/vest/alt
+	suit = /obj/item/clothing/suit/armor/vest/security/warden/inteq
 	dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/combat

code/modules/clothing/outfits/factions/syndicate.dm

@@ -126,7 +126,7 @@
 	name = "Syndicate - Graduate (SUNS)"
 
 	uniform = /obj/item/clothing/under/syndicate/suns/uniform3
-	alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform3
+	alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform3/alt
 
 //atmos techs
 

code/modules/clothing/suits/armor.dm

@@ -112,6 +112,11 @@
 	resistance_flags = FLAMMABLE
 	dog_fashion = null
 
+/obj/item/clothing/suit/armor/vest/security/warden/inteq
+	name = "master at arms' armored coat"
+	desc = "A brown armored coat with a bulletproof vest over it, usually worn by the Master At Arms of the IRMG."
+	icon_state = "maacoat"
+
 /obj/item/clothing/suit/armor/vest/security/warden/alt
 	name = "warden's armored jacket"
 	desc = "A white jacket with silver rank pips and body armor strapped on top."

code/modules/mentor/mentor_verbs.dm

@@ -3,7 +3,6 @@ GLOBAL_LIST_INIT(mentor_verbs, list(
 	/client/proc/show_mentor_memo,
 	/client/proc/cmd_mentor_say,
 	/client/proc/cmd_mentor_dementor,
-	/client/proc/mentor_unfollow
 	))
 GLOBAL_PROTECT(mentor_verbs)
 

code/modules/mentor/verbs/mentorhelp.dm

@@ -34,7 +34,7 @@
 		else
 			.["present"]++
 
-/proc/key_name_mentor(whom, include_link = null, include_name = 0, include_follow = 0, char_name_only = 0)
+/proc/key_name_mentor(whom, include_link = null, include_name = 0, char_name_only = 0)
 	var/mob/M
 	var/client/C
 	var/key
@@ -91,7 +91,4 @@
 	else
 		. += "*no key*"
 
-	if(include_follow)
-		. += " (<a href='?mentor_follow=[REF(M)]'>F</a>)"
-
 	return .

code/modules/mentor/verbs/mentorpm.dm

@@ -67,17 +67,17 @@
 	var/show_char = CONFIG_GET(flag/mentors_mobname_only)
 	if(check_mentor_other(C))
 		if(check_mentor())	//both are mentors
-			to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span>")
-			to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</span>")
+			to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0)]</b>: [msg]</span>")
+			to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0)]</b>: [msg]</span>")
 
 		else		//recipient is an mentor but sender is not
-			to_chat(C, "<span class='notice'>Reply PM from-<b>[key_name_mentor(src, C, 1, 0, show_char)]</b>: [msg]</span>")
+			to_chat(C, "<span class='notice'>Reply PM from-<b>[key_name_mentor(src, C, 1, show_char)]</b>: [msg]</span>")
 			to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, 0)]</b>: [msg]</span>")
 
 	else
 		if(check_mentor())	//sender is an mentor but recipient is not.
-			to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0, 0)]</b>: [msg]</span>")
-			to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, 0, show_char)]</b>: [msg]</span>")
+			to_chat(C, "<span class='notice'>Mentor PM from-<b>[key_name_mentor(src, C, 1, 0)]</b>: [msg]</span>")
+			to_chat(src, "<span class='green'>Mentor PM to-<b>[key_name_mentor(C, C, 1, show_char)]</b>: [msg]</span>")
 
 	//we don't use message_Mentors here because the sender/receiver might get it too
 	for(var/client/X in GLOB.mentors)

html/changelogs/archive/2024-02.yml

@@ -204,3 +204,9 @@
   thgvr:
   - bugfix: Wigs no longer hide Sarathi horns
   - rscdel: Removes space adaptation.
+2024-02-20:
+  meemofcourse:
+  - rscdel: Removed mentorfollow
+2024-02-21:
+  PositiveEntropy:
+  - imageadd: Inteq has now received a visual overhaul!

shiptest.dme

@@ -2350,7 +2350,6 @@
 #include "code\modules\mapping\space_management\space_level.dm"
 #include "code\modules\mapping\space_management\traits.dm"
 #include "code\modules\mapping\space_management\zlevel_manager.dm"
-#include "code\modules\mentor\follow.dm"
 #include "code\modules\mentor\holder2.dm"
 #include "code\modules\mentor\mentor_ranks.dm"
 #include "code\modules\mentor\mentor_verbs.dm"