Markolie 3c7413dc65 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet ...

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

2015-09-22 00:17:30 +02:00

..

camera

…

dead

Merge pull request #2088 from Fox-McCloud/point-rework

2015-09-18 22:30:22 -04:00

living

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

2015-09-22 00:17:30 +02:00

new_player

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

2015-09-15 04:18:27 +02:00

spirit

…

abilities.dm

…

death.dm

…

emote.dm

OOC/LOOC update, stealthmin fixes

2015-09-17 21:27:24 +02:00

hear_say.dm

AI tracking update

2015-08-17 19:05:09 +02:00

holder.dm

…

inventory.dm

Display case update, some forceMove updates

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

language.dm

Language and IPC Random Name Fix

2015-09-09 02:43:40 -04:00

login.dm

…

logout.dm

Admin teleport update, further admin message fixes

2015-08-18 00:54:25 +02:00

mob_cleanup.dm

…

mob_defines.dm

Replace magic intent words with defines, grab fixes

2015-09-07 11:51:00 -07:00

mob_grab.dm

grabby

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

mob_helpers.dm

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

mob_movement.dm

Display case update, some forceMove updates

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

mob_transformation_simple.dm

…

mob.dm

Merge pull request #2088 from Fox-McCloud/point-rework

2015-09-18 22:30:22 -04:00

say.dm

A bunch of saycode fixes

2015-09-18 21:19:14 -07:00

transform_procs.dm

Monkey/human transform fixes

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

typing_indicator.dm

…

update_icons.dm

…