cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed biomass/spacevine spawning, tweaked event probabilities, made aliens default to disabled as a random event

Browse Source 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-02-14 23:17:54 +10:00
parent d1e6e342c5
commit ff222c2f13
8 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/game/gamemodes/events/biomass.dm
View File

@@ -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)

9
code/game/gamemodes/events/spacevines.dm
View File

@@ -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)

2
code/global.dm
View File

@@ -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

8
code/modules/events/event_dynamic.dm
View File

@@ -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)

8
code/modules/events/infestation.dm
View File

@@ -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

8
code/modules/events/spacevine.dm
View File

@@ -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

2
code/modules/events/viral_infection.dm
View File

@@ -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()

2
code/modules/events/viral_outbreak.dm
View File

@@ -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()