duncathan a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs ...

Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm

2016-04-03 18:22:20 -06:00

..

holiday

turf/open and turf/closed

2016-03-29 13:38:56 -06:00

wizard

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

_event.dm

Adds two new events-related config options

2016-03-30 02:16:04 +03:00

abductor.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

alien_infestation.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

anomaly_bluespace.dm

ultra range again

2016-02-03 07:58:41 +00:00

anomaly_flux.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

anomaly_grav.dm

safepick

2016-01-18 05:46:44 +00:00

anomaly_pyro.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

anomaly_vortex.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

anomaly.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

blob.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

brand_intelligence.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

camerafailure.dm

- you now only see turfs when inside gas pipes.

2016-02-04 00:33:16 +01:00

carp_migration.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

communications_blackout.dm

…

disease_outbreak.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

dust.dm

…

electrical_storm.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

false_alarm.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

immovable_rod.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

ion_storm.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

mass_hallucination.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

meateor_wave.dm

…

meteor_wave.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

operative.dm

…

portal_storm.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

prison_break.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

radiation_storm.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

shuttle_loan.dm

turf/open and turf/closed

2016-03-29 13:38:56 -06:00

spacevine.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

2016-04-03 18:22:20 -06:00

spider_infestation.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

spontaneous_appendicitis.dm

Adds minimal players requirements for random event

2016-03-29 08:49:17 +03:00

vent_clog.dm

simpler probability

2016-03-05 20:36:16 +00:00

weightless.dm

…

wormholes.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

2016-04-03 18:22:20 -06:00