Kelshark 081e280e27 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/global.dm
#	config/custom_items.txt
#	icons/mob/human_races/r_xenochimera.dmi
#	vorestation.dme

2017-03-03 19:17:04 -05:00

..

dead

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-03-03 19:17:04 -05:00

freelook

…

language

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-03-03 19:17:04 -05:00

living

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2017-03-03 19:17:04 -05:00

new_player

Initial commit of new map system for Virgo

2017-03-02 23:34:43 -05:00

animations.dm

…

death.dm

Squelch death messages from inside mobs

2016-10-21 15:37:22 -04:00

emote.dm

…

gender.dm

…

hear_say.dm

Teshari Tweaks

2017-01-15 01:21:48 -06:00

holder.dm

Polaris sync

2017-02-01 15:08:45 -05:00

inventory.dm

Fixes runtime in inventory.dm

2016-11-21 20:36:39 -06:00

login.dm

…

logout.dm

…

mob_defines.dm

Polaris sync

2017-02-01 15:08:45 -05:00

mob_grab_specials.dm

…

mob_grab.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

mob_helpers.dm

…

mob_movement.dm

Tweaks walking speed

2016-12-08 21:26:37 -06:00

mob_transformation_simple.dm

…

mob.dm

Polaris sync

2017-02-01 15:08:45 -05:00

say_vr.dm

…

say.dm

…

transform_procs.dm

Merge large polaris changes

2017-03-02 22:44:17 -05:00

typing_indicator.dm

…

update_icons.dm

…