Merge branch 'master' into development

code/modules/mob/living/bot/ed209bot.dm

@@ -56,8 +56,6 @@
 		return
 
 	last_shot = world.time
-	var/turf/T = get_turf(src)
-	var/turf/U = get_turf(A)
 
 	var/projectile = /obj/item/projectile/beam/stun
 	if(emagged)
@@ -65,14 +63,9 @@
 
 	playsound(loc, emagged ? 'sound/weapons/Laser.ogg' : 'sound/weapons/Taser.ogg', 50, 1)
 	var/obj/item/projectile/P = new projectile(loc)
+	var/def_zone = get_exposed_defense_zone(A)
+	P.launch(A, def_zone)
 
-	P.original = A
-	P.starting = T
-	P.current = T
-	P.yo = U.y - T.y
-	P.xo = U.x - T.x
-	spawn()
-		P.process()
 	return
 
 // Assembly

code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm

@@ -171,29 +171,8 @@
 
 	visible_message("<span class='warning'>[src] spits neurotoxin at [target]!</span>", "<span class='alium'>You spit neurotoxin at [target].</span>")
 
-	//I'm not motivated enough to revise this. Prjectile code in general needs update.
-	// Maybe change this to use throw_at? ~ Z
-	var/turf/T = loc
-	var/turf/U = (istype(target, /atom/movable) ? target.loc : target)
-
-	if(!U || !T)
-		return
-	while(U && !istype(U,/turf))
-		U = U.loc
-	if(!istype(T, /turf))
-		return
-	if (U == T)
-		usr.bullet_act(new /obj/item/projectile/energy/neurotoxin(usr.loc), get_organ_target())
-		return
-	if(!istype(U, /turf))
-		return
-
 	var/obj/item/projectile/energy/neurotoxin/A = new /obj/item/projectile/energy/neurotoxin(usr.loc)
-	A.current = U
-	A.yo = U.y - T.y
-	A.xo = U.x - T.x
-	A.process()
-	return
+	A.launch(target, get_organ_target())
 
 /mob/living/carbon/human/proc/resin() // -- TLE
 	set name = "Secrete Resin (75)"
@@ -217,4 +196,4 @@
 			new /obj/effect/alien/resin/membrane(loc)
 		if("resin nest")
 			new /obj/structure/bed/nest(loc)
-	return
+	return

code/modules/mob/living/silicon/pai/software.dm

@@ -126,6 +126,6 @@ var/global/list/default_pai_software = list()
 
 	else if(href_list["image"])
 		var/img = text2num(href_list["image"])
-		if(1 <= img && img <= 9)
+		if(1 <= img && img <= 15)
 			card.setEmotion(img)
 		return 1

code/modules/mob/living/silicon/robot/robot.dm

@@ -925,9 +925,10 @@
 				if (istype(tile, /turf/simulated))
 					var/turf/simulated/S = tile
 					S.dirt = 0
+					S.color = null
 				for(var/A in tile)
 					if(istype(A, /obj/effect))
-						if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay))
+						if(istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay))
 							qdel(A)
 					else if(istype(A, /obj/item))
 						var/obj/item/cleaned_item = A

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -155,22 +155,21 @@
 	var/target = target_mob
 	visible_message("\red <b>[src]</b> fires at [target]!", 1)
 
-	var/tturf = get_turf(target)
 	if(rapid)
 		spawn(1)
-			Shoot(tturf, src.loc, src)
+			Shoot(target, src.loc, src)
 			if(casingtype)
 				new casingtype(get_turf(src))
 		spawn(4)
-			Shoot(tturf, src.loc, src)
+			Shoot(target, src.loc, src)
 			if(casingtype)
 				new casingtype(get_turf(src))
 		spawn(6)
-			Shoot(tturf, src.loc, src)
+			Shoot(target, src.loc, src)
 			if(casingtype)
 				new casingtype(get_turf(src))
 	else
-		Shoot(tturf, src.loc, src)
+		Shoot(target, src.loc, src)
 		if(casingtype)
 			new casingtype
 
@@ -187,16 +186,9 @@
 	playsound(user, projectilesound, 100, 1)
 	if(!A)	return
 
-	if (!istype(target, /turf))
-		qdel(A)
-		return
-	A.current = target
-	A.starting = get_turf(src)
-	A.original = get_turf(target)
-	A.yo = target:y - start:y
-	A.xo = target:x - start:x
-	spawn( 0 )
-		A.process()
+	var/def_zone = get_exposed_defense_zone(target)
+	A.launch(target, def_zone)
+
 	return
 
 /mob/living/simple_animal/hostile/proc/DestroySurroundings()