shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
silicons
2021-02-28 02:43:32 -07:00
parent e7981c0a44
commit 0f16178425
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/do_after.dm
+1 -1
View File
@@ -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
code/game/objects/effects/decals/misc.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/carbon/alien/status_procs.dm
+1 -1
View File
@@ -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 ////////////////////////////////////
code/modules/mob/living/carbon/human/status_procs.dm
+1 -1
View File
@@ -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 ..()