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.

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

fix(kreeperhdd): add arguments to gib proc overrides #10719

Merged
merged 1 commit into from
Oct 17, 2023
Merged

fix(kreeperhdd): add arguments to gib proc overrides #10719

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion code/modules/holodeck/HolodeckObjects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@
environment_smash = initial(environment_smash)
destroy_surroundings = initial(destroy_surroundings)

/mob/living/simple_animal/hostile/carp/holodeck/gib()
/mob/living/simple_animal/hostile/carp/holodeck/gib(anim, do_gibs)
death()

/mob/living/simple_animal/hostile/carp/holodeck/death()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/death.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//This is the proc for gibbing a mob. Cannot gib ghosts.
//added different sort of gibs and animations. N
/mob/proc/gib(anim = "gibbed-m", do_gibs)
/mob/proc/gib(anim = "gibbed-m", do_gibs = FALSE)
if(status_flags & GODMODE)
return
death(1)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/brain/death.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
else
return ..(gibbed, "no message")

/mob/living/carbon/brain/gib()
/mob/living/carbon/brain/gib(anim, do_gibs)
if(istype(container, /obj/item/organ/internal/cerebrum/mmi))
qdel(container)//Gets rid of the MMI if there is one
if(istype(loc, /obj/item/organ/internal/cerebrum/brain))
qdel(loc)//Gets rid of the brain item
return ..(null, TRUE)
return ..(null, FALSE)
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/death.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/mob/living/carbon/human/gib()
/mob/living/carbon/human/gib(anim, do_gibs)
if(status_flags & GODMODE)
return

Expand All @@ -22,7 +22,7 @@
drop(I, force = TRUE)
I.throw_at(get_edge_target_turf(src, pick(GLOB.alldirs)), rand(1, 3), 1)

..(species.gibbed_anim)
..(species.gibbed_anim, FALSE)
gibs(loc, dna, null, species.get_flesh_colour(src), species.get_blood_colour(src))

/mob/living/carbon/human/dust()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/silicon/death.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/mob/living/silicon/gib()
..("gibbed-r")
/mob/living/silicon/gib(anim, do_gibs)
..("gibbed-r", FALSE)
gibs(loc, null, /obj/effect/gibspawner/robot)

/mob/living/silicon/dust()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/simple_animal/simple_animal.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@
if(purge)
purge -= 1

/mob/living/simple_animal/gib()
..(icon_gib,1)
/mob/living/simple_animal/gib(anim, do_gibs = TRUE)
..(icon_gib, do_gibs)

/mob/living/simple_animal/bullet_act(obj/item/projectile/Proj)
if(!Proj || Proj.nodamage)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/observer/observer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ var/const/GHOST_IMAGE_ALL = ~GHOST_IMAGE_NONE
/mob/observer/dust() //observers can't be vaporised.
return

/mob/observer/gib() //observers can't be gibbed.
/mob/observer/gib(anim, do_gibs) //observers can't be gibbed.
return

/mob/observer/is_blind() //Not blind either.
Expand Down
Loading