Remie Richards 5343f2d1fa Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAcidBalance ...

Conflicts:
	code/modules/mob/living/living_defense.dm

2014-11-26 19:01:17 +00:00

..

camera

…

dead

Includes antag HUDs in the datum hud overhaul

2014-11-20 15:43:51 -03:00

living

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

2014-11-26 19:01:17 +00:00

new_player

Updates labcoats in the preferences setup screen to appear closed and changes the lawyer's shoes to be lace ups instead of brown.

2014-11-09 19:30:33 -06:00

death.dm

…

inventory.dm

…

login.dm

Removing many instances of the no longer used second argument of message_admins() proc.

2014-10-05 01:29:30 +02:00

logout.dm

…

mob_cleanup.dm

Cuts /disease variables from 28 to 23 (includes new ones)

2014-10-30 06:21:14 +00:00

mob_defines.dm

Includes antag HUDs in the datum hud overhaul

2014-11-20 15:43:51 -03:00

mob_grab.dm

Fixes being able to phase through windows using grabs. Fixed #3957

2014-11-08 13:21:55 +01:00

mob_helpers.dm

Makes data huds passive.

2014-11-16 01:52:06 -03:00

mob_movement.dm

Throwing bugfixes

2014-11-09 00:29:20 -08:00

mob_transformation_simple.dm

The rest of the junk

2014-09-05 18:14:02 +04:00

mob.dm

Includes antag HUDs in the datum hud overhaul

2014-11-20 15:43:51 -03:00

say_readme.dm

The rest of the junk

2014-09-05 18:14:02 +04:00

say.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

transform_procs.dm

Makes data huds passive.

2014-11-16 01:52:06 -03:00

update_icons.dm

…