phil235 45cfe07f98 Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix ...

Conflicts:
	code/modules/recycling/disposal.dm

2014-10-15 18:23:40 +02: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 DisplacedGirderFix

2014-10-15 18:23:40 +02:00

living

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

2014-10-15 18:23:40 +02:00

new_player

updated sprites, grey stuff

2014-10-08 10:38:24 -07:00

death.dm

…

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

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

Removed some useless comments from years ago.

2014-03-12 07:59:34 -05:00

mob_defines.dm

The rest of the junk

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

mob_grab.dm

Fixes two runtimes related to the grab object.

2014-09-12 06:39:31 -03:00

mob_helpers.dm

big commit, handcuff overhaul

2014-10-08 13:19:54 -07:00

mob_movement.dm

Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.

2014-10-15 18:03:06 +02:00

mob_transformation_simple.dm

The rest of the junk

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

mob.dm

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07: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 Robotize() work properly again. Fixed #4834

2014-09-15 18:01:26 +02:00

update_icons.dm

…