Tigercat2000 625dbb5295 Merge remote-tracking branch 'upstream/master' into LightShit ...

Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm

2015-05-10 13:56:28 -07:00

..

camera

…

dead

Admin Ghostdrop sanity checks

2015-04-15 07:11:34 -07:00

living

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

2015-05-10 13:56:28 -07:00

new_player

Change slime people to not need mutantrace anymore.

2015-04-13 07:59:25 -04:00

spirit

Fixes "An Unknown Servent" Typo

2015-04-29 07:59:17 -04:00

abilities.dm

…

death.dm

Revert "Manual update"

2015-05-06 20:57:37 -04:00

emote.dm

[Goonchem] Transition to Goonchem

2015-03-27 05:41:45 -04:00

hear_say.dm

…

holder.dm

…

inventory.dm

…

language.dm

Revert "Manual update"

2015-05-06 20:57:37 -04:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Lighting overhaul.

2015-05-10 12:03:27 -07:00

mob_grab.dm

Revert "Manual update"

2015-05-06 20:57:37 -04:00

mob_helpers.dm

Add check for antags in msg_admin_attack

2015-04-12 08:41:53 -07:00

mob_movement.dm

Revert "Manual update"

2015-05-06 20:57:37 -04:00

mob_transformation_simple.dm

…

mob.dm

Revert "Manual update"

2015-05-06 20:57:37 -04:00

say.dm

…

transform_procs.dm

Revert "Manual update"

2015-05-06 20:57:37 -04:00

typing_indicator.dm

…

update_icons.dm

…