LetterJay f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 ...

# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm

2018-01-02 05:16:13 -06:00

..

holiday

Christmas event changes (#33861)

2017-12-29 00:28:02 -06:00

wizard

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

_event.dm

Removes typepath from random event admin message

2017-12-29 00:28:10 -06:00

abductor.dm

Fixes abductor teams getting assigned to same pod (#32859)

2017-11-20 19:36:10 -06:00

alien_infestation.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-02 05:16:13 -06:00

anomaly_bluespace.dm

…

anomaly_flux.dm

Update anomaly_flux.dm

2017-11-12 08:10:56 -06:00

anomaly_grav.dm

Update anomaly_grav.dm

2017-11-12 08:11:06 -06:00

anomaly_pyro.dm

…

anomaly_vortex.dm

Update anomaly_vortex.dm

2017-11-12 08:11:14 -06:00

anomaly.dm

…

blob.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

brand_intelligence.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

camerafailure.dm

Fixes some broken random events (#33345)

2017-12-08 10:34:50 -06:00

carp_migration.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

communications_blackout.dm

Update communications_blackout.dm

2017-11-12 08:11:28 -06:00

devil.dm

…

disease_outbreak.dm

Update disease_outbreak.dm

2017-12-30 13:32:46 -06:00

dust.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

electrical_storm.dm

…

false_alarm.dm

…

ghost_role.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

grid_check.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

immovable_rod.dm

Immovable rod abuse, smite and event trigger. (#33681)

2017-12-21 00:11:20 -06:00

ion_storm.dm

Replaces a bunch of mob loops with hopefully better ones

2017-11-16 16:09:15 -06:00

major_dust.dm

…

mass_hallucination.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

meateor_wave.dm

…

meteor_wave.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

mice_migration.dm

Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947

2017-11-13 11:52:40 -06:00

nightmare.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

operative.dm

Update operative.dm

2017-12-19 19:35:41 -06:00

pirates.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

portal_storm.dm

Defines math, take 2

2017-12-17 10:02:43 -06:00

prison_break.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

processor_overload.dm

…

radiation_storm.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

sentience.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

shuttle_loan.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

solar_flare.dm

…

spacevine.dm

Cleans up unused code

2017-11-20 10:14:32 -06:00

spider_infestation.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-02 05:16:13 -06:00

spontaneous_appendicitis.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

vent_clog.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-02 05:16:13 -06:00

weightless.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

wormholes.dm

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00