From 0f161784252cd6ee53ffc280002138f81427dbf7 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 28 Feb 2021 02:43:32 -0700 Subject: [PATCH] changes --- code/__HELPERS/do_after.dm | 2 +- code/game/objects/effects/decals/misc.dm | 2 +- code/modules/mob/living/carbon/alien/status_procs.dm | 2 +- code/modules/mob/living/carbon/human/status_procs.dm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/__HELPERS/do_after.dm b/code/__HELPERS/do_after.dm index 550eea65c0..c0c07e3620 100644 --- a/code/__HELPERS/do_after.dm +++ b/code/__HELPERS/do_after.dm @@ -51,6 +51,7 @@ var/dy = initial_dy // DO OUR STARTING CHECKS var/cb_return + var/list/passed_in = list(1) INVOKE_CALLBACK if(cb_return == DO_AFTER_STOP) return FALSE @@ -71,7 +72,6 @@ var/ctu var/ctt var/tick_time = world.time - var/list/passed_in = list(1) while(timeleft > 0) stoplag(1) var/timepassed = world.time - tick_time diff --git a/code/game/objects/effects/decals/misc.dm b/code/game/objects/effects/decals/misc.dm index 53ad432121..7ed90253c8 100644 --- a/code/game/objects/effects/decals/misc.dm +++ b/code/game/objects/effects/decals/misc.dm @@ -32,7 +32,7 @@ . = ..() stream = stream_mode src.speed = speed - src.range = scc.range_left = range + src.range = src.range_left = range src.hits_left = hits_left /obj/effect/decal/chempuff/proc/hit_thing(atom/A) diff --git a/code/modules/mob/living/carbon/alien/status_procs.dm b/code/modules/mob/living/carbon/alien/status_procs.dm index 71d61cab25..e20b20ef3d 100644 --- a/code/modules/mob/living/carbon/alien/status_procs.dm +++ b/code/modules/mob/living/carbon/alien/status_procs.dm @@ -2,7 +2,7 @@ //The effects include: stun, knockdown, unconscious, sleeping, resting, jitteriness, dizziness, ear damage, // eye damage, eye_blind, eye_blurry, druggy, TRAIT_BLIND trait, and TRAIT_NEARSIGHT trait. -/mob/living/carbon/alien/DefaultCombatKnockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg) +/mob/living/carbon/alien/DefaultCombatKnockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg, knocktofloor) return //no /////////////////////////////////// STUN //////////////////////////////////// diff --git a/code/modules/mob/living/carbon/human/status_procs.dm b/code/modules/mob/living/carbon/human/status_procs.dm index 7892380d8b..ec961da4dd 100644 --- a/code/modules/mob/living/carbon/human/status_procs.dm +++ b/code/modules/mob/living/carbon/human/status_procs.dm @@ -3,7 +3,7 @@ amount = dna.species.spec_stun(src,amount) return ..() -/mob/living/carbon/human/DefaultCombatKnockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg) +/mob/living/carbon/human/DefaultCombatKnockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg, knocktofloor) amount = dna.species.spec_stun(src,amount) return ..()