Kyep 4d4eb16a3a fixes merge conflict

2018-06-06 16:32:31 -07:00

..

camera

…

dead

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

living

fixes merge conflict

2018-06-06 16:32:31 -07:00

new_player

Fix no ToS error

2018-05-26 19:08:53 -04:00

abilities.dm

…

death.dm

…

emote.dm

…

hear_say.dm

Them

2018-05-25 18:34:28 -07:00

holder.dm

…

inventory.dm

…

language.dm

More their

2018-05-25 18:34:26 -07:00

login.dm

…

logout.dm

…

mob_defines.dm

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

2018-05-17 20:21:39 -07:00

mob_grab.dm

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

mob_helpers.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

mob_movement.dm

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

2018-05-17 20:21:39 -07:00

mob_transformation_simple.dm

…

mob.dm

Better solution

2018-05-30 21:55:26 -04:00

pulling.dm

…

say.dm

…

status_procs.dm

…

transform_procs.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

typing_indicator.dm

…

update_icons.dm

…

update_status.dm

…