From 221f3a7e05fd844dc3797a3067a6154ab3ab330a Mon Sep 17 00:00:00 2001 From: alex-gh Date: Sun, 5 Jan 2014 19:48:06 +0100 Subject: [PATCH 1/3] Fixed 'Expand Blob' mob detection. --- code/game/gamemodes/blob/powers.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 5a42c733b63..370fd56f7c1 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -239,10 +239,10 @@ src << "There is no blob adjacent to you." return - var/mob/M = locate() in T - if(M && !(M.stat)) - src << "You can't expand to a tile containing a living entity." - return + for (var/mob/living/M in T.contents) + if(M && !(M.stat)) + src << "You can't expand to a tile containing a living entity." + return if(!can_buy(5)) return From e85bf6ebcd16011d39b61a35112ef8bcc0f1895c Mon Sep 17 00:00:00 2001 From: alex-gh Date: Sun, 5 Jan 2014 20:01:40 +0100 Subject: [PATCH 2/3] Nuke code is now publicly broadcast in blob mode --- code/game/gamemodes/blob/blob.dm | 12 ++++++++++-- code/game/gamemodes/blob/blob_report.dm | 12 +++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 57142c95a7d..870b01faab1 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -55,6 +55,13 @@ var/list/blob_nodes = list() return 1 +/datum/game_mode/blob/proc/get_nuke_code() + var/nukecode = "ERROR" + for(var/obj/machinery/nuclearbomb/bomb in world) + if(bomb && bomb.r_code && bomb.z == 1) + nukecode = bomb.r_code + return nukecode + /datum/game_mode/blob/announce() world << "The current game mode is - Blob!" @@ -175,9 +182,10 @@ var/list/blob_nodes = list() return if (2) - command_alert("The biohazard has grown out of control and will soon reach critical mass. Activate the nuclear failsafe to mantain quarantine.", "Biohazard Alert") - set_security_level("delta") + command_alert("The biohazard has grown out of control and will soon reach critical mass. Activate the nuclear failsafe to mantain quarantine. The Nuclear Authentication Code is [get_nuke_code()] ", "Biohazard Alert") + set_security_level("gamma") send_intercept(2) + spawn(10) world << sound('sound/effects/siren.ogg') return return diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index d16a64272c0..36c6f458544 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -11,7 +11,7 @@ interceptname = "Biohazard Alert" intercepttext += "NanoTrasen Update: Biohazard Alert.
" intercepttext += "Reports indicate the probable transfer of a biohazardous agent onto [station_name()] during the last crew deployment cycle.
" - intercepttext += "Preliminary analysis of the organism classifies it as a level 5 biohazard. Its origin is unknown.
" + intercepttext += "Preliminary analysis of the organism classifies it as a level 7 biohazard. Its origin is unknown.
" intercepttext += "NanoTrasen has issued a directive 7-10 for [station_name()]. The station is to be considered quarantined.
" intercepttext += "Orders for all [station_name()] personnel follows:
" intercepttext += " 1. Do not leave the quarantine area.
" @@ -21,11 +21,6 @@ intercepttext += "
Note in the event of a quarantine breach or uncontrolled spread of the biohazard, the directive 7-10 may be upgraded to a directive 7-12.
" intercepttext += "Message ends." if(2) - var/nukecode = "ERROR" - for(var/obj/machinery/nuclearbomb/bomb in world) - if(bomb && bomb.r_code) - if(bomb.z == 1) - nukecode = bomb.r_code interceptname = "Directive 7-12" intercepttext += "NanoTrasen Update: Biohazard Alert.
" intercepttext += "Directive 7-12 has been issued for [station_name()].
" @@ -33,12 +28,11 @@ intercepttext += "Your orders are as follows:
" intercepttext += "1. Secure the Nuclear Authentication Disk.
" intercepttext += "2. Detonate the Nuke located in the Station's Vault.
" - intercepttext += "Nuclear Authentication Code: [nukecode]
" + intercepttext += "Nuclear Authentication Code: [get_nuke_code()]
" intercepttext += "Message ends." - spawn(10) world << sound('sound/effects/siren.ogg') for (var/mob/living/silicon/ai/aiPlayer in player_list) if (aiPlayer.client) - var/law = "The station is under quarantine, prevent biological entities from leaving the station at all costs while minimizing collateral damage. The nuclear failsafe must be activated at any cost, the code is: [nukecode]." + var/law = "The station is under quarantine, prevent biological entities from leaving the station at all costs while minimizing collateral damage. The nuclear failsafe must be activated at any cost, the code is: [get_nuke_code()]." aiPlayer.set_zeroth_law(law) aiPlayer << "\red You have detected a change in your laws information:" aiPlayer << "Laws Updated: [law]" From 8b5e8fe3b6dc94e3710f5c7dff5cccb29c177c8c Mon Sep 17 00:00:00 2001 From: alex-gh Date: Sun, 5 Jan 2014 20:24:55 +0100 Subject: [PATCH 3/3] 'Nuke the station' stage starts even earlier --- code/game/gamemodes/blob/blob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 870b01faab1..6b6db7d0768 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -24,7 +24,7 @@ var/list/blob_nodes = list() var/blob_point_rate = 3 var/blobwincount = 700 - var/stage_2_threshold = 0.66 + var/stage_2_threshold = 0.60 var/list/infected_crew = list()