mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-27 18:42:44 +00:00
Merge pull request #13834 from Heroman3003/big-crash-fixes
Fixes critical crash bugs
This commit is contained in:
@@ -39,7 +39,7 @@ SUBSYSTEM_DEF(ai)
|
||||
if(!L?.loc)
|
||||
continue
|
||||
|
||||
if(process_z[get_z(L)] || !L.low_priority) //VOREStation Edit End
|
||||
if((get_z(L) && process_z[get_z(L)]) || !L.low_priority) //VOREStation Edit End
|
||||
A.handle_strategicals()
|
||||
else
|
||||
slept_mobs++
|
||||
|
||||
@@ -40,7 +40,7 @@ SUBSYSTEM_DEF(mobs)
|
||||
if(!M || QDELETED(M))
|
||||
mob_list -= M
|
||||
continue
|
||||
else if(M.low_priority && !(M.loc && process_z[get_z(M)]))
|
||||
else if(M.low_priority && !(M.loc && get_z(M) && process_z[get_z(M)]))
|
||||
slept_mobs++
|
||||
continue
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
var/obj/effect/decal/cleanable/blood/splatter/animated/B = new(M.loc)
|
||||
B.basecolor = M.species.get_blood_colour(M)
|
||||
B.color = M.species.get_blood_colour(M)
|
||||
B.target_turf = pick(range(1, get_turf(holder)))
|
||||
B.target_turf = pick(RANGE_TURFS(1, holder))
|
||||
B.blood_DNA = list()
|
||||
B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type
|
||||
M.vessel.remove_reagent("blood",rand(10,30))
|
||||
|
||||
@@ -82,13 +82,13 @@
|
||||
//use up stored charges
|
||||
if(charges >= 10)
|
||||
charges -= 10
|
||||
new /obj/effect/spider/eggcluster(pick(view(1,src)))
|
||||
new /obj/effect/spider/eggcluster(pick(RANGE_TURFS(1,src)))
|
||||
|
||||
if(charges >= 3)
|
||||
if(prob(5))
|
||||
charges -= 1
|
||||
var/spawn_type = pick(/mob/living/simple_mob/creature)
|
||||
new spawn_type(pick(view(1,src)))
|
||||
new spawn_type(pick(RANGE_TURFS(1,src)))
|
||||
playsound(src, pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 50, 1, -3)
|
||||
|
||||
if(charges >= 1)
|
||||
|
||||
Reference in New Issue
Block a user