Markolie d40cfe582e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into swordnborg ...

Conflicts:
	icons/obj/surgery.dmi

2015-10-01 04:32:10 +02:00

..

camera

Hotkey/interface update

2015-09-30 01:02:58 +02:00

dead

Hotkey/interface update

2015-09-30 01:02:58 +02:00

living

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into swordnborg

2015-10-01 04:32:10 +02:00

new_player

Add a few variables to the AI announcment message

2015-09-29 10:15:41 -07:00

spirit

…

abilities.dm

…

death.dm

…

emote.dm

check_rights/R_MOD update

2015-09-24 04:35:04 +02:00

hear_say.dm

…

holder.dm

…

inventory.dm

Display case update, some forceMove updates

2015-09-14 20:21:56 +02:00

language.dm

…

login.dm

Sanity checks

2015-09-30 01:26:22 +02:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Fix merge conflicts

2015-09-27 11:24:51 -04:00

mob_grab.dm

grabby

2015-09-18 17:33:38 -04:00

mob_helpers.dm

Dsay fix

2015-09-30 03:35:30 +02:00

mob_movement.dm

-tg- SpaceMove update

2015-09-25 15:53:59 -07:00

mob_transformation_simple.dm

…

mob.dm

Fixes

2015-09-27 22:50:09 +02:00

say.dm

Merge pull request #2113 from tigercat2000/whisper_autohiss

2015-09-22 16:48:42 +02:00

transform_procs.dm

Monkey/human transform fixes

2015-09-14 22:13:32 +02:00

typing_indicator.dm

…

update_icons.dm

…