mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 20:47:10 +01:00
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD
This commit is contained in:
@@ -23,4 +23,4 @@
|
||||
if(!C.stat)
|
||||
var/turf/T = get_turf(C)
|
||||
if(istype(T, /turf/space))
|
||||
del(C)
|
||||
qdel(C)
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
D.z = 2
|
||||
D.has_loot = 0
|
||||
|
||||
del(D)
|
||||
qdel(D)
|
||||
num_recovered++
|
||||
|
||||
if(num_recovered > drones_list.len * 0.75)
|
||||
|
||||
@@ -50,4 +50,4 @@
|
||||
else
|
||||
new /mob/living/simple_animal/cow(loc)
|
||||
|
||||
del(src)
|
||||
qdel(src)
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
/datum/event/tear/end()
|
||||
if(TE)
|
||||
del(TE)
|
||||
qdel(TE)
|
||||
|
||||
/obj/effect/tear
|
||||
name="Dimensional Tear"
|
||||
@@ -40,7 +40,7 @@
|
||||
animation.master = src
|
||||
// flick("newtear",usr)
|
||||
spawn(15)
|
||||
if(animation) del(animation)
|
||||
if(animation) qdel(animation)
|
||||
|
||||
|
||||
spawn(rand(30,120))
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
if(life <= 0)
|
||||
walk(src,0)
|
||||
spawn(1)
|
||||
del(src)
|
||||
qdel(src)
|
||||
return 0
|
||||
return
|
||||
|
||||
|
||||
@@ -67,7 +67,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
|
||||
|
||||
Move()
|
||||
if(z != z_original || loc == destination)
|
||||
spawn(0) del(src)
|
||||
spawn(0) qdel(src)
|
||||
return ..()
|
||||
|
||||
Bump(atom/clong)
|
||||
@@ -87,7 +87,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
|
||||
if(clong.density || prob(10))
|
||||
clong.ex_act(2)
|
||||
else
|
||||
del(src)
|
||||
qdel(src)
|
||||
|
||||
if(clong && prob(25))
|
||||
src.loc = clong.loc
|
||||
|
||||
@@ -33,4 +33,4 @@
|
||||
smoke.set_up(R, rand(1, 2), 0, vent, 0, silent = 1)
|
||||
playsound(vent.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
|
||||
smoke.start(3)
|
||||
R.delete() //GC the reagents
|
||||
qdel(R)
|
||||
|
||||
Reference in New Issue
Block a user