Skip to content

Commit

Permalink
Module Examine
Browse files Browse the repository at this point in the history
  • Loading branch information
PhantornRU committed Oct 21, 2023
1 parent b69fc41 commit 1e0a9ed
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
5 changes: 0 additions & 5 deletions code/modules/mob/living/silicon/robot/robot_examine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@
msg += "<span class='warning'>It looks like its system is corrupted beyond repair. There is no hope of recovery.</span>\n"
msg += "*---------*</span>"

// 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"

Expand Down
20 changes: 15 additions & 5 deletions modular_ss220/silicon_hats/code/silicon_interactions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"

0 comments on commit 1e0a9ed

Please sign in to comment.