cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 14:37:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes the early classified announcement from the blob gamemode (#16049)

Browse Source 
* Removes the early classified announcement

* removes the lies of the 30 seconds

* who needs sleep

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* compensating

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2021-05-22 21:54:03 +01:00
committed by GitHub
co-authored by S34N
parent dbd60a6db4
commit 97b758707e
3 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/blob/blob.dm
+6 -20
View File
@@ -15,7 +15,6 @@ GLOBAL_LIST_EMPTY(blob_nodes)
recommended_enemies = 1
restricted_jobs = list("Cyborg", "AI")
var/declared = 0
var/burst = 0
var/cores_to_spawn = 1
@@ -75,8 +74,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
log_game("[key_name(blob)] has been selected as a Blob")
greet_blob(blobmind)
to_chat(blob, "<span class='userdanger'>You feel very tired and bloated! You don't have long before you burst!</span>")
spawn(600)
burst_blob(blobmind)
addtimer(CALLBACK(src, .proc/burst_blob, blobmind), 60 SECONDS)
return 1
/datum/game_mode/blob/proc/make_blobs(count)
@@ -128,8 +126,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
if(!warned)
to_chat(C, "<span class='userdanger'>You feel ready to burst, but this isn't an appropriate place! You must return to the station!</span>")
message_admins("[key_name_admin(C)] was in space when the blobs burst, and will die if [C.p_they()] [C.p_do()] not return to the station.")
spawn(300)
burst_blob(blob, 1)
addtimer(CALLBACK(src, .proc/burst_blob, blob, 1), 30 SECONDS)
else
burst++
log_admin("[key_name(C)] was in space when attempting to burst as a blob.")
@@ -173,33 +170,22 @@ GLOBAL_LIST_EMPTY(blob_nodes)
show_message("<span class='userdanger'>You feel like you are about to burst.</span>")
sleep(wait_time / 2)
burst_blobs()
// Stage 0
sleep(wait_time)
stage(0)
addtimer(CALLBACK(src, .proc/burst_blobs), (wait_time / 2))
// Stage 1
sleep(wait_time)
stage(1)
addtimer(CALLBACK(src, .proc/stage, 1), (wait_time * 2 + wait_time / 2))
// Stage 2
sleep(30000)
stage(2)
addtimer(CALLBACK(src, .proc/stage, 2), 50 MINUTES)
return ..()
/datum/game_mode/blob/proc/stage(stage)
switch(stage)
if(0)
send_intercept(1)
declared = 1
if(1)
GLOB.event_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg')
if(2)
send_intercept(2)
send_intercept(1)
/datum/game_mode/proc/update_blob_icons_added(datum/mind/mob_mind)
var/datum/atom_hud/antag/antaghud = GLOB.huds[ANTAG_HUD_BLOB]
code/game/gamemodes/blob/blob_finish.dm
-1
View File
@@ -26,7 +26,6 @@
to_chat(world, "<FONT size = 3><B>The staff has won!</B></FONT>")
to_chat(world, "<B>The alien organism has been eradicated from the station</B>")
log_game("Blob mode completed with a crew victory.")
to_chat(world, "<span class='notice'>Rebooting in 30s</span>")
..()
return 1
code/game/gamemodes/blob/blob_report.dm
-13
View File
@@ -5,19 +5,6 @@
if(0)
return
if(1)
interceptname = "Level 5-6 Biohazard Response Procedures"
intercepttext += "<FONT size = 3><B>Nanotrasen Update</B>: Biohazard Alert.</FONT><HR>"
intercepttext += "Reports indicate the probable transfer of a biohazardous agent onto [station_name()] during the last crew deployment cycle.<BR>"
intercepttext += "Preliminary analysis of the organism classifies it as a level 5 biohazard. Its origin is unknown.<BR>"
intercepttext += "Nanotrasen has issued a directive 7-10 for [station_name()]. The station is to be considered quarantined.<BR>"
intercepttext += "Orders for all [station_name()] personnel follows:<BR>"
intercepttext += " 1. Do not leave the quarantine area.<BR>"
intercepttext += " 2. Locate any outbreaks of the organism on the station.<BR>"
intercepttext += " 3. If found, use any neccesary means to contain the organism.<BR>"
intercepttext += " 4. Avoid damage to the capital infrastructure of the station.<BR>"
intercepttext += "<BR>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.<BR>"
intercepttext += "Message ends."
if(2)
var/nukecode = rand(10000, 99999)
for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines)
if(bomb && bomb.r_code)