Markolie 1d6754728b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates ...

# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi

2017-02-06 20:37:03 +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_updates

2017-02-06 20:37:03 +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

…

holder.dm

Switches reset_view to reset_perspective

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

inventory.dm

…

language.dm

adds hivemind link to changelings, allows them to give a victim in > neckgrab hivemind comms for 3 minutes

2017-02-04 17:45:22 +04: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

removes attack_not_jump from notify_ghosts

2017-02-05 13:44:59 +04: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 remote-tracking branch 'upstream/master' into botany-rework

2017-02-05 05:26:46 -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

…