Skip to content

Commit

Permalink
Slightly better gib (#16493)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lumipharon committed Sep 1, 2024
1 parent 588c321 commit 95da196
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
15 changes: 7 additions & 8 deletions code/game/objects/effects/overlays.dm
Original file line number Diff line number Diff line change
Expand Up @@ -331,36 +331,35 @@


//gib animation

/obj/effect/overlay/temp/gib_animation
icon = 'icons/mob/mob.dmi'
effect_duration = 14

/obj/effect/overlay/temp/gib_animation/Initialize(mapload, effect_duration, mob/source_mob, gib_icon)
. = ..()
if(source_mob)
pixel_x = source_mob.pixel_x
pixel_y = source_mob.pixel_y
icon_state = gib_icon
pixel_x += source_mob.pixel_x
flick(gib_icon, src)

/obj/effect/overlay/temp/gib_animation/ex_act(severity)
return

/obj/effect/overlay/temp/gib_animation/human
icon = 'icons/mob/human_gib.dmi'
pixel_x = -16
pixel_y = -16

/obj/effect/overlay/temp/gib_animation/animal
icon = 'icons/mob/animal.dmi'
effect_duration = 12


/obj/effect/overlay/temp/gib_animation/xeno
icon = 'icons/Xeno/64x64_Xeno_overlays.dmi'
effect_duration = 10

/obj/effect/overlay/temp/gib_animation/xeno/Initialize(mapload, effect_duration, mob/source_mob, gib_icon, new_icon)
. = ..()
icon = new_icon


return ..()

//dust animation

Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/_species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

//----Related to dying in some way
///species-specific gibbing animation
var/gibbed_anim = "gibbed-h"
var/gibbed_anim
///species-specific dusting animation
var/dusted_anim = "dust-h"
///used to determine what item is left behind in /spawn_dust_remains()
Expand Down
3 changes: 2 additions & 1 deletion code/modules/mob/living/carbon/human/death.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
return ..()

/mob/living/carbon/human/gib_animation()
new /obj/effect/overlay/temp/gib_animation(loc, 0, src, species ? species.gibbed_anim : "gibbed-h")
var/datum/ethnicity/ethnic_datum = GLOB.ethnicities_list[ethnicity]
new /obj/effect/overlay/temp/gib_animation/human(loc, 0, src, species?.gibbed_anim ? species.gibbed_anim : ethnic_datum ? ethnic_datum.icon_name : "default")

/mob/living/carbon/human/spawn_gibs()
if(species)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
joinable_roundstart = FALSE
death_message = "lets out a faint chimper as it collapses and stops moving..."
dusted_anim = "dust-m"
gibbed_anim = "gibbed-m"
gibbed_anim = "monkey"

/datum/species/monkey/handle_unique_behavior(mob/living/carbon/human/H)
if(!H.client && H.stat == CONSCIOUS)
Expand Down
Binary file added icons/mob/human_gib.dmi
Binary file not shown.
Binary file modified icons/mob/mob.dmi
Binary file not shown.

0 comments on commit 95da196

Please sign in to comment.