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

Conflicts:
	config/admins.txt

2015-01-03 07:07:03 -06:00

..

camera

Fixes cyborgs spawning as ghosts.

2014-04-13 13:04:36 +01:00

dead

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

2014-12-28 11:20:15 +03:00

living

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

2015-01-03 07:07:03 -06:00

new_player

Fixing merge conflicts.

2014-12-27 02:17:07 -06:00

death.dm

* Refactored gib() and dust()

2013-12-23 17:56:58 +00:00

inventory.dm

Added a "put_in_hand_check" which returns 1 if the item can be equipped in the hand. Replaced the duplicated checks in "put_in_l/r_hand"

2014-04-28 19:26:09 +01:00

login.dm

/datum/atom_hud (Passive HUDs) bugfixes

2014-12-06 15:05:23 -03:00

logout.dm

Whoops

2014-01-06 21:27:50 -05:00

mob_cleanup.dm

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

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

mob_defines.dm

Merge pull request #6324 from Razharas/GenShit

2014-12-31 17:24:15 -03:00

mob_grab.dm

Tiny clean up, still lots of work to do

2014-12-12 23:57:11 +03:00

mob_helpers.dm

Added datum mutations

2014-12-12 04:48:11 +03:00

mob_movement.dm

Merge pull request #5641 from MrPerson/autoghosting

2014-12-26 21:35:58 -03:00

mob_transformation_simple.dm

The rest of the junk

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

mob.dm

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

2014-12-28 11:20:15 +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

Fixed some shiet

2014-12-21 08:19:23 +03:00

update_icons.dm

General cleanup

2014-12-29 11:36:01 +03:00