From 97014d89f90d0a80663bb8344354d0f5edeedbc3 Mon Sep 17 00:00:00 2001 From: Interception&? <137328283+intercepti0n@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:20:36 +0300 Subject: [PATCH] fix(dreamchecker): add arguments to gib proc overrides --- code/modules/holodeck/HolodeckObjects.dm | 2 +- code/modules/mob/death.dm | 2 +- code/modules/mob/living/carbon/brain/death.dm | 4 ++-- code/modules/mob/living/carbon/human/death.dm | 4 ++-- code/modules/mob/living/silicon/death.dm | 4 ++-- code/modules/mob/living/simple_animal/simple_animal.dm | 4 ++-- code/modules/mob/observer/observer.dm | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 9b891224674..5f3ce1fd955 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -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() diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm index c4cc64f57c8..6b24c171f67 100644 --- a/code/modules/mob/death.dm +++ b/code/modules/mob/death.dm @@ -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) diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm index 41a182bbd93..b941a8bab9e 100644 --- a/code/modules/mob/living/carbon/brain/death.dm +++ b/code/modules/mob/living/carbon/brain/death.dm @@ -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) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index fac353f0f10..c4e81b3a31b 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/human/gib() +/mob/living/carbon/human/gib(anim, do_gibs) if(status_flags & GODMODE) return @@ -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() diff --git a/code/modules/mob/living/silicon/death.dm b/code/modules/mob/living/silicon/death.dm index 4d8a54c4366..faf7146b073 100644 --- a/code/modules/mob/living/silicon/death.dm +++ b/code/modules/mob/living/silicon/death.dm @@ -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() diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 54780366a28..1abf7e23c59 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -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) diff --git a/code/modules/mob/observer/observer.dm b/code/modules/mob/observer/observer.dm index faf58caf44a..dbfa9d8bdd6 100644 --- a/code/modules/mob/observer/observer.dm +++ b/code/modules/mob/observer/observer.dm @@ -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.