Merge pull request #6936 from VOREStation/vplk-sundry-bugfixes-xi

[PORT] Sundry Bugfixes XI
This commit is contained in:
Atermonera
2020-04-04 23:36:44 -07:00
committed by GitHub
5 changed files with 10 additions and 11 deletions
+4 -3
View File
@@ -103,7 +103,7 @@
var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/3))
R.add_reagent(rid,injecting)
var/datum/effect/effect/system/smoke_spread/chem/spores/S = new(name)
var/datum/effect/effect/system/smoke_spread/chem/spores/S = new(src)
S.attach(T)
S.set_up(R, round(get_trait(TRAIT_POTENCY)/4), 0, T)
S.start()
@@ -228,6 +228,7 @@
open_turfs |= origin_turf
// Flood fill to get affected turfs.
// NOTE: Halfass bugfix implemented using air_blocked() but this really should be redone completely ~Leshana
while(open_turfs.len)
var/turf/T = pick(open_turfs)
open_turfs -= T
@@ -245,11 +246,11 @@
var/no_los
var/turf/last_turf = origin_turf
for(var/turf/target_turf in getline(origin_turf,neighbor))
if(!last_turf.Enter(target_turf) || target_turf.density)
if(air_master.air_blocked(last_turf, target_turf))
no_los = 1
break
last_turf = target_turf
if(!no_los && !origin_turf.Enter(neighbor))
if(!no_los && air_master.air_blocked(origin_turf, neighbor))
no_los = 1
if(no_los)
closed_turfs |= neighbor