Kyep 682b9aaaf3 fixes merge conflict

2018-04-25 23:36:39 -07:00

..

camera

…

dead

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

living

fixes merge conflict

2018-04-25 23:36:39 -07:00

new_player

ree

2018-04-21 15:23:27 +01:00

abilities.dm

…

death.dm

…

emote.dm

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

hear_say.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

holder.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

inventory.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

language.dm

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

login.dm

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

logout.dm

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

mob_defines.dm

Removes All Weapons

2018-04-15 16:25:56 -04:00

mob_grab.dm

Fix runtime logs & Remove a bunch of painful admin notifications

2018-04-25 16:35:02 -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

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

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

mob_transformation_simple.dm

…

mob.dm

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

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

pulling.dm

Tiger requests

2017-12-30 21:10:14 -08:00

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

Can Point While Lying Down

2017-07-23 04:25:46 -04:00