Granodd 6c53564df2 Merge branch 'master' into GunsAndGunAccessories ...

# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm

2019-01-26 02:17:22 -05:00

..

camera

…

dead

Devil game mode

2019-01-13 12:00:49 +01:00

living

Merge branch 'master' into GunsAndGunAccessories

2019-01-26 02:17:22 -05:00

new_player

Devil game mode

2019-01-13 12:00:49 +01:00

abilities.dm

…

death.dm

Devil game mode

2019-01-13 12:00:49 +01:00

emote.dm

…

hear_say.dm

…

holder.dm

…

inventory.dm

…

language.dm

…

login.dm

…

logout.dm

…

mob_defines.dm

…

mob_grab.dm

…

mob_helpers.dm

Devil game mode

2019-01-13 12:00:49 +01:00

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

Devil game mode

2019-01-13 12:00:49 +01:00

say.dm

…

status_procs.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…

update_status.dm

…