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

Browse Source

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

...

This commit is contained in:

LetterJay

2018-01-02 05:17:29 -06:00

parent f2f6d9d910 3fafbe8bc5

commit d13d76ad71

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available