From 1e0a9ed537e693d3839c6810b2cfe561dbb0dc66 Mon Sep 17 00:00:00 2001 From: PhantornRU Date: Fri, 20 Oct 2023 00:01:29 +1000 Subject: [PATCH] Module Examine --- .../mob/living/silicon/robot/robot_examine.dm | 5 ----- .../silicon_hats/code/silicon_interactions.dm | 20 ++++++++++++++----- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot_examine.dm b/code/modules/mob/living/silicon/robot/robot_examine.dm index d4d02a62e5e7..44937f4cb5dd 100644 --- a/code/modules/mob/living/silicon/robot/robot_examine.dm +++ b/code/modules/mob/living/silicon/robot/robot_examine.dm @@ -47,11 +47,6 @@ msg += "It looks like its system is corrupted beyond repair. There is no hope of recovery.\n" msg += "*---------*" - // SS220 ADDITION START - if(inventory_head) - msg += "\nНосит [bicon(inventory_head)] [inventory_head.name].\n" - // SS220 ADDITION END - if(print_flavor_text()) msg += "\n[print_flavor_text()]\n" diff --git a/modular_ss220/silicon_hats/code/silicon_interactions.dm b/modular_ss220/silicon_hats/code/silicon_interactions.dm index ce6c8819e1e2..de4b748e066b 100644 --- a/modular_ss220/silicon_hats/code/silicon_interactions.dm +++ b/modular_ss220/silicon_hats/code/silicon_interactions.dm @@ -23,17 +23,17 @@ remove_from_head(user) //Если вдруг кто-то захочет сразу спавнить боргов с шапками -/mob/living/silicon/New() - ..() +/mob/living/silicon/Initialize(mapload) + . = ..() regenerate_icons() //Для уже готовых спавнов боевых боргов -/mob/living/silicon/robot/New() - ..() +/mob/living/silicon/robot/Initialize(mapload) + . = ..() robot_module_hat_offset(icon_state) /mob/living/silicon/robot/initialize_module(selected_module, selected_sprite, list/module_sprites) - ..() + . = ..() robot_module_hat_offset(icon_state) /datum/emote/flip/run_emote(mob/user, params, type_override, intentional) @@ -89,3 +89,13 @@ var/datum/browser/popup = new(user, "mob\ref[src]", "[src]", 440, 500) popup.set_content(dat) popup.open() + +/mob/living/silicon/robot/examine(mob/user) + . = ..() + if(inventory_head) + . += "\nНосит [bicon(inventory_head)] [inventory_head.name].\n" + +/mob/living/silicon/ai/examine(mob/user) + . = ..() + if(inventory_head) + . += "\nНа корпусе расположился [bicon(inventory_head)] [inventory_head.name].\n"