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

# Conflicts:
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/security.dm
#	code/game/area/Space Station 13 areas.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm

2018-03-23 20:25:18 -04:00

..

_modifiers

Adds a Frankenstein Surgical Procedure (#4990)

2018-03-05 19:46:05 -06:00

dead

POLARIS: Fixes #3280 (VS) - Typing as ghost removes overlays

2018-03-20 14:34:58 -04:00

freelook

Make turf obfuscation lists lazy

2018-02-17 21:55:59 -06:00

language

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

2018-03-23 20:25:18 -04:00

living

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

2018-03-23 20:25:18 -04:00

new_player

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

2018-03-23 20:25:18 -04:00

animations.dm

POLARIS: Adds an animation thing, uses it on ventcrawls

2018-03-15 23:50:14 -04:00

death.dm

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

2018-03-06 18:11:39 -05:00

emote.dm

POLARIS: Revamp logging to be consistent

2018-03-10 17:18:09 -05:00

gender.dm

…

hear_say.dm

…

holder.dm

POLARIS: Fix holders to avoid forcemoving held mob to nullspace

2018-03-18 20:12:47 -04:00

inventory.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15

2018-03-15 22:41:14 -04:00

login_vr.dm

VS: Fix serveral Destroy()s, VS edition

2018-02-20 00:21:29 -05:00

login.dm

POLARIS: Tooltip framework, and mob tooltips

2018-03-12 18:25:53 -04:00

logout.dm

POLARIS: Revamp logging to be consistent

2018-03-10 17:18:09 -05:00

mob_defines_vr.dm

Protean species

2018-03-17 12:14:13 -04:00

mob_defines.dm

POLARIS: Improve robot and typing overlays

2018-03-17 19:49:03 -04:00

mob_grab_specials.dm

POLARIS: Revamp logging to be consistent

2018-03-10 17:18:09 -05:00

mob_grab.dm

POLARIS: Revamp logging to be consistent

2018-03-10 17:18:09 -05:00

mob_helpers.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15

2018-03-15 22:41:14 -04:00

mob_movement.dm

POLARIS: Player-controlled SA QOL

2018-02-15 01:49:53 -06:00

mob_planes_vr.dm

VS: Fix serveral Destroy()s, VS edition

2018-02-20 00:21:29 -05:00

mob_planes.dm

POLARIS: Fix several Destroy()s

2018-02-20 10:00:23 -05:00

mob_transformation_simple.dm

…

mob_yw.dm

…

mob.dm

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

2018-03-23 20:25:18 -04:00

say_vr.dm

VS: Companion commit to robot, typing overlays

2018-03-17 19:49:21 -04:00

say.dm

POLARIS: Improve robot and typing overlays

2018-03-17 19:49:03 -04:00

transform_procs.dm

Adds Tajaran Akhani language. (#5032)

2018-03-11 16:55:08 -05:00

typing_indicator.dm

POLARIS: Improve robot and typing overlays

2018-03-17 19:49:03 -04:00

update_icons.dm

U_I Phase 2.0: Code cleanup

2018-03-08 19:33:44 -05:00