LetterJay 518b264654 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783 ...

# Conflicts:
#	_maps/map_files/generic/CentCom.dmm
#	code/modules/mob/living/living.dm

2017-12-29 01:34:17 -06:00

..

holiday

Christmas event changes (#33861)

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

wizard

Merge branch 'master' into upstream-merge-33246

2017-12-20 00:27:06 -06:00

_event.dm

Removes typepath from random event admin message

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

abductor.dm

…

alien_infestation.dm

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

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

anomaly_bluespace.dm

…

anomaly_flux.dm

…

anomaly_grav.dm

…

anomaly_pyro.dm

…

anomaly_vortex.dm

…

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

Defines math, take 2

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

camerafailure.dm

…

carp_migration.dm

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

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

communications_blackout.dm

…

devil.dm

…

disease_outbreak.dm

more save points

2017-12-29 00:07:36 -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

…

immovable_rod.dm

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

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

ion_storm.dm

…

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

…

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

dock() re-organization

2017-12-18 21:23:58 -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

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

2017-12-16 13:08:50 -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

…

spider_infestation.dm

…

spontaneous_appendicitis.dm

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

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

vent_clog.dm

…

weightless.dm

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

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

wormholes.dm

…