Merge branch 'CHOMPStation2:master' into craft

modular_chomp/code/modules/mob/living/carbon/human/species/station/traits/positive.dm

@@ -1,4 +1,4 @@
-/datum/trait/positive/hardfeet
+/datum/trait/neutral/hardfeet
 	custom_only = FALSE
 
 /datum/trait/positive/linguist

modular_chomp/code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -23,7 +23,7 @@
 		/obj/item/weapon/circuitboard,
 		/obj/item/weapon/smes_coil,
 		/obj/item/weapon/fuel_assembly,
-		/obj/item/weapon/ore/bluespace_crystal
+		/obj/item/weapon/bluespace_crystal
 		) // CHOMPEdit - Buffing the gripper to allow bluespace crystal use for telesci building.
 
 	var/obj/item/wrapped = null // Item currently being held.

modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/spider.dm

@@ -1,45 +1,52 @@
 //Unfiying spider health, into two catagories. Disrupters and tanks.
 /mob/living/simple_mob/animal/giant_spider/carrier //Disrupter, old 100
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 
 /mob/living/simple_mob/animal/giant_spider/electric //disrupter, old 210
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 	projectiletype = /obj/item/projectile/energy/mob/electric_spider
 
 /mob/living/simple_mob/animal/giant_spider/frost //tank, old 175
-	maxHealth = 130
-	health = 130
+	maxHealth = 120
+	health = 120
+
+/mob/living/simple_mob/animal/giant_spider //tank, old 200
+	maxHealth = 120
+	health = 120
 
 /mob/living/simple_mob/animal/giant_spider/ion //disrupter, old 90
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 
 /mob/living/simple_mob/animal/giant_spider/hunter //disrupter, old 120
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 
 /mob/living/simple_mob/animal/giant_spider/lurker //disrupter, old 100
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 
 /mob/living/simple_mob/animal/giant_spider/pepper //tank, old 210
-	maxHealth = 130
-	health = 130
+	maxHealth = 120
+	health = 120
 
 /mob/living/simple_mob/animal/giant_spider/phorogenic //tank, old 225
-	maxHealth = 130
-	health = 130
+	maxHealth = 120
+	health = 120
 
 /mob/living/simple_mob/animal/giant_spider/thermic //tank, old 175
-	maxHealth = 130
-	health = 130
+	maxHealth = 120
+	health = 120
 
 /mob/living/simple_mob/animal/giant_spider/tunneler_spider //disrupter, old 120
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
 
 /mob/living/simple_mob/animal/giant_spider/webslinger //disrupter, old 90
-	maxHealth = 70
-	health = 70
+	maxHealth = 60
+	health = 60
+
+/obj/effect/spider/eggcluster
+	spider_type = /obj/effect/spider/spiderling/varied

modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm

@@ -283,7 +283,7 @@
 	vore_max_size = RESIZE_HUGE
 	vore_min_size = RESIZE_SMALL
 	vore_pounce_chance = 0 // Beat them into crit before eating.
-	vore_icons = null
+	vore_icons = SA_ICON_LIVING
 
 	can_be_drop_prey = FALSE //CHOMP Add
 

modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm

@@ -1,7 +1,7 @@
-/mob/living/simple_mob/animal/wolf/direwolf/Initialize()
+/mob/living/simple_mob/vore/wolf/direwolf/Initialize()
     . = ..()
     verbs += /mob/living/simple_mob/proc/pick_color
 
-/mob/living/simple_mob/animal/wolf/direwolf
+/mob/living/simple_mob/vore/wolf/direwolf
 	maxHealth = 100
-	health = 100
+	health = 100