Krausus f816b8672d Resolves merge conflicts ...

Conflicts:
	code/game/machinery/computer/communications.dm

2015-08-18 04:14:14 -04:00

..

camera

Blob Mode Major Overhaul

2015-07-12 02:45:40 -04:00

dead

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

living

Resolves merge conflicts

2015-08-18 04:14:14 -04:00

new_player

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

spirit

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

abilities.dm

…

death.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

emote.dm

Fixes missing/broken admin permission checks

2015-06-08 07:55:29 -04:00

hear_say.dm

NTSL update

2015-08-13 22:01:00 +02:00

holder.dm

Replaces Reamining Del()'s

2015-07-07 00:35:19 -04:00

inventory.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

language.dm

…

login.dm

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

logout.dm

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

mob_cleanup.dm

…

mob_defines.dm

Nukes useless /wizard/ spell pathing

2015-08-08 14:06:50 -04:00

mob_grab.dm

Turn dionas into simple animals

2015-08-17 02:19:29 +02:00

mob_helpers.dm

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

mob_movement.dm

Rips out unnecessary relaymove call on set machines

2015-08-11 22:40:37 -04:00

mob_transformation_simple.dm

…

mob.dm

Fix flavor text encoding issues

2015-08-14 20:17:23 +02:00

say.dm

…

transform_procs.dm

Resolves merge conflicts

2015-08-18 04:14:14 -04:00

typing_indicator.dm

…

update_icons.dm

…