Rolan7 0fa91b06f1 Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401 ...

Conflicts:
	code/modules/mob/living/carbon/monkey/monkey.dm - I don't know why it thought there was a conflict.  Opening it in tortoisemerge showed no conflicts and automatically cleared the status.  I reset to the repo's version just to be safe, then re-added my freakin 2 line function which has caused 2-3 "conflicts" so far.

2014-07-07 13:42:31 -04:00

..

camera

Fixes cyborgs spawning as ghosts.

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

dead

ghostize() won't create mindless ghosts of a fake ckey generated by aghost anymore.

2014-04-30 07:15:20 -03:00

living

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

2014-07-07 13:42:31 -04:00

new_player

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

2014-07-07 13:42:31 -04: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

Fixes hotkey mode always being set during login. winget() was returning "true", not 1 or 0. It now compares for the string.

2014-04-21 00:40:23 +01: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

Removing TLE comment stamps and useless comments

2014-03-13 08:25:28 -05:00

mob_grab.dm

Make grabs GC, fix a grab related runtime

2014-04-20 09:14:16 -07:00

mob_helpers.dm

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

2014-07-07 13:42:31 -04:00

mob_movement.dm

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

2014-06-09 20:26:17 +01:00

mob_transformation_simple.dm

New Human Mobs will have the appearance of the client's preferences

2014-04-27 14:40:28 -06:00

mob.dm

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

2014-07-07 13:42:31 -04:00

say.dm

- Added killswitches to say, whisper, me, ooc, adminhelp and pray to try to determine if communication verbs are the cause of the constant lag we're getting. Toggle the killswitch with the 'disable communication verbs' verb, available in debug verbs.

2013-01-18 03:04:46 +00:00

transform_procs.dm

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

2014-07-07 13:42:31 -04: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