Commit Graph

15 Commits

Author SHA1 Message Date
PsiOmega
7bb5b51954 Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event
Conflicts:
	code/modules/events/event_manager.dm
2014-11-12 10:18:45 +01:00
PsiOmega
574a8f5570 Completes the basic random event manager. 2014-11-08 18:22:31 +01:00
PsiOmega
66483cf6dd Completes the transfer to the refreshed announcement system. 2014-10-07 13:19:20 +02:00
PsiOmega
4ac1b6a7e1 Replaces the now non-existing "unused assembly line" with another area. 2014-05-01 13:33:58 +02:00
Chinsky
039de3df1a Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-23 00:12:26 +04:00
Chinsky
1d1cea12ad Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/modules/events/infestation.dm
2013-02-22 23:46:41 +04:00
Cael_Aislinn
a5a8caeb00 fixed compile error
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 02:30:32 +10:00
Cael_Aislinn
306cffb46c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/modules/events/event_manager.dm
	code/modules/events/infestation.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-22 23:59:38 +10:00
Chinsky
a1a29e76a7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/modules/events/infestation.dm
2013-02-21 12:00:33 +04:00
Cael_Aislinn
93ef7b83d8 replaced infestation slimes with spiderlings (with 0% chance to grow into giant spiders), reduced spiderling noisiness, made them less jittery (easier to squish)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-20 20:56:09 +10:00
Cael_Aislinn
ad227f0925 removed debug string, bumped event intervals, decreased probability of some events
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 15:12:00 +10:00
Cael_Aislinn
8cd47739d2 removed event debug string, bumped up minimum event interval, tweak to space carp
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 14:04:33 +10:00
Cael_Aislinn
24763f8bb0 removed debug output, cleanup of alien languages, bumped tajaran darkseeing
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-18 13:07:01 +10:00
Cael_Aislinn
ff222c2f13 fixed biomass/spacevine spawning, tweaked event probabilities, made aliens default to disabled as a random event
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-14 23:17:54 +10:00
Cael_Aislinn
d89c4e744f renamed a file, added rogue drones random event (laser drones spawn and fly around the map, teleport out after a while), added infestation random event (lizards, mice, slimes spawn on the map in some rooms)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-13 17:50:57 +10:00