From f4e3d750889e15e15878f89c25dcd25915c63b38 Mon Sep 17 00:00:00 2001 From: keronshb Date: Fri, 6 Mar 2020 17:37:07 -0500 Subject: [PATCH] Blob Reroll Part of blob reroll --- code/__DEFINES/antagonists.dm | 5 +++++ code/modules/antagonists/blob/blob/blobstrains/_reagent.dm | 2 +- .../modules/antagonists/blob/blob/blobstrains/blazing_oil.dm | 1 - .../antagonists/blob/blob/blobstrains/cryogenic_poison.dm | 1 - .../antagonists/blob/blob/blobstrains/electromagnetic_web.dm | 1 - .../antagonists/blob/blob/blobstrains/energized_jelly.dm | 1 - .../antagonists/blob/blob/blobstrains/explosive_lattice.dm | 1 - .../antagonists/blob/blob/blobstrains/networked_fibers.dm | 1 - .../antagonists/blob/blob/blobstrains/pressurized_slime.dm | 1 - .../antagonists/blob/blob/blobstrains/reactive_spines.dm | 1 - .../blob/blob/blobstrains/regenerative_materia.dm | 1 - .../antagonists/blob/blob/blobstrains/replicating_foam.dm | 1 - .../antagonists/blob/blob/blobstrains/shifting_fragments.dm | 1 - .../antagonists/blob/blob/blobstrains/synchronous_mesh.dm | 1 - .../antagonists/blob/blob/blobstrains/zombifying_pods.dm | 1 - code/modules/antagonists/blob/blob/overmind.dm | 2 +- code/modules/antagonists/blob/blob/theblob.dm | 2 +- 17 files changed, 8 insertions(+), 16 deletions(-) diff --git a/code/__DEFINES/antagonists.dm b/code/__DEFINES/antagonists.dm index b849e272e7..7a3f872666 100644 --- a/code/__DEFINES/antagonists.dm +++ b/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 \ No newline at end of file diff --git a/code/modules/antagonists/blob/blob/blobstrains/_reagent.dm b/code/modules/antagonists/blob/blob/blobstrains/_reagent.dm index f688cee847..f47c3b3378 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/_reagent.dm +++ b/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 diff --git a/code/modules/antagonists/blob/blob/blobstrains/blazing_oil.dm b/code/modules/antagonists/blob/blob/blobstrains/blazing_oil.dm index 7f934afdf6..97b974e28f 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/blazing_oil.dm +++ b/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" diff --git a/code/modules/antagonists/blob/blob/blobstrains/cryogenic_poison.dm b/code/modules/antagonists/blob/blob/blobstrains/cryogenic_poison.dm index 74910b8060..9b8edcd0e5 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/cryogenic_poison.dm +++ b/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" diff --git a/code/modules/antagonists/blob/blob/blobstrains/electromagnetic_web.dm b/code/modules/antagonists/blob/blob/blobstrains/electromagnetic_web.dm index e970588e6a..0e665603c9 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/electromagnetic_web.dm +++ b/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" diff --git a/code/modules/antagonists/blob/blob/blobstrains/energized_jelly.dm b/code/modules/antagonists/blob/blob/blobstrains/energized_jelly.dm index 8393e8fae7..66ce3c303d 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/energized_jelly.dm +++ b/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" diff --git a/code/modules/antagonists/blob/blob/blobstrains/explosive_lattice.dm b/code/modules/antagonists/blob/blob/blobstrains/explosive_lattice.dm index 5d64ecf5c3..f8fd2e2f0d 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/explosive_lattice.dm +++ b/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" diff --git a/code/modules/antagonists/blob/blob/blobstrains/networked_fibers.dm b/code/modules/antagonists/blob/blob/blobstrains/networked_fibers.dm index d2af3d9eec..fac3470c7a 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/networked_fibers.dm +++ b/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" diff --git a/code/modules/antagonists/blob/blob/blobstrains/pressurized_slime.dm b/code/modules/antagonists/blob/blob/blobstrains/pressurized_slime.dm index ef97ddd2fe..6a984e66a2 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/pressurized_slime.dm +++ b/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" diff --git a/code/modules/antagonists/blob/blob/blobstrains/reactive_spines.dm b/code/modules/antagonists/blob/blob/blobstrains/reactive_spines.dm index b36c44efea..fca56d1402 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/reactive_spines.dm +++ b/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" diff --git a/code/modules/antagonists/blob/blob/blobstrains/regenerative_materia.dm b/code/modules/antagonists/blob/blob/blobstrains/regenerative_materia.dm index 13f4e2d7db..25511e01ff 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/regenerative_materia.dm +++ b/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" diff --git a/code/modules/antagonists/blob/blob/blobstrains/replicating_foam.dm b/code/modules/antagonists/blob/blob/blobstrains/replicating_foam.dm index 4c2a61d45a..00743c671e 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/replicating_foam.dm +++ b/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" diff --git a/code/modules/antagonists/blob/blob/blobstrains/shifting_fragments.dm b/code/modules/antagonists/blob/blob/blobstrains/shifting_fragments.dm index 9a3f93f04b..dbb3d6fb9b 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/shifting_fragments.dm +++ b/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) diff --git a/code/modules/antagonists/blob/blob/blobstrains/synchronous_mesh.dm b/code/modules/antagonists/blob/blob/blobstrains/synchronous_mesh.dm index 1a846a5a1d..d58fb5b37d 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/synchronous_mesh.dm +++ b/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" diff --git a/code/modules/antagonists/blob/blob/blobstrains/zombifying_pods.dm b/code/modules/antagonists/blob/blob/blobstrains/zombifying_pods.dm index 6f04a6a79a..b2bb9d5115 100644 --- a/code/modules/antagonists/blob/blob/blobstrains/zombifying_pods.dm +++ b/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) diff --git a/code/modules/antagonists/blob/blob/overmind.dm b/code/modules/antagonists/blob/blob/overmind.dm index af68950775..4997166325 100644 --- a/code/modules/antagonists/blob/blob/overmind.dm +++ b/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 = "\[Blob Telepathy\] [name]([blobstrain.name]) [message_a]" for(var/mob/M in GLOB.mob_list) diff --git a/code/modules/antagonists/blob/blob/theblob.dm b/code/modules/antagonists/blob/blob/theblob.dm index da3b338bf4..444b10684b 100644 --- a/code/modules/antagonists/blob/blob/theblob.dm +++ b/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)