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

..

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

Merge pull request #31947 from AnturK/yarr

2017-11-13 03:19:38 -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

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

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

ripple.dm

[MIRROR] Adds defines for mouse_opacity (#2381)

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

shuttle_rotate.dm

Airlock Construction Update

2017-12-10 15:23:34 -06:00

shuttle.dm

Merge branch 'master' into upstream-merge-33627

2017-12-27 04:41:27 -06:00

special.dm

Cleans up goldcore defines

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

supply.dm

dock() re-organization

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

syndicate.dm

Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731)

2017-12-22 10:35:47 -06:00

white_ship.dm

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

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