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

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

2016-05-23 23:24:02 +01:00

..

camera

invisibility = 100 and 101 now use defines.

2016-04-29 01:00:05 +02:00

dead

Adds literacy check to reading and writing papers.

2016-05-12 13:42:48 -04:00

living

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

2016-05-23 23:24:02 +01:00

new_player

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

death.dm

…

interactive.dm

Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.

2016-05-05 18:17:51 +02:00

inventory.dm

Revert "Move some stuff from different layers to different planes"

2016-04-29 16:07:23 -05:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

…

mob_grab.dm

Revert "Move some stuff from different layers to different planes"

2016-04-29 16:07:23 -05:00

mob_helpers.dm

Some adjustments, following suggestions in the PR discussion.

2016-05-05 21:50:30 +02:00

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

Adds literacy check to reading and writing papers.

2016-05-12 13:42:48 -04:00

say_readme.dm

…

say.dm

…

status_procs.dm

* Fixes the holosign_creator's sign counter not going back up when one of its holosign is destroyed.

2016-04-28 00:13:15 +02:00

transform_procs.dm

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

update_icons.dm

…