Tigercat2000 85d4f59caf Wow. Soft merge conflicts, in a way. Merging not causing a git error, but ...

instead, a compile error. Congrats TRAVIS, you are smarter than your
average CI.

2015-12-04 22:32:38 -08:00

..

camera

…

dead

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

2015-12-03 11:03:01 -08:00

living

Wow. Soft merge conflicts, in a way. Merging not causing a git error, but

2015-12-04 22:32:38 -08:00

new_player

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

2015-12-03 11:03:01 -08:00

spirit

…

abilities.dm

…

death.dm

…

emote.dm

…

hear_say.dm

…

holder.dm

…

inventory.dm

…

language.dm

fixes

2015-10-19 08:27:06 -04:00

login.dm

Add config option to disable same-CID popup "YOU'LL BE BANNED STOP IT"

2015-11-01 20:34:37 -08:00

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Science analyser goggles

2015-10-09 08:22:45 +02:00

mob_grab.dm

…

mob_helpers.dm

guarding yo things

2015-11-20 08:11:22 -05:00

mob_movement.dm

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

2015-10-19 16:13:51 -07:00

mob_transformation_simple.dm

…

mob.dm

Supply shuttle, initial_move() fixes, dock fixes

2015-12-04 21:48:40 -08:00

say.dm

Custom_emote now used in place of emote("me")

2015-10-09 13:00:05 -07:00

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…