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

..

arrivals.dm

dock() re-organization

2017-12-18 21:23:58 -06:00

assault_pod.dm

dock() re-organization

2017-12-18 21:23:58 -06:00

computer.dm

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -06:00

docking.dm

dock() re-organization

2017-12-18 21:23:58 -06:00

elevator.dm

dock() re-organization

2017-12-18 21:23:58 -06:00

emergency.dm

dock() re-organization

2017-12-18 21:23:58 -06:00

ferry.dm

Adds desc to things lacking them.

2017-10-01 15:07:37 -05:00

manipulator.dm

dock() re-organization

2017-12-18 21:23:58 -06:00

navigation_computer.dm

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

on_move.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

ripple.dm

[MIRROR] Adds defines for mouse_opacity (#2381)

2017-08-21 20:29:37 -07:00

shuttle_rotate.dm

Merge branch 'master' into upstream-merge-33621

2017-12-30 13:23:39 -06:00

shuttle.dm

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

2018-01-01 14:09:07 -06:00

special.dm

Cleans up goldcore defines

2017-11-26 16:51:44 -06:00

supply.dm

Replace explicit z-level checks with defines

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

syndicate.dm

Replace explicit z-level checks with defines

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

white_ship.dm

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

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