Remie Richards 80b4c3ca7f Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui ...

Conflicts:
	tgui/assets/tgui.css
	tgui/assets/tgui.js

2016-05-28 00:24:58 +01:00

..

camera

…

dead

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

living

Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui

2016-05-28 00:24:58 +01:00

new_player

Fixes observers being called ghost

2016-05-25 06:15:19 +01:00

death.dm

…

interactive.dm

Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.

2016-05-24 01:28:04 +02:00

inventory.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

mob_helpers.dm

Shuttle manipulator (#17436)

2016-05-26 15:15:19 +02:00

mob_movement.dm

Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.

2016-05-24 01:28:04 +02:00

mob_transformation_simple.dm

…

mob.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

say_readme.dm

…

say.dm

Made Restore Ghost Character affect deadchat only

2016-05-24 15:04:04 +01:00

status_procs.dm

…

transform_procs.dm

…

update_icons.dm

…