Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting

# Conflicts:
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-04-26 22:58:56 +02:00
222 changed files with 1040 additions and 866 deletions
+1 -2
View File
@@ -701,8 +701,7 @@
H.nutrition -= 20
H.adjustToxLoss(-3)
var/turf/T = get_turf(H)
T.add_vomit_floor(H)
playsound(H, 'sound/effects/splat.ogg', 50, 1)
T.add_vomit_floor()
else
visible_message("<span class='warning'>[src] flickers and fails, due to bluespace interference!</span>")
qdel(src)
@@ -35,14 +35,14 @@
/obj/item/melee/ghost_sword/New()
..()
spirits = list()
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
GLOB.poi_list |= src
/obj/item/melee/ghost_sword/Destroy()
for(var/mob/dead/observer/G in spirits)
G.invisibility = initial(G.invisibility)
spirits.Cut()
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
GLOB.poi_list -= src
. = ..()
@@ -436,7 +436,7 @@
..()
if(isanimal(loc))
holder_animal = loc
processing_objects.Add(src)
START_PROCESSING(SSobj, src)
/obj/structure/closet/stasis/Entered(atom/A)
if(isliving(A) && holder_animal)
@@ -450,7 +450,7 @@
holder_animal.verbs -= /mob/living/verb/pulled
/obj/structure/closet/stasis/dump_contents(var/kill = 1)
processing_objects.Remove(src)
STOP_PROCESSING(SSobj, src)
for(var/mob/living/L in src)
L.disabilities &= ~MUTE
L.status_flags &= ~GODMODE