From 19b94baaa619002cf9a56a1550404f60927baaf3 Mon Sep 17 00:00:00 2001 From: Lexanx <61974560+Lexanx@users.noreply.github.com> Date: Sat, 23 Mar 2024 13:45:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=85=D0=BE=D0=B6=D0=B5=20=D1=87?= =?UTF-8?q?=D1=82=D0=BE=20=D0=B2=D1=81=D1=91=20=D0=B3=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/organs/internal/species/ipc.dm | 4 ++++ mods/ipc_mods/code/ipc.dm | 15 ++++++++------- mods/ipc_mods/code/machine.dm | 5 ----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/modules/organs/internal/species/ipc.dm b/code/modules/organs/internal/species/ipc.dm index f4790d3412f40..8f34a202df99c 100644 --- a/code/modules/organs/internal/species/ipc.dm +++ b/code/modules/organs/internal/species/ipc.dm @@ -37,7 +37,11 @@ if(!brainmob && H) init(H) robotize() +// [SIERRA-REMOVE] - IPC_MODS +/* unshackle() +*/ +// [/SIERRA-REMOVE] update_icon() if (!is_processing) START_PROCESSING(SSobj, src) diff --git a/mods/ipc_mods/code/ipc.dm b/mods/ipc_mods/code/ipc.dm index 565b6f5d931d8..7223828a0beeb 100644 --- a/mods/ipc_mods/code/ipc.dm +++ b/mods/ipc_mods/code/ipc.dm @@ -4,7 +4,8 @@ /obj/item/organ/internal/posibrain/ipc - name = "IPC positronic brain" + name = "Positronic brain" + desc = "A cube of shining metal, four inches to a side and covered in shallow grooves." /obj/item/organ/internal/posibrain/ipc/attack_self(mob/user) return @@ -12,19 +13,19 @@ return /obj/item/organ/internal/posibrain/ipc/first - name = "positronic brain of the first generation" + desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. It's a first generation positronic brain." icon = 'mods/ipc_mods/icons/ipc_icons.dmi' icon_state = "posibrain1" status = ORGAN_ROBOTIC /obj/item/organ/internal/posibrain/ipc/second - name = "positronic brain of the second generation" + desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. It's a second generation positronic brain." icon = 'mods/ipc_mods/icons/ipc_icons.dmi' icon_state = "posibrain2" status = ORGAN_ROBOTIC /obj/item/organ/internal/posibrain/ipc/third - name = "positronic brain of the third generation" + desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. It's a third generation positronic brain." icon = 'mods/ipc_mods/icons/ipc_icons.dmi' icon_state = "posibrain3" shackles_module = /obj/item/organ/internal/shackles @@ -41,7 +42,7 @@ icon_state = "posibrain1" ClearOverlays() - if(shackle) + if(shackle || shackles_module) AddOverlays(image('mods/ipc_mods/icons/ipc_icons.dmi', "posibrain-shackles")) /obj/item/organ/internal/posibrain/ipc/second/on_update_icon() @@ -51,7 +52,7 @@ icon_state = "posibrain2" ClearOverlays() - if(shackle) + if(shackle || shackles_module) AddOverlays(image('mods/ipc_mods/icons/ipc_icons.dmi', "posibrain-shackles")) /obj/item/organ/internal/posibrain/ipc/third/on_update_icon() @@ -61,7 +62,7 @@ icon_state = "posibrain3" ClearOverlays() - if(shackle) + if(shackle || shackles_module) AddOverlays(image('mods/ipc_mods/icons/ipc_icons.dmi', "posibrain-shackles")) diff --git a/mods/ipc_mods/code/machine.dm b/mods/ipc_mods/code/machine.dm index c9acd50e98b8e..dc178b5352676 100644 --- a/mods/ipc_mods/code/machine.dm +++ b/mods/ipc_mods/code/machine.dm @@ -146,8 +146,3 @@ .=..() if(istype(usr,/mob/living/silicon/sil_brainmob)) return - - -/mob/remove_from_mob(obj/O, atom/target) //Костыль для избежания рантайма, потом придумаю как пофиксить - if(O.type == /obj/item/organ/internal/shackles/) - return