tigercat2000 8ef1b97f45 Merge remote-tracking branch 'upstream/master' into multivis ...

# Conflicts:
#	.travis.yml
#	_maps/map_files/MetaStation/z2.dmm
#	_maps/map_files/cyberiad/z2.dmm
#	code/game/atoms_movable.dm
#	code/game/machinery/camera/camera.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/ai/freelook/eye.dm

2018-10-23 17:41:41 -07:00

..

camera

dayum dats defined

2018-10-08 22:48:00 +01:00

dead

Merge-conflict fix + check for null rather than type.

2018-10-12 18:59:54 +02:00

living

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

2018-10-23 17:41:41 -07:00

new_player

Resolves conflicts.

2018-10-11 05:36:22 -05:00

abilities.dm

…

death.dm

First big chunk of the refactor

2018-10-07 17:52:04 -07:00

emote.dm

global lists global defined

2018-10-02 15:52:46 -05:00

hear_say.dm

First big chunk of the refactor

2018-10-07 17:52:04 -07:00

holder.dm

…

inventory.dm

Paving the path for a bigger inventory refactor

2018-09-23 22:26:10 +08:00

language.dm

global lists global defined

2018-10-02 15:52:46 -05:00

login.dm

Merge-conflict fix + check for null rather than type.

2018-10-12 18:59:54 +02:00

logout.dm

global lists global defined

2018-10-02 15:52:46 -05:00

mob_defines.dm

First big chunk of the refactor

2018-10-07 17:52:04 -07:00

mob_grab.dm

AGHHHHHHHHHHHHHHHHHHH WHATTT

2018-07-17 04:58:36 -04:00

mob_helpers.dm

Resolves conflicts.

2018-10-11 05:36:22 -05:00

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

Resolves conflicts.

2018-10-11 05:36:22 -05:00

pulling.dm

…

say.dm

global lists global defined

2018-10-02 15:52:46 -05:00

status_procs.dm

bodytemperature

2018-09-13 08:01:48 -04:00

transform_procs.dm

Full Positronic Brain to Robotic Brain Refactor

2018-07-12 19:30:48 -04:00

typing_indicator.dm

…

update_icons.dm

…

update_status.dm

First big chunk of the refactor

2018-10-07 17:52:04 -07:00