Markolie 2b767bb9c9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ...

# Conflicts:
#	code/modules/mob/mob_helpers.dm
#	icons/obj/ammo.dmi
#	icons/obj/guns/projectile.dmi
#	icons/obj/storage.dmi

2017-01-31 17:44:38 +01:00

..

camera

…

dead

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-11 23:11:29 +01:00

living

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-31 17:44:38 +01:00

new_player

Character slot fixes

2017-01-16 13:15:37 -05:00

abilities.dm

…

death.dm

…

emote.dm

Adds a wrapper proc that makes the null prefs datum bug not kill talking

2017-01-02 19:26:30 -08:00

hear_say.dm

Fixes Telekinetic Simple Mobs

2016-11-11 10:39:50 -05:00

holder.dm

Switches reset_view to reset_perspective

2016-12-21 17:59:08 -08:00

inventory.dm

…

language.dm

Tiger-requested changes

2016-12-08 22:55:40 -08:00

login.dm

Switches reset_view to reset_perspective

2016-12-21 17:59:08 -08:00

logout.dm

Revert "Revert "Makes the admin logout tracking system actually work""

2016-12-03 02:23:18 -08:00

mob_defines.dm

Merge pull request #6149 from FlattestGuitar/log-upgrade

2017-01-18 19:13:50 -08:00

mob_grab.dm

Switches over to the new system

2017-01-17 13:57:07 +01:00

mob_helpers.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

2017-01-31 17:44:38 +01:00

mob_movement.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

2016-12-29 11:01:43 -05:00

mob_transformation_simple.dm

…

mob.dm

Merge pull request #6152 from uraniummeltdown/windowflash

2017-01-31 01:30:39 -05:00

pulling.dm

Picky nits

2017-01-01 21:53:31 -08:00

say.dm

…

status_procs.dm

Crazy lemon comments.

2016-11-22 02:22:39 -05:00

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…

update_status.dm

Fixes Telekinetic Simple Mobs

2016-11-11 10:39:50 -05:00