From ccc3dd75ed070a828e53fb9a2e71ac6132b6e800 Mon Sep 17 00:00:00 2001 From: Giacomand Date: Wed, 10 Jul 2013 05:10:14 +0100 Subject: [PATCH] Fixed a bug with the revert power leaving behind icon-less blobs. Fixed a typo. Gave a blob_act to simple animals. Increased damage of mecha blob_act(). --- code/game/gamemodes/blob/blob.dm | 2 +- code/game/gamemodes/blob/powers.dm | 4 ++-- code/game/mecha/mecha.dm | 2 +- code/modules/mob/living/simple_animal/simple_animal.dm | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 65b37d74c0c..46bdb150325 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -66,7 +66,7 @@ var/list/blob_nodes = list() /datum/game_mode/blob/proc/greet_blob(var/datum/mind/blob) blob.current << "\red You are infected by the Blob!" - blob.current << "You're body is ready to give spawn to a new blob core which will eat this station." + blob.current << "Your body is ready to give spawn to a new blob core which will eat this station." blob.current << "Find a good location to spawn the core and then take control and overwhelm the station!" blob.current << "When you have found a location, wait until you spawn; this will happen automatically and you cannot speed up the process." blob.current << "If you go outside of the station level, or in space, then you will die; make sure your location has lots of ground to cover." diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index c755b94dd17..b0b86cfacee 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -179,10 +179,10 @@ return if(istype(B, /obj/effect/blob/core)) - src << "Unable to use this blob, find another one." + src << "Unable to remove this blob." return - B.change_to(/obj/effect/blob) + B.Delete() return diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 2c8c6c8e86d..0bd187a53f6 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -610,7 +610,7 @@ */ /obj/mecha/blob_act() - take_damage(10, "brute") + take_damage(30, "brute") return //TODO diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 01c7070639d..d85986a0cfd 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -217,6 +217,11 @@ new meat_type(src.loc) ..() + +/mob/living/simple_animal/blob_act() + adjustBruteLoss(20) + return + /mob/living/simple_animal/say_quote(var/text) if(speak_emote && speak_emote.len) var/emote = pick(speak_emote)