Jeremy Liberman a95a28e303 Merge branch 'dev' into mutiny-fixes

2014-05-18 11:25:36 -05:00

..

dead

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron

2014-04-16 22:13:48 -07:00

living

Merge branch 'dev' into mutiny-fixes

2014-05-18 11:25:36 -05:00

new_player

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

2014-05-11 13:19:09 +00:00

spirit

removing debugging junk from the spirit topics follow commands

2014-05-16 17:13:43 -04:00

abilities.dm

…

death.dm

Fixes #4744

2014-05-10 00:40:20 +09:30

emote.dm

This reverts commit all the say code changes over the last couple of days.

2014-02-22 03:46:10 -06:00

hear_say.dm

Removed verb assignment from hear_say()

2014-05-17 08:51:13 -04:00

inventory.dm

…

language.dm

Adds Siik'tajr

2014-05-17 08:51:57 -04:00

login.dm

Crash fix attempt: Moving NanoUI resource file sending away from client/New()

2014-04-25 17:47:27 -05:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage

2014-05-13 20:45:05 -04:00

mob_grab.dm

Fixes admin attack logs to show up in-game as well as in the logfiles.

2014-02-25 20:36:46 +00:00

mob_helpers.dm

fixing the player panel to work with spirits and masks

2014-05-16 19:19:22 -04:00

mob_movement.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage

2014-05-13 20:45:05 -04:00

mob_transformation_simple.dm

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

mob.dm

Merge branch 'dev' into mutiny-fixes

2014-05-18 11:25:36 -05:00

say.dm

Fixed NONVERBAL check.

2014-05-17 15:43:10 -04:00

transform_procs.dm

Merge branch 'dev' into mutiny-fixes

2014-05-18 11:25:36 -05:00

update_icons.dm

…