From 12eec08aaebf3e62c8ddc327cc08bd94cc4d9d2e Mon Sep 17 00:00:00 2001 From: Builder13 Date: Mon, 30 Dec 2024 00:31:24 +0300 Subject: [PATCH 1/2] mod-inspect3 --- .../_item_identification.dme | 1 + .../code/item_identification.dm | 22 ++++++++++-- mods/item_identification/code/job.dm | 36 +++++++++++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 mods/item_identification/code/job.dm diff --git a/mods/item_identification/_item_identification.dme b/mods/item_identification/_item_identification.dme index 9115d32646792..6b81990627e1a 100644 --- a/mods/item_identification/_item_identification.dme +++ b/mods/item_identification/_item_identification.dme @@ -5,6 +5,7 @@ #include "code/item_identification.dm" +#include "code/job.dm" #include "code/items/traitor.dm" #endif diff --git a/mods/item_identification/code/item_identification.dm b/mods/item_identification/code/item_identification.dm index 85559ca61eced..8ca30d455aed9 100644 --- a/mods/item_identification/code/item_identification.dm +++ b/mods/item_identification/code/item_identification.dm @@ -4,7 +4,25 @@ /obj/item/proc/update_mod_identification() return -/mob/verb/mod_skill_examine(obj/item/I as obj in view(1)) +/mob/verb/mod_skill_examine_init() + set name = "Inspect" + set category = "IC" + + to_chat(usr, SPAN_CLASS("interface", "Вы теперь можете производить инспекцию предметов через ПКМ и через верб.")) + verbs -= /mob/verb/mod_skill_examine_init + verbs += /verb/mod_skill_examine + verbs += /verb/mod_skill_examine_hide + +/verb/mod_skill_examine_hide() + set name = "Hide Inspect" + set category = "IC" + + to_chat(usr, SPAN_CLASS("interface", "Верб Inspect вновь спрятан.")) + usr.verbs += /mob/verb/mod_skill_examine_init + usr.verbs -= /verb/mod_skill_examine + usr.verbs -= /verb/mod_skill_examine_hide + +/verb/mod_skill_examine(obj/item/I as obj in view(1)) set name = "Inspect" set category = "IC" @@ -115,7 +133,7 @@ if(LAZYLEN(additional_users)) var/list/additional_names = list() - starting_message += " вместе с:" + starting_message += " вместе с: " for(var/auser in additional_users) var/auser_name = additional_users[auser]["name"] additional_names.Add(auser_name) diff --git a/mods/item_identification/code/job.dm b/mods/item_identification/code/job.dm new file mode 100644 index 0000000000000..a756638936558 --- /dev/null +++ b/mods/item_identification/code/job.dm @@ -0,0 +1,36 @@ +/datum/job/hos/post_equip_rank(mob/person, alt_title) + ..() + person.verbs -= /mob/verb/mod_skill_examine_init + person.verbs += /verb/mod_skill_examine + person.verbs += /verb/mod_skill_examine_hide + +/datum/job/warden/post_equip_rank(mob/person, alt_title) + ..() + person.verbs -= /mob/verb/mod_skill_examine_init + person.verbs += /verb/mod_skill_examine + person.verbs += /verb/mod_skill_examine_hide + +/datum/job/detective/post_equip_rank(mob/person, alt_title) + ..() + person.verbs -= /mob/verb/mod_skill_examine_init + person.verbs += /verb/mod_skill_examine + person.verbs += /verb/mod_skill_examine_hide + +/datum/job/officer/post_equip_rank(mob/person, alt_title) + ..() + person.verbs -= /mob/verb/mod_skill_examine_init + person.verbs += /verb/mod_skill_examine + person.verbs += /verb/mod_skill_examine_hide + +/datum/job/security_assistant/post_equip_rank(mob/person, alt_title) + ..() + person.verbs -= /mob/verb/mod_skill_examine_init + person.verbs += /verb/mod_skill_examine + person.verbs += /verb/mod_skill_examine_hide + +/datum/job/post_equip_rank(mob/person, alt_title) + ..() + if(person.get_skill_value(SKILL_FORENSICS) > SKILL_UNSKILLED) + person.verbs -= /mob/verb/mod_skill_examine_init + person.verbs += /verb/mod_skill_examine + person.verbs += /verb/mod_skill_examine_hide \ No newline at end of file From 1f39b0fe030688e42d1e8138a6c2dd164acc85b6 Mon Sep 17 00:00:00 2001 From: UEDCommander <52104104+UEDCommander@users.noreply.github.com> Date: Sat, 4 Jan 2025 16:44:39 +0300 Subject: [PATCH 2/2] Update job.dm --- mods/item_identification/code/job.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mods/item_identification/code/job.dm b/mods/item_identification/code/job.dm index a756638936558..d764e9bf04e9f 100644 --- a/mods/item_identification/code/job.dm +++ b/mods/item_identification/code/job.dm @@ -22,15 +22,9 @@ person.verbs += /verb/mod_skill_examine person.verbs += /verb/mod_skill_examine_hide -/datum/job/security_assistant/post_equip_rank(mob/person, alt_title) - ..() - person.verbs -= /mob/verb/mod_skill_examine_init - person.verbs += /verb/mod_skill_examine - person.verbs += /verb/mod_skill_examine_hide - /datum/job/post_equip_rank(mob/person, alt_title) ..() if(person.get_skill_value(SKILL_FORENSICS) > SKILL_UNSKILLED) person.verbs -= /mob/verb/mod_skill_examine_init person.verbs += /verb/mod_skill_examine - person.verbs += /verb/mod_skill_examine_hide \ No newline at end of file + person.verbs += /verb/mod_skill_examine_hide