diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index 1ebfe3d028af..9f0c486aad2c 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -832,10 +832,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 @@ -843,6 +839,8 @@ /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" = ( diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 24e272c4d2b5..76cafb956cdd 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_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" = ( diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index e65b103e6ebe..340eb8ec6739 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_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" = ( diff --git a/code/modules/autowiki/pages/ships.dm b/code/modules/autowiki/pages/ships.dm index 75b4afc1155b..8a444cd33896 100644 --- a/code/modules/autowiki/pages/ships.dm +++ b/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() diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 711af230fd9d..4e7a1d2a1145 100644 --- a/code/modules/client/client_procs.dm +++ b/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, "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)") diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 0c61c587044f..9392425de555 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/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." diff --git a/code/modules/clothing/outfits/factions/inteq.dm b/code/modules/clothing/outfits/factions/inteq.dm index 48702c064447..49512039d4c6 100644 --- a/code/modules/clothing/outfits/factions/inteq.dm +++ b/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 diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 62f46fb38848..d1f56e61b6fd 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/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 diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 5bd84e801382..c3787de67e83 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/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." diff --git a/code/modules/mentor/follow.dm b/code/modules/mentor/follow.dm deleted file mode 100644 index 484ea8a0a045..000000000000 --- a/code/modules/mentor/follow.dm +++ /dev/null @@ -1,70 +0,0 @@ -/datum/mentor_click_interceptor -/datum/mentor_click_interceptor/proc/InterceptClickOn(mob/user, params, atom/target) - return TRUE - -/client/proc/mentor_follow(mob/living/M) - if(!check_mentor()) - return - - if(isnull(M)) - return - - if(!istype(usr, /mob)) - return - - if(!holder) - var/datum/mentors/mentor = GLOB.mentor_datums[usr.client.ckey] - mentor.following = M - else - holder.following = M - - if(check_rights(R_ADMIN, 0)) - var/client/C = usr.client - var/can_ghost = TRUE - if(!isobserver(usr)) - can_ghost = C.admin_ghost() - - if(!can_ghost) - return - var/mob/dead/observer/A = C.mob - A.ManualFollow(M) - return - - usr.reset_perspective(M) - usr.client.click_intercept = new /datum/mentor_click_interceptor - usr.client.mob.notransform = TRUE - src.verbs += /client/proc/mentor_unfollow - - to_chat(GLOB.admins, "MENTOR: [key_name(usr)] is now following [key_name(M)].") - to_chat(usr, "You are now following [M]. Click the \"Stop Following\" button in the Mentor tab to stop.") - log_mentor("[key_name(usr)] began following [key_name(M)].") - -/client/proc/mentor_unfollow() - set category = "Mentor" - set name = "Stop Following" - set desc = "Stop following the followed." - - if(!check_mentor()) - return - - usr.reset_perspective(null) - usr.client.click_intercept = null - usr.client.mob.notransform = FALSE - src.verbs -= /client/proc/mentor_unfollow - - var/following = null - if(!holder) - var/datum/mentors/mentor = GLOB.mentor_datums[usr.client.ckey] - following = mentor.following - else - following = holder.following - - if(!following) - to_chat(usr, "You're not following anyone.") - return - - to_chat(GLOB.admins, "MENTOR: [key_name(usr)] is no longer following [key_name(following)].") - to_chat(usr, "You are no longer following [following].") - log_mentor("[key_name(usr)] stopped following [key_name(following)].") - - following = null diff --git a/code/modules/mentor/mentor_verbs.dm b/code/modules/mentor/mentor_verbs.dm index 6ba3720e1b5f..841706e6e86e 100644 --- a/code/modules/mentor/mentor_verbs.dm +++ b/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) diff --git a/code/modules/mentor/verbs/mentorhelp.dm b/code/modules/mentor/verbs/mentorhelp.dm index a81ec907320c..c2c82e6230bc 100644 --- a/code/modules/mentor/verbs/mentorhelp.dm +++ b/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) - . += " (F)" - return . diff --git a/code/modules/mentor/verbs/mentorpm.dm b/code/modules/mentor/verbs/mentorpm.dm index e860d126db0e..3c4396f034dc 100644 --- a/code/modules/mentor/verbs/mentorpm.dm +++ b/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, "Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]") - to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]") + to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0)]: [msg]") + to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0)]: [msg]") else //recipient is an mentor but sender is not - to_chat(C, "Reply PM from-[key_name_mentor(src, C, 1, 0, show_char)]: [msg]") + to_chat(C, "Reply PM from-[key_name_mentor(src, C, 1, show_char)]: [msg]") to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, 0)]: [msg]") else if(check_mentor()) //sender is an mentor but recipient is not. - to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0, 0)]: [msg]") - to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, 0, show_char)]: [msg]") + to_chat(C, "Mentor PM from-[key_name_mentor(src, C, 1, 0)]: [msg]") + to_chat(src, "Mentor PM to-[key_name_mentor(C, C, 1, show_char)]: [msg]") //we don't use message_Mentors here because the sender/receiver might get it too for(var/client/X in GLOB.mentors) diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml index a2e2ef9987d3..5eae5fe09e86 100644 --- a/html/changelogs/archive/2024-02.yml +++ b/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! diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 78b8033a2e35..4c6dd4f78bcf 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi index 5f7fa454a218..12ebf87128c3 100644 Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index e6dd95288038..0c79696e569a 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi index 43440753b4f7..c739d99d2f38 100644 Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/clothing/under/syndicate.dmi b/icons/mob/clothing/under/syndicate.dmi index b8293f7cb440..cc5e484b89c4 100644 Binary files a/icons/mob/clothing/under/syndicate.dmi and b/icons/mob/clothing/under/syndicate.dmi differ diff --git a/icons/mob/species/misc/digitigrade.dmi b/icons/mob/species/misc/digitigrade.dmi index b937694ec240..57d70696b850 100644 Binary files a/icons/mob/species/misc/digitigrade.dmi and b/icons/mob/species/misc/digitigrade.dmi differ diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index 24cdcaed7839..65a951047a35 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 10e7be38f19f..0b7af59b91e4 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index a96fa819bc3e..ce0924a83761 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi index 758c4836aeb0..aad247e5f7b3 100644 Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ diff --git a/icons/obj/clothing/under/syndicate.dmi b/icons/obj/clothing/under/syndicate.dmi index 3a0b6ff996b7..02d8e138b970 100644 Binary files a/icons/obj/clothing/under/syndicate.dmi and b/icons/obj/clothing/under/syndicate.dmi differ diff --git a/shiptest.dme b/shiptest.dme index a4c78b6e2ddc..e6bda4519aa7 100644 --- a/shiptest.dme +++ b/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"