Merge remote-tracking branch 'upstream/master' into flyswatter-fix

To trigger the RUSTG CI
This commit is contained in:
SabreML
2021-04-29 15:23:55 +01:00
1230 changed files with 20187 additions and 20811 deletions
@@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY(splatter_cache)
/obj/effect/decal/cleanable/blood/gibs/cleangibs //most ironic name ever...
scoop_reagents = null
/obj/effect/decal/cleanable/blood/gibs/proc/streak(var/list/directions)
/obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions)
set waitfor = 0
var/direction = pick(directions)
for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)
@@ -20,7 +20,7 @@
/obj/effect/decal/cleanable/blood/gibs/robot/can_bloodcrawl_in()
return FALSE
/obj/effect/decal/cleanable/blood/gibs/robot/streak(var/list/directions)
/obj/effect/decal/cleanable/blood/gibs/robot/streak(list/directions)
spawn(0)
var/direction = pick(directions)
for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50; 4), i++)