Skip to content

Wumborian fugu runtime fix #2826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Asuraqami wants to merge 1 commit into
base: beta-dev
Choose a base branch
from
+9 −0
Open

Wumborian fugu runtime fix #2826

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
var/wumbo = 0
var/inflate_cooldown = 0
var/datum/action/innate/fugu/expand/E
var/list/base_armor // [CELADON-ADD] Задаем переменную исходного списка резистов
loot = list(/obj/item/fugu_gland{layer = ABOVE_MOB_LAYER})

/mob/living/simple_animal/hostile/asteroid/fugu/asteroid
Expand All @@ -44,6 +45,7 @@

/mob/living/simple_animal/hostile/asteroid/fugu/Initialize()
. = ..()
base_armor = armor // [CELADON-ADD] Сохраняем исходный список резистов
E = new
E.Grant(src)

Expand All @@ -62,6 +64,12 @@
..()
E.Activate()

// [CELADON-ADD] Переопределяем getarmor, чтобы он работал со списком, а не датумом
/mob/living/simple_animal/hostile/asteroid/fugu/getarmor(zone, type)
if(islist(armor))
return armor[type] || 0
return ..()

/datum/action/innate/fugu
icon_icon = 'icons/mob/actions/actions_animal.dmi'
background_icon_state = "bg_fugu"
Expand Down Expand Up @@ -115,6 +123,7 @@
environment_smash = ENVIRONMENT_SMASH_NONE
mob_size = MOB_SIZE_SMALL
speed = 0
armor = base_armor // [CELADON-ADD] Восстановление исходной брони.

/mob/living/simple_animal/hostile/asteroid/fugu/death(gibbed)
Deflate()
Expand Down
Loading