From 71220a2c599c36c262f757bd9ba985f48190bc31 Mon Sep 17 00:00:00 2001
From: Darkest08 <144275411+Darkest08@users.noreply.github.com>
Date: Sun, 7 Apr 2024 01:33:50 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=A6=D0=9A=D1=88=D0=BD=D1=8B=D0=B9=20?=
=?UTF-8?q?=D0=B8=D0=BC=D0=BF=D0=BB=D0=B0=D0=BD=D1=82=20=D0=BE=D0=BF=D0=BE?=
=?UTF-8?q?=D0=B2=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=20=D1=81?=
=?UTF-8?q?=D0=BC=D0=B5=D1=80=D1=82=D0=B8=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80?=
=?UTF-8?q?=D1=8C=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20(#9?=
=?UTF-8?q?02)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix: забыл паузу удалить в Build.bat, залетело в ПРе
* fix: святая вода в коробках со святой водой, а не патроны
* fix: попытка починить дискошары №2
* fix: теперь дезалярма ЦК однозначно пофикшена
---
code/game/machinery/dance_machine.dm | 2 +-
code/game/objects/items/implants/implant_deathrattle.dm | 9 +++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index 40dc038b2878..ab038d41fc63 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -460,9 +460,9 @@
time--
/obj/machinery/jukebox/disco/proc/dance5(var/mob/living/M)
+ var/matrix/initial_matrix_ = matrix(M.transform)
animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
var/matrix/initial_matrix = matrix(M.transform)
- var/matrix/initial_matrix_ = matrix(M.transform)
for (var/i in 1 to 60)
if (!M)
return
diff --git a/code/game/objects/items/implants/implant_deathrattle.dm b/code/game/objects/items/implants/implant_deathrattle.dm
index a26883e235dd..a346ee3c6d94 100644
--- a/code/game/objects/items/implants/implant_deathrattle.dm
+++ b/code/game/objects/items/implants/implant_deathrattle.dm
@@ -67,21 +67,18 @@
if(!group)
to_chat(target, "Вы слышите странный механический голос в голове... \"Внимание: Не выявлены другие подключенные импланты.\"")
-
/obj/item/implantcase/deathrattle
name = "implant case - 'Deathrattle'"
desc = "A glass case containing a deathrattle implant."
imp_type = /obj/item/implant/deathrattle
-/datum/deathrattle_group/centcom
- name = "Centcom Agent"
+GLOBAL_DATUM_INIT(centcom_deathrattle_group, /datum/deathrattle_group, new)
/obj/item/implant/deathrattle/centcom
name = "centcom deathrattle implant"
- desc = "Hope no one else dies, prepare for when they do."
- group = /datum/deathrattle_group/centcom
+ desc = "Hope no one else dies, prepare for when they do"
/obj/item/implant/deathrattle/centcom/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE)
. = ..()
+ group = GLOB.centcom_deathrattle_group
group.register(src)
- return .