Skip to content

Commit

Permalink
fix: ЦКшный имплант оповещения о смерти теперь работает (BlueMoon-Lab…
Browse files Browse the repository at this point in the history
…s#902)

* fix: забыл паузу удалить в Build.bat, залетело в ПРе

* fix: святая вода в коробках со святой водой, а не патроны

* fix: попытка починить дискошары №2

* fix: теперь дезалярма ЦК однозначно пофикшена
  • Loading branch information
Darkest08 authored Apr 6, 2024
1 parent 34951f4 commit 71220a2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion code/game/machinery/dance_machine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions code/game/objects/items/implants/implant_deathrattle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,18 @@
if(!group)
to_chat(target, "<i>Вы слышите странный механический голос в голове...</i> \"<span class='robot'>Внимание: Не выявлены другие подключенные импланты.</span>\"")


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

0 comments on commit 71220a2

Please sign in to comment.