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

..

camera

Update camera.dm

2017-12-17 17:38:00 -06:00

dead

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

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

living

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

death.dm

…

emote.dm

oops

2017-12-27 07:08:26 -06:00

inventory.dm

…

login.dm

Merge branch 'master' into upstream-merge-33246

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

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

[Ready Again]Refactors disabilities into lists, allowing for independent disability sources

2017-12-18 15:19:53 -06:00

mob_helpers.dm

Gibber rebalance (#33737)

2017-12-22 18:03:38 -06:00

mob_movement.dm

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

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

mob_transformation_simple.dm

…

mob.dm

Merge pull request #33951 from AnturK/perspective_fix

2017-12-31 09:58:02 -06:00

say_readme.dm

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

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

say_vr.dm

…

say.dm

Update say.dm

2017-12-25 21:32:05 -06:00

status_procs.dm

fk

2017-12-29 01:20:09 -06:00

transform_procs.dm

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

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

update_icons.dm

…