ccomp5950 dd2db22e64 Fix previous merge conflict oopsie. ...

1b10f78940

2015-12-28 19:31:14 -05:00

..

dead

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-02 09:18:07 +01:00

freelook

The AI can now toggle hologram eye tracking.

2015-12-01 12:18:00 +01:00

language

Merge remote-tracking branch 'upstream/dev-freeze' into dev.

2015-12-06 11:48:20 +01:00

living

Fix previous merge conflict oopsie.

2015-12-28 19:31:14 -05:00

new_player

Added checks for character age to numerous jobs.

2015-12-22 13:24:12 +01:00

animations.dm

Add /tg/-style attack animations

2015-11-20 15:45:16 -05:00

death.dm

…

emote.dm

Fixes #11667

2015-12-12 13:57:26 +03:00

gender.dm

…

hear_say.dm

…

holder.dm

Removing a world that snuck back in after rebase.

2015-12-01 21:41:17 +10:30

inventory.dm

Rewrote targeting.

2015-12-16 10:10:13 +10:30

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Generalized pulling restrictions to mob level.

2015-12-01 21:23:35 +10:30

mob_grab_specials.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-12-08 08:23:10 +01:00

mob_grab.dm

…

mob_helpers.dm

…

mob_movement.dm

Removed targeting.

2015-12-16 10:09:20 +10:30

mob_transformation_simple.dm

…

mob.dm

Buckling and disability check tweaks.

2015-12-20 12:03:29 +01:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…