skull132 8b5c7bc2c5 Conflict resolution ...

Merge remote-tracking branch 'Aurorastation/development'

# Conflicts:
#	config/example/config.txt

2016-03-25 22:25:41 +02:00

..

dead

Remove R_MENTOR & R_HOST

2016-02-05 23:20:39 +02:00

freelook

Fixes #10819

2015-08-23 14:34:58 -04:00

language

Fixes #210

2016-03-10 19:59:52 +00:00

living

Conflict resolution

2016-03-25 22:25:41 +02:00

new_player

Generalizing establish_db_connection() and setup_database_connection()

2016-03-04 00:53:37 +02:00

animations.dm

Refactors floating and magboot checks. Fixes #10256

2015-08-03 23:19:04 +10:00

death.dm

…

emote.dm

…

hear_say.dm

Fixes #91

2016-02-10 12:34:10 +02:00

holder.dm

Readded monkey scooping.

2015-08-31 07:01:56 +09:30

inventory.dm

put_in_hands() refactor.

2015-12-04 17:38:58 +10:30

login.dm

…

logout.dm

Discord over IRC

2016-02-16 17:42:00 +02:00

mob_cleanup.dm

…

mob_defines.dm

Fixes #11130, renames aghosted var

2015-09-26 20:48:13 -05:00

mob_grab_specials.dm

Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468

2015-12-06 04:17:52 -05:00

mob_grab.dm

Cleans up mob_grab.dm

2015-08-18 22:02:01 -04:00

mob_helpers.dm

Fixing Deadchat

2016-02-11 18:05:31 +02:00

mob_movement.dm

Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468

2015-12-06 04:17:52 -05:00

mob_transformation_simple.dm

…

mob.dm

Of Helper Procs & Dumbs

2016-03-25 20:33:10 +02:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…