phil235 1d96ef944d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackHandFix ...

Conflicts:
	code/game/machinery/turrets.dm
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
	code/modules/mob/living/carbon/alien/larva/larva.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackalien.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2014-11-07 21:47:18 +01:00

..

camera

Fixes cyborgs spawning as ghosts.

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

dead

Fixes ghost pointing

2014-11-02 15:24:03 -03:00

living

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

2014-11-07 21:47:18 +01:00

new_player

Merge pull request #5630 from GunHog/Soft_Silky_Hair

2014-11-03 17:37:55 -08: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

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

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

logout.dm

Whoops

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

mob_cleanup.dm

Removed some useless comments from years ago.

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

mob_defines.dm

Space movement rewrite to allow everything to drift

2014-10-25 23:19:46 -07:00

mob_grab.dm

Keep the define around as that is a good idea

2014-10-20 22:49:06 +13:00

mob_helpers.dm

big commit, handcuff overhaul

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

mob_movement.dm

Added a changelog entry

2014-10-28 07:37:31 -07: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 AttackAnimation

2014-11-04 18:55:07 +01: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

Logic fix + Tweaks

2014-10-28 10:23:56 -05:00

update_icons.dm

update_icons() uses animate() and transforms to actually turn the sprite rather than needing them pre-turned. Mobs that lie down do so with an animation rather than appearing on their side. You can lie down facing THE LEFT OH SHIT.

2013-12-23 02:19:15 -08:00