cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13443 from MrStonedOne/DONTWAIT-IKNOWWHATYOURTHINKING-YOUDONTNEEDMYRETURN-DONTWAITCAUSEISLEEP

Browse Source 
changes `spawn() throw_at` to `throw_at_fast set waitfor = 0`
This commit is contained in:
Razharas
2015-12-06 19:52:06 +03:00
parent 5ed60c2052 9fa4288b08
commit 02fe4ec5a8
11 changed files with 32 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/kitchen machinery/gibber.dm
+1 -1
View File
@@ -207,7 +207,7 @@
var/list/nearby_turfs = orange(3, get_turf(src))
var/obj/item/meatslab = allmeat[i]
meatslab.loc = src.loc
meatslab.throw_at(pick(nearby_turfs),i,3)
meatslab.throw_at_fast(pick(nearby_turfs),i,3)
for (var/turfs=1 to meat_produced*3)
var/turf/gibturf = pick(nearby_turfs)
if (!gibturf.density && src in viewers(gibturf))
code/modules/recycling/disposal-structures.dm
+3 -9
View File
@@ -278,9 +278,7 @@
for(var/atom/movable/AM in H)
AM.loc = T
AM.pipe_eject(direction)
spawn(1)
if(AM)
AM.throw_at(target, 10, 1)
AM.throw_at_fast(target, 10, 1)
else // no specified direction, so throw in random direction
@@ -291,9 +289,7 @@
AM.loc = T
AM.pipe_eject(0)
spawn(1)
if(AM)
AM.throw_at(target, 5, 1)
AM.throw_at_fast(target, 5, 1)
H.vent_gas(T)
qdel(H)
return
@@ -800,9 +796,7 @@
for(var/atom/movable/AM in H)
AM.loc = src.loc
AM.pipe_eject(dir)
spawn(5)
if(AM)
AM.throw_at(target, eject_range, 1)
AM.throw_at_fast(target, eject_range, 1)
H.vent_gas(src.loc)
qdel(H)
return
code/modules/recycling/disposal-unit.dm
+1 -3
View File
@@ -258,9 +258,7 @@
AM.loc = src.loc
AM.pipe_eject(0)
spawn(1)
if(AM)
AM.throw_at(target, 5, 1)
AM.throw_at_fast(target, 5, 1)
H.vent_gas(loc)
qdel(H)
code/modules/research/experimentor.dm
+7 -10
View File
@@ -457,10 +457,9 @@
visible_message("<span class='danger'>[src]'s crusher goes way too many levels too high, crushing right through space-time!</span>")
playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3)
investigate_log("Experimentor has triggered the 'throw things' reaction.", "experimentor")
spawn(0)
for(var/atom/movable/AM in oview(7,src))
if(!AM.anchored)
AM.throw_at(src,10,1)
for(var/atom/movable/AM in oview(7,src))
if(!AM.anchored)
AM.throw_at_fast(src,10,1)
if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("<span class='danger'>[src]'s crusher goes one level too high, crushing right into space-time!</span>")
@@ -470,10 +469,9 @@
for(var/atom/movable/AM in oview(7,src))
if(!AM.anchored)
throwAt.Add(AM)
spawn(0)
for(var/counter = 1, counter < throwAt.len, ++counter)
var/atom/movable/cast = throwAt[counter]
cast.throw_at(pick(throwAt),10,1)
for(var/counter = 1, counter < throwAt.len, ++counter)
var/atom/movable/cast = throwAt[counter]
cast.throw_at_fast(pick(throwAt),10,1)
ejectItem(TRUE)
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == FAIL)
@@ -693,8 +691,7 @@
R.realProc = realProc
R.revealed = TRUE
dupes |= R
spawn()
R.throw_at(pick(oview(7,get_turf(src))),10,1)
R.throw_at_fast(pick(oview(7,get_turf(src))),10,1)
counter = 0
spawn(rand(10,100))
for(counter = 1; counter <= dupes.len; counter++)