From bddd4d762ba2ea51fce62d734cb3516b9e1ca2fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=D0=BA?= Date: Sun, 3 Mar 2024 04:47:29 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B1=D0=B0=D0=B3=20=D0=B8=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=BB=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=B3=D0=BE=D0=BB=D0=BE=D1=81=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B7=D0=B0=20=D1=88=D0=B0=D1=82=D1=82=D0=BB=20?= =?UTF-8?q?=D0=B4=D0=BE=20180=20=D1=81=D0=B5=D0=BA=D1=83=D0=BD=D0=B4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/controllers/subsystem/autotransfer.dm | 2 +- code/modules/surgery/bodyparts/_bodyparts.dm | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/autotransfer.dm b/code/controllers/subsystem/autotransfer.dm index aada72c50e5f..97be9b280d60 100644 --- a/code/controllers/subsystem/autotransfer.dm +++ b/code/controllers/subsystem/autotransfer.dm @@ -31,7 +31,7 @@ SUBSYSTEM_DEF(autotransfer) if(world.time < targettime) // BLUEMOON EDIT - было if(REALTIMEOFDAY < targettime) return if(maxvotes == NO_MAXVOTES_CAP || maxvotes > curvotes) - SSvote.initiate_vote("transfer","server", votesystem=APPROVAL_VOTING) + SSvote.initiate_vote("transfer","server", votesystem=APPROVAL_VOTING, vote_time = 1800) targettime = targettime + voteinterval curvotes++ else diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 098783a0dc30..0dd503d8cbc5 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -653,7 +653,10 @@ /obj/item/bodypart/proc/update_limb(dropping_limb, mob/living/carbon/source) body_markings_list = list() var/mob/living/carbon/C - owner.create_weakref() + if(source) + source.create_weakref() + else + owner.create_weakref() if(source) C = source if(!original_owner)