From 44873907f45857026321591dbb531fec623ac2f2 Mon Sep 17 00:00:00 2001
From: KorPhaeron <kortgstation@gmail.com>
Date: Fri, 11 Dec 2015 04:42:04 -0600
Subject: [PATCH] More spider fixes

---
 code/game/objects/effects/spiders.dm              |  4 ++++
 .../living/simple_animal/hostile/giant_spider.dm  | 15 ++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 109a8c7de4e..a3c72f3a8b3 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -79,6 +79,7 @@
 	var/player_spiders = 0
 	var/poison_type = "toxin"
 	var/poison_per_bite = 5
+	var/list/faction = list("spiders")
 
 /obj/effect/spider/eggcluster/New()
 	pixel_x = rand(3,-3)
@@ -93,6 +94,7 @@
 			var/obj/effect/spider/spiderling/S = new /obj/effect/spider/spiderling(src.loc)
 			S.poison_type = poison_type
 			S.poison_per_bite = poison_per_bite
+			S.faction = faction
 			if(player_spiders)
 				S.player_spiders = 1
 		qdel(src)
@@ -111,6 +113,7 @@
 	var/player_spiders = 0
 	var/poison_type = "toxin"
 	var/poison_per_bite = 5
+	var/list/faction = list("spiders")
 
 /obj/effect/spider/spiderling/New()
 	pixel_x = rand(6,-6)
@@ -197,6 +200,7 @@
 			var/mob/living/simple_animal/hostile/poison/giant_spider/S = new grow_as(src.loc)
 			S.poison_per_bite = poison_per_bite
 			S.poison_type = poison_type
+			S.faction = faction
 			if(player_spiders)
 				var/list/candidates = get_candidates(ROLE_ALIEN, ALIEN_AFK_BRACKET)
 
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index ced3ac7f65c..5496ce84249 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -163,8 +163,8 @@
 		if(do_after(src, 40, target = T))
 			if(busy == SPINNING_WEB && src.loc == T)
 				new /obj/effect/spider/stickyweb(T)
-			busy = 0
-			stop_automated_movement = 0
+		busy = 0
+		stop_automated_movement = 0
 
 
 /mob/living/simple_animal/hostile/poison/giant_spider/nurse/verb/Wrap()
@@ -221,9 +221,9 @@
 						break
 					if(large_cocoon)
 						C.icon_state = pick("cocoon_large1","cocoon_large2","cocoon_large3")
-			cocoon_target = null
-			busy = 0
-			stop_automated_movement = 0
+		cocoon_target = null
+		busy = 0
+		stop_automated_movement = 0
 
 /mob/living/simple_animal/hostile/poison/giant_spider/nurse/verb/LayEggs()
 	set name = "Lay Eggs"
@@ -250,9 +250,10 @@
 						C.player_spiders = 1
 					C.poison_type = poison_type
 					C.poison_per_bite = poison_per_bite
+					C.faction = faction
 					fed--
-			busy = 0
-			stop_automated_movement = 0
+		busy = 0
+		stop_automated_movement = 0
 
 /mob/living/simple_animal/hostile/poison/giant_spider/handle_temperature_damage()
 	if(bodytemperature < minbodytemp)