diff --git a/baystation12.dme b/baystation12.dme index 705634e27f1..aa2cd638631 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -216,8 +216,6 @@ #include "code\game\gamemodes\setupgame.dm" #include "code\game\gamemodes\autotraitor\autotraitor.dm" #include "code\game\gamemodes\blob\blob.dm" -#include "code\game\gamemodes\blob\blob_finish.dm" -#include "code\game\gamemodes\blob\blob_report.dm" #include "code\game\gamemodes\blob\theblob.dm" #include "code\game\gamemodes\blob\blobs\core.dm" #include "code\game\gamemodes\blob\blobs\factory.dm" diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 7cca20dfac0..e53053764b2 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -6,7 +6,7 @@ var/list/blob_cores = list() var/list/blob_nodes = list() -/datum/game_mode/blob +/*/datum/game_mode/blob name = "blob" config_tag = "blob" required_players = 0 @@ -130,3 +130,4 @@ var/list/blob_nodes = list() stage = 3 return +*/ \ No newline at end of file diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 1261642e4f6..0883b1a2747 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -132,10 +132,10 @@ proc/move_mining_shuttle() usr.set_machine(src) src.add_fingerprint(usr) if(href_list["move"]) - if(ticker.mode.name == "blob") - if(ticker.mode:declared) - usr << "Under directive 7-10, [station_name()] is quarantined until further notice." - return + //if(ticker.mode.name == "blob") + // if(ticker.mode:declared) + // usr << "Under directive 7-10, [station_name()] is quarantined until further notice." + // return if (!mining_shuttle_moving) usr << "\blue Shuttle recieved message and will be sent shortly." diff --git a/code/modules/research/research_shuttle.dm b/code/modules/research/research_shuttle.dm index 875c33fe8bb..1fe54587498 100644 --- a/code/modules/research/research_shuttle.dm +++ b/code/modules/research/research_shuttle.dm @@ -81,10 +81,10 @@ proc/move_research_shuttle() usr.machine = src src.add_fingerprint(usr) if(href_list["move"]) - if(ticker.mode.name == "blob") - if(ticker.mode:declared) - usr << "Under directive 7-10, [station_name()] is quarantined until further notice." - return + //if(ticker.mode.name == "blob") + // if(ticker.mode:declared) + // usr << "Under directive 7-10, [station_name()] is quarantined until further notice." + // return if (!research_shuttle_moving) usr << "\blue Shuttle recieved message and will be sent shortly."