Blob Reroll

Part of blob reroll

code/__DEFINES/antagonists.dm

@@ -72,3 +72,8 @@
 #define CAT_STRUCTURE	"Structures"
 
 #define MARTIALART_HUNTER "hunter-fu"
+
+//Blob
+/// blob gets a free reroll every X time
+#define BLOB_REROLL_TIME 2400
+#define BLOB_REFLECTOR_COST 15

code/modules/antagonists/blob/blob/blobstrains/_reagent.dm

@@ -16,7 +16,7 @@
 	reagent.reaction_mob(L, VAPOR, 20, 0, mob_protection, overmind)//this will do between 10 and 20 damage(reduced by mob protection), depending on chemical, plus 4 from base brute damage.
 
 /datum/blobstrain/reagent/on_sporedeath(mob/living/spore)
-	spore.reagents.add_reagent(reagent.id, 10)
+	spore.reagents.add_reagent(reagent.type, 10)
 
 // These can only be applied by blobs. They are what (reagent) blobs are made out of.
 /datum/reagent/blob

code/modules/antagonists/blob/blob/blobstrains/blazing_oil.dm

@@ -28,7 +28,6 @@
 
 /datum/reagent/blob/blazing_oil
 	name = "Blazing Oil"
-	id = "blazing_oil"
 	taste_description = "burning oil"
 	color = "#B68D00"
 

code/modules/antagonists/blob/blob/blobstrains/cryogenic_poison.dm

@@ -12,7 +12,6 @@
 
 /datum/reagent/blob/cryogenic_poison
 	name = "Cryogenic Poison"
-	id = "cryogenic_poison"
 	description = "will inject targets with a freezing poison that does high damage over time."
 	color = "#8BA6E9"
 	taste_description = "brain freeze"

code/modules/antagonists/blob/blob/blobstrains/electromagnetic_web.dm

@@ -22,7 +22,6 @@
 
 /datum/reagent/blob/electromagnetic_web
 	name = "Electromagnetic Web"
-	id = "electromagnetic_web"
 	taste_description = "pop rocks"
 	color = "#83ECEC"
 

code/modules/antagonists/blob/blob/blobstrains/energized_jelly.dm

@@ -23,7 +23,6 @@
 
 /datum/reagent/blob/energized_jelly
 	name = "Energized Jelly"
-	id = "energized_jelly"
 	taste_description = "gelatin"
 	color = "#EFD65A"
 

code/modules/antagonists/blob/blob/blobstrains/explosive_lattice.dm

@@ -20,7 +20,6 @@
 
 /datum/reagent/blob/explosive_lattice
 	name = "Explosive Lattice"
-	id = "explosive_lattice"
 	taste_description = "the bomb"
 	color = "#8B2500"
 

code/modules/antagonists/blob/blob/blobstrains/networked_fibers.dm

@@ -28,7 +28,6 @@
 //does massive brute and burn damage, but can only expand manually
 /datum/reagent/blob/networked_fibers
 	name = "Networked Fibers"
-	id = "networked_fibers"
 	taste_description = "efficiency"
 	color = "#CDC0B0"
 

code/modules/antagonists/blob/blob/blobstrains/pressurized_slime.dm

@@ -34,7 +34,6 @@
 
 /datum/reagent/blob/pressurized_slime
 	name = "Pressurized Slime"
-	id = "pressurized_slime"
 	taste_description = "a sponge"
 	color = "#AAAABB"
 

code/modules/antagonists/blob/blob/blobstrains/reactive_spines.dm

@@ -21,7 +21,6 @@
 
 /datum/reagent/blob/reactive_spines
 	name = "Reactive Spines"
-	id = "reactive_spines"
 	taste_description = "rock"
 	color = "#9ACD32"
 

code/modules/antagonists/blob/blob/blobstrains/regenerative_materia.dm

@@ -10,7 +10,6 @@
 
 /datum/reagent/blob/regenerative_materia
 	name = "Regenerative Materia"
-	id = "regenerative_materia"
 	taste_description = "heaven"
 	color = "#C8A5DC"
 

code/modules/antagonists/blob/blob/blobstrains/replicating_foam.dm

@@ -26,7 +26,6 @@
 
 /datum/reagent/blob/replicating_foam
 	name = "Replicating Foam"
-	id = "replicating_foam"
 	taste_description = "duplication"
 	color = "#7B5A57"
 

code/modules/antagonists/blob/blob/blobstrains/shifting_fragments.dm

@@ -28,7 +28,6 @@
 
 /datum/reagent/blob/shifting_fragments
 	name = "Shifting Fragments"
-	id = "shifting_fragments"
 	color = "#C8963C"
 
 /datum/reagent/blob/shifting_fragments/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)

code/modules/antagonists/blob/blob/blobstrains/synchronous_mesh.dm

@@ -25,7 +25,6 @@
 
 /datum/reagent/blob/synchronous_mesh
 	name = "Synchronous Mesh"
-	id = "synchronous_mesh"
 	taste_description = "toxic mold"
 	color = "#65ADA2"
 

code/modules/antagonists/blob/blob/blobstrains/zombifying_pods.dm

@@ -29,7 +29,6 @@
 
 /datum/reagent/blob/zombifying_pods
 	name = "Zombifying Pods"
-	id = "zombifying_pods"
 	color = "#E88D5D"
 
 /datum/reagent/blob/zombifying_pods/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)

code/modules/antagonists/blob/blob/overmind.dm

@@ -215,7 +215,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 
 	src.log_talk(message, LOG_SAY)
 
-	var/message_a = say_quote(message, get_spans())
+	var/message_a = say_quote(message)
 	var/rendered = "<span class='big'><font color=\"#EE4000\"><b>\[Blob Telepathy\] [name](<font color=\"[blobstrain.color]\">[blobstrain.name]</font>)</b> [message_a]</font></span>"
 
 	for(var/mob/M in GLOB.mob_list)

code/modules/antagonists/blob/blob/theblob.dm

@@ -237,7 +237,7 @@
 	else
 		return ..()
 
-/obj/structure/blob/proc/chemeffectreport()
+/obj/structure/blob/proc/chemeffectreport(mob/user)
 	RETURN_TYPE(/list)
 	. = list()
 	if(overmind)