From b3fdf3836e5d2736a66a87eac7a56b7481738aed Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Fri, 29 Sep 2017 21:45:54 -0500
Subject: [PATCH] Adds a frost spider nest PoI, adds frost spider things

---
 code/game/objects/effects/spiders.dm         |  9 ++++++++-
 maps/submaps/surface_submaps/forest.dm       |  7 ++++++-
 maps/submaps/surface_submaps/forest_areas.dm |  5 ++++-
 maps/submaps/surface_submaps/spider1.dmm     | 21 ++++++++++++++++++++
 4 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 maps/submaps/surface_submaps/spider1.dmm

diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index e4df02202f..94c0a7999f 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -79,6 +79,7 @@
 	var/amount_grown = 0
 	var/spiders_min = 6
 	var/spiders_max = 24
+	var/spider_type = /obj/effect/spider/spiderling
 	New()
 		pixel_x = rand(3,-3)
 		pixel_y = rand(3,-3)
@@ -105,7 +106,7 @@
 			O = loc
 
 		for(var/i=0, i<num, i++)
-			var/spiderling = new /obj/effect/spider/spiderling(src.loc, src)
+			var/spiderling = new spider_type(src.loc, src)
 			if(O)
 				O.implants += spiderling
 		qdel(src)
@@ -114,6 +115,9 @@
 	spiders_min = 1
 	spiders_max = 3
 
+/obj/effect/spider/eggcluster/small/frost
+	spider_type = /obj/effect/spider/spiderling/frost
+
 /obj/effect/spider/spiderling
 	name = "spiderling"
 	desc = "It never stays still for long."
@@ -127,6 +131,9 @@
 	var/travelling_in_vent = 0
 	var/list/grow_as = list(/mob/living/simple_animal/hostile/giant_spider, /mob/living/simple_animal/hostile/giant_spider/nurse, /mob/living/simple_animal/hostile/giant_spider/hunter)
 
+/obj/effect/spider/spiderling/frost
+	grow_as = list(/mob/living/simple_animal/hostile/giant_spider/frost)
+
 /obj/effect/spider/spiderling/New(var/location, var/atom/parent)
 	pixel_x = rand(6,-6)
 	pixel_y = rand(6,-6)
diff --git a/maps/submaps/surface_submaps/forest.dm b/maps/submaps/surface_submaps/forest.dm
index be13e4f947..40a045a37d 100644
--- a/maps/submaps/surface_submaps/forest.dm
+++ b/maps/submaps/surface_submaps/forest.dm
@@ -7,4 +7,9 @@
 /datum/map_template/surface/farm1
 	name = "Farm 1"
 	desc = "A small farm tended by a farmbot."
-	mappath = 'maps/submaps/surface_submaps/farm1.dmm'
\ No newline at end of file
+	mappath = 'maps/submaps/surface_submaps/farm1.dmm'
+
+/datum/map_template/surface/spider1
+	name = "Spider Nest 1"
+	desc = "A small spider nest, in the forest."
+	mappath = 'maps/submaps/surface_submaps/spider1.dmm'
\ No newline at end of file
diff --git a/maps/submaps/surface_submaps/forest_areas.dm b/maps/submaps/surface_submaps/forest_areas.dm
index f8fe110cb0..b1d763d4aa 100644
--- a/maps/submaps/surface_submaps/forest_areas.dm
+++ b/maps/submaps/surface_submaps/forest_areas.dm
@@ -3,4 +3,7 @@
 	icon_state = "submap"
 
 /area/submap/farm1
-	name = "farm"
\ No newline at end of file
+	name = "farm"
+
+/area/submap/spider1
+	name = "spider nest"
\ No newline at end of file
diff --git a/maps/submaps/surface_submaps/spider1.dmm b/maps/submaps/surface_submaps/spider1.dmm
new file mode 100644
index 0000000000..761105c246
--- /dev/null
+++ b/maps/submaps/surface_submaps/spider1.dmm
@@ -0,0 +1,21 @@
+"a" = (/turf/template_noop,/area/template_noop)
+"b" = (/obj/effect/spider/stickyweb,/turf/simulated/floor/outdoors/snow,/area/submap/spider1)
+"c" = (/turf/simulated/floor/outdoors/snow,/area/submap/spider1)
+"d" = (/obj/structure/flora/tree/pine,/turf/simulated/floor/outdoors/snow,/area/submap/spider1)
+"e" = (/obj/effect/spider/eggcluster/small/frost,/turf/simulated/floor/outdoors/snow,/area/submap/spider1)
+"f" = (/mob/living/simple_animal/hostile/giant_spider/frost,/turf/simulated/floor/outdoors/snow,/area/submap/spider1)
+"g" = (/obj/structure/flora/tree/sif,/turf/simulated/floor/outdoors/snow,/area/submap/spider1)
+"h" = (/obj/effect/spider/cocoon,/mob/living/simple_animal/hostile/giant_spider/frost,/turf/simulated/floor/outdoors/snow,/area/submap/spider1)
+
+(1,1,1) = {"
+aaaaaaaaaa
+abbccbbbca
+accbcbccba
+adecccccda
+abcfccccca
+accccccgca
+accccchcca
+acccbbbdca
+acdbcbccca
+aaaaaaaaaa
+"}