Skip to content
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.

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

Fixes of gib animation, gib remains, adds new #6668

Merged
merged 4 commits into from
Jul 25, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
26 changes: 18 additions & 8 deletions code/modules/mob/living/carbon/xenomorph/death.dm
Original file line number Diff line number Diff line change
Expand Up @@ -137,25 +137,31 @@

/mob/living/carbon/xenomorph/gib(datum/cause_data/cause = create_cause_data("gibbing", src))
var/obj/effect/decal/remains/xeno/remains = new(get_turf(src))
remains.icon = icon
var/icon_path = 'icons/mob/xenos/xenomorph_64x64.dmi'
Blundir marked this conversation as resolved.
Show resolved Hide resolved
var/gib_state = "gibbed-a-corpse"
remains.pixel_x = pixel_x //For 2x2.

if(!caste)
CRASH("CASTE ERROR: gib() was called without a caste. (name: [name], disposed: [QDELETED(src)], health: [health])")

switch(caste.caste_type) //This will need to be changed later, when we have proper xeno pathing. Might do it on caste or something.
if(mob_size >= MOB_SIZE_BIG)
icon_path = 'icons/mob/xenos/xenomorph_64x64.dmi'
else
icon_path = 'icons/mob/xenos/xenomorph_48x48.dmi'
switch(caste.caste_type)
if(XENO_CASTE_RUNNER)
icon_path = 'icons/mob/xenos/xenomorph_64x64.dmi'
gib_state = "gibbed-a-corpse-runner"
if(XENO_CASTE_BOILER)
var/mob/living/carbon/xenomorph/boiler/src_boiler = src
visible_message(SPAN_DANGER("[src] begins to bulge grotesquely, and explodes in a cloud of corrosive gas!"))
src_boiler.smoke.set_up(2, 0, get_turf(src), new_cause_data = src_boiler.smoke.cause_data)
src_boiler.smoke.start()
remains.icon_state = "gibbed-a-corpse"
if(XENO_CASTE_RUNNER)
remains.icon_state = "gibbed-a-corpse-runner"
if(XENO_CASTE_LARVA, XENO_CASTE_PREDALIEN_LARVA)
remains.icon_state = "larva_gib_corpse"
else
remains.icon_state = "gibbed-a-corpse"
icon_path = 'icons/mob/xenos/larva.dmi'

remains.icon_state = gib_state
remains.icon = icon_path

check_blood_splash(35, BURN, 65, 2) //Some testing numbers. 35 burn, 65 chance.

Expand All @@ -170,8 +176,12 @@
icon_path = 'icons/mob/xenos/xenomorph_48x48.dmi'
switch(caste.caste_type)
if(XENO_CASTE_RUNNER)
icon_path = 'icons/mob/xenos/xenomorph_64x64.dmi'
to_flick = "gibbed-a-runner"
if(XENO_CASTE_BOILER)
to_flick = "gibbed-a-boiler"
if(XENO_CASTE_LARVA, XENO_CASTE_PREDALIEN_LARVA)
icon_path = 'icons/mob/xenos/larva.dmi'
to_flick = "larva_gib"
new /obj/effect/overlay/temp/gib_animation/xeno(loc, src, to_flick, icon_path)

Expand Down
Binary file modified icons/mob/xenos/larva.dmi
Binary file not shown.
Binary file modified icons/mob/xenos/xenomorph_64x64.dmi
Binary file not shown.
Loading