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

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/game/dna/genes/goon_powers.dm
#	code/game/dna/genes/vg_powers.dm
#	code/game/objects/effects/overlays.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/statue.dm
#	code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
#	icons/mob/back.dmi
#	icons/obj/storage.dmi

code/game/objects/effects/aliens.dm

@@ -79,7 +79,8 @@
 
 
 /obj/structure/alien/resin/bullet_act(obj/item/projectile/Proj)
-	health -= Proj.damage
+	if(Proj.damage_type == BRUTE || Proj.damage_type == BURN)
+		health -= Proj.damage
 	..()
 	healthcheck()
 

code/game/objects/effects/effect_system.dm

@@ -583,7 +583,7 @@ steam.start() -- spawns the effect
 //		if(M.wear_suit, /obj/item/clothing/suit/wizrobe && (M.hat, /obj/item/clothing/head/wizard) && (M.shoes, /obj/item/clothing/shoes/sandal))  // I'll work on it later
 		else
 			M.drop_item()
-			M:sleeping += 5
+			M.AdjustSleeping(5)
 			if(M.coughedtime != 1)
 				M.coughedtime = 1
 				M.emote("cough")
@@ -600,7 +600,7 @@ steam.start() -- spawns the effect
 			return
 		else
 			M.drop_item()
-			M:sleeping += 5
+			M.AdjustSleeping(5)
 			if(M.coughedtime != 1)
 				M.coughedtime = 1
 				M.emote("cough")

code/game/objects/effects/landmarks.dm

@@ -12,22 +12,6 @@
 	invisibility = 101
 
 	switch(name)			//some of these are probably obsolete
-		if("shuttle")
-			log_runtime(EXCEPTION("Obsolete landmark '[name]' at ([x],[y],[z])"), src)
-			qdel(src)
-
-		if("airtunnel_stop")
-			airtunnel_stop = x
-
-		if("airtunnel_start")
-			airtunnel_start = x
-
-		if("airtunnel_bottom")
-			airtunnel_bottom = y
-
-		if("monkey")
-			monkeystart += loc
-			qdel(src)
 		if("start")
 			newplayer_start += loc
 			qdel(src)
@@ -52,29 +36,28 @@
 			latejoin_cyborg += loc
 			qdel(src)
 
-		//prisoners
 		if("prisonwarp")
 			prisonwarp += loc
 			qdel(src)
-	//	if("mazewarp")
-	//		mazewarp += loc
-		if("Holding Facility")
-			holdingfacility += loc
-		if("tdome1")
-			tdome1	+= loc
-		if("tdome2")
-			tdome2 += loc
-		if("tdomeadmin")
-			tdomeadmin	+= loc
-		if("tdomeobserve")
-			tdomeobserve += loc
-		if("aroomwarp")
-			aroomwarp += loc
-
-		//not prisoners
+			
 		if("prisonsecuritywarp")
 			prisonsecuritywarp += loc
 			qdel(src)
+			
+		if("tdome1")
+			tdome1	+= loc
+			
+		if("tdome2")
+			tdome2 += loc
+			
+		if("tdomeadmin")
+			tdomeadmin	+= loc
+			
+		if("tdomeobserve")
+			tdomeobserve += loc
+			
+		if("aroomwarp")
+			aroomwarp += loc
 
 		if("blobstart")
 			blobstart += loc
@@ -96,6 +79,11 @@
 
 		if("ERT Director")
 			ertdirector += loc
+			qdel(src)
+			
+		if("Response Team")
+			emergencyresponseteamspawn += loc
+			qdel(src)
 
 	landmarks_list += src
 	return 1

code/game/objects/effects/misc.dm

@@ -55,13 +55,6 @@
 	anchored = 1.0
 	unacidable = 1
 
-/obj/effect/stop
-	var/victim = null
-	icon_state = "empty"
-	name = "Geas"
-	desc = "You can't resist."
-	// name = ""
-
 /obj/effect/projection
 	name = "Projection"
 	desc = "This looks like a projection of something."

code/game/objects/effects/overlays.dm

@@ -191,3 +191,17 @@
 
 /obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter
 	splatter_type = "xsplatter"
+
+/obj/effect/overlay/wall_rot
+	name = "Wallrot"
+	desc = "Ick..."
+	icon = 'icons/effects/wallrot.dmi'
+	anchored = 1
+	density = 1
+	layer = 5
+	mouse_opacity = 0
+
+/obj/effect/overlay/wall_rot/New()
+	..()
+	pixel_x += rand(-10, 10)
+	pixel_y += rand(-10, 10)

code/game/objects/effects/spiders.dm

@@ -215,6 +215,7 @@
 	desc = "Green squishy mess."
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "greenshatter"
+	anchored = 1
 
 /obj/effect/spider/cocoon
 	name = "cocoon"