diff --git a/code/game/gamemodes/events/biomass.dm b/code/game/gamemodes/events/biomass.dm index 8cbfe8cc47..d1508221f7 100644 --- a/code/game/gamemodes/events/biomass.dm +++ b/code/game/gamemodes/events/biomass.dm @@ -163,10 +163,11 @@ spawn() //to stop the secrets panel hanging var/list/turf/simulated/floor/turfs = list() //list of all the empty floor turfs in the hallway areas for(var/areapath in typesof(/area/hallway)) - var/area/hallway/A = locate(areapath) - for(var/turf/simulated/floor/F in A) - if(!F.contents.len) - turfs += F + var/area/A = locate(areapath) + for(var/area/B in A.related) + for(var/turf/simulated/floor/F in B.contents) + if(!F.contents.len) + turfs += F if(turfs.len) //Pick a turf to spawn at if we can var/turf/simulated/floor/T = pick(turfs) diff --git a/code/game/gamemodes/events/spacevines.dm b/code/game/gamemodes/events/spacevines.dm index bf0b0fe99f..3ff70acbdf 100644 --- a/code/game/gamemodes/events/spacevines.dm +++ b/code/game/gamemodes/events/spacevines.dm @@ -248,10 +248,11 @@ spawn() //to stop the secrets panel hanging var/list/turf/simulated/floor/turfs = list() //list of all the empty floor turfs in the hallway areas for(var/areapath in typesof(/area/hallway)) - var/area/hallway/A = locate(areapath) - for(var/turf/simulated/floor/F in A) - if(!F.contents.len) - turfs += F + var/area/A = locate(areapath) + for(var/area/B in A.related) + for(var/turf/simulated/floor/F in B.contents) + if(!F.contents.len) + turfs += F if(turfs.len) //Pick a turf to spawn at if we can var/turf/simulated/floor/T = pick(turfs) diff --git a/code/global.dm b/code/global.dm index 8e1c8dc1c9..c7b2404e0a 100644 --- a/code/global.dm +++ b/code/global.dm @@ -81,7 +81,7 @@ var/secret_force_mode = "secret" // if this is anything but "secret", the secret var/datum/engine_eject/engine_eject_control = null var/host = null -var/aliens_allowed = 1 +var/aliens_allowed = 0 var/ooc_allowed = 1 var/dooc_allowed = 1 var/traitor_scaling = 1 diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index 524e5b55dd..38e86ec0e5 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -58,17 +58,17 @@ possibleEvents[/datum/event/meteor_shower] = 80 * active_with_role["Engineer"] possibleEvents[/datum/event/blob] = 30 * active_with_role["Engineer"] - possibleEvents[/datum/event/viral_infection] = active_with_role["Medical"] * 50 + possibleEvents[/datum/event/viral_infection] = 25 + active_with_role["Medical"] * 25 if(active_with_role["Medical"] > 0) possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 100 - possibleEvents[/datum/event/viral_outbreak] = active_with_role["Medical"] * 25 - possibleEvents[/datum/event/spontaneous_appendicitis] = active_with_role["Medical"] * 50 + possibleEvents[/datum/event/spontaneous_appendicitis] = active_with_role["Medical"] * 75 + possibleEvents[/datum/event/viral_outbreak] = active_with_role["Medical"] * 5 if(active_with_role["Security"] > 0) possibleEvents[/datum/event/prison_break] = active_with_role["Security"] * 50 if(!sent_spiders_to_station) possibleEvents[/datum/event/spider_infestation] = max(active_with_role["Security"], 5) + 5 - if(!sent_aliens_to_station) + if(aliens_allowed && !sent_aliens_to_station) possibleEvents[/datum/event/alien_infestation] = max(active_with_role["Security"], 5) + 2.5 if(!sent_ninja_to_station && toggle_space_ninja) possibleEvents[/datum/event/space_ninja] = max(active_with_role["Security"], 5) diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index 5a0053ed58..513f83ea5e 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -58,13 +58,13 @@ spawn_area_type = /area/assembly/assembly_line locstring = "the unused assembly line" - world << "looking for [spawn_area_type]" + //world << "looking for [spawn_area_type]" for(var/areapath in typesof(spawn_area_type)) - world << " checking [areapath]" + //world << " checking [areapath]" var/area/A = locate(areapath) - world << " A: [A], contents.len: [A.contents.len]" + //world << " A: [A], contents.len: [A.contents.len]" for(var/area/B in A.related) - world << " B: [B], contents.len: [B.contents.len]" + //world << " B: [B], contents.len: [B.contents.len]" for(var/turf/simulated/floor/F in B.contents) if(!F.contents.len) turfs += F diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 99381288ad..8f248f8592 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -1,10 +1,12 @@ /var/global/spacevines_spawned = 0 -//not working: wait for fix in TG code - /datum/event/spacevine oneShot = 1 /datum/event/spacevine/start() - spacevine_infestation() + //biomass is basically just a resprited version of space vines + if(prob(50)) + spacevine_infestation() + else + biomass_infestation() spacevines_spawned = 1 diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm index 1069d7b7a8..3644905d8c 100644 --- a/code/modules/events/viral_infection.dm +++ b/code/modules/events/viral_infection.dm @@ -8,7 +8,7 @@ datum/event/viral_infection/setup() severity = rand(1, 3) datum/event/viral_infection/announce() - command_alert("Confirmed outbreak of level [severity + rand(0,3)] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") + command_alert("Confirmed outbreak of level [severity + rand(2,3)] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") world << sound('sound/AI/outbreak5.ogg') datum/event/viral_infection/start() diff --git a/code/modules/events/viral_outbreak.dm b/code/modules/events/viral_outbreak.dm index 68f47342b1..49fbcdebd6 100644 --- a/code/modules/events/viral_outbreak.dm +++ b/code/modules/events/viral_outbreak.dm @@ -8,7 +8,7 @@ datum/event/viral_outbreak/setup() severity = rand(2, 4) datum/event/viral_outbreak/announce() - command_alert("Confirmed outbreak of level [severity + rand(0,6)] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") + command_alert("Confirmed outbreak of level [severity + rand(3,5)] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") world << sound('sound/AI/outbreak7.ogg') datum/event/viral_outbreak/start()