LetterJay 6286f4d4c2 Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00

..

holiday

Adds new valentines; replaces outdated/shitty ones. (#32144)

2017-10-29 11:04:04 -05:00

wizard

[MIRROR] Fixes various spelling and grammar errors. (#3436)

2017-10-21 07:10:23 -05:00

_event.dm

Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00

abductor.dm

…

alien_infestation.dm

…

anomaly_bluespace.dm

…

anomaly_flux.dm

…

anomaly_grav.dm

…

anomaly_pyro.dm

…

anomaly_vortex.dm

…

anomaly.dm

…

blob.dm

Update blob.dm

2017-10-22 10:51:21 -05:00

brand_intelligence.dm

[MIRROR] Fixes various spelling and grammar errors. (#3436)

2017-10-21 07:10:23 -05:00

camerafailure.dm

…

carp_migration.dm

…

communications_blackout.dm

…

devil.dm

…

disease_outbreak.dm

…

dust.dm

…

electrical_storm.dm

…

false_alarm.dm

Update false_alarm.dm

2017-10-22 10:55:42 -05:00

ghost_role.dm

…

grid_check.dm

…

immovable_rod.dm

512 forward compatibility merge

2017-10-29 10:28:36 -05:00

ion_storm.dm

…

major_dust.dm

…

mass_hallucination.dm

…

meateor_wave.dm

…

meteor_wave.dm

Merge pull request #32150 from MrStonedOne/patch-442

2017-10-30 14:51:44 -05:00

mice_migration.dm

…

nightmare.dm

Uses the proper list for xeno landmarks/nightmare spawning (#31470)

2017-10-09 16:00:24 -05:00

operative.dm

…

portal_storm.dm

…

prison_break.dm

…

processor_overload.dm

…

radiation_storm.dm

…

sentience.dm

…

shuttle_loan.dm

[MIRROR] Fixes various spelling and grammar errors. (#3436)

2017-10-21 07:10:23 -05:00

solar_flare.dm

…

spacevine.dm

Merge branch 'master' into upstream-merge-32161

2017-11-11 23:02:13 -06:00

spider_infestation.dm

…

spontaneous_appendicitis.dm

…

vent_clog.dm

…

weightless.dm

…

wormholes.dm

Fixes/tweaks wormholes event and portals (#30846)

2017-10-03 04:37:35 -05:00