kcin2001 a10310fdda Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into shadekin ...

# Conflicts:
#	code/modules/mob/living/simple_animal/vore/shadekin/types.dm
#	icons/mob/vore_shadekin.dmi
#	icons/mob/vore_shadekin64.dmi

2019-10-06 00:30:58 -07:00

..

_modifiers

…

dead

…

freelook

…

language

…

living

Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into shadekin

2019-10-06 00:30:58 -07:00

new_player

adds athena panels markings (full, body, head)

2019-08-25 10:57:03 -07:00

airhack.dm

…

animations.dm

…

death.dm

…

emote.dm

…

gender_vr.dm

…

gender.dm

…

hear_say.dm

…

holder.dm

…

inventory.dm

…

login_vr.dm

…

login.dm

…

logout.dm

…

mob_defines_vr.dm

…

mob_defines.dm

…

mob_grab_specials.dm

…

mob_grab.dm

…

mob_helpers.dm

…

mob_movement.dm

…

mob_planes_vr.dm

…

mob_planes.dm

…

mob_transformation_simple.dm

…

mob.dm

…

say_vr.dm

…

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

…

vore-icons.md

…