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

..

sorts

Port SSoverlays & Convert turfs to use it (#5004)

2018-03-05 19:43:23 -06:00

_global_objects.dm

Underwear + setup merges (#1812)

2016-05-30 19:19:45 +01:00

atmospherics.dm

…

files.dm

…

game.dm

Port Bay-style attack animations (#4827)

2018-02-15 22:02:04 -06:00

global_lists_vr.dm

Squashed commit of the following:

2018-02-04 22:43:02 +02:00

global_lists.dm

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

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

icons_vr.dm

Does custom food stuff

2017-02-19 01:02:12 +00:00

icons.dm

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

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

lists.dm

Implements the Tesla engine and supporting features (#4539)

2018-01-19 14:56:08 -06:00

logging_vr.dm

VS: HTMLDecode vorestation log types

2018-03-10 21:27:37 -05:00

logging.dm

Merge pull request #3226 from VOREStation/aro-reducedouble

2018-03-16 01:14:27 -04:00

maths.dm

…

matrices.dm

Enhance orbiting animations to actually support circles.

2018-01-21 20:52:33 -05:00

mobs.dm

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

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

names.dm

Fix server startup runtimes from uninitaizlied using_map

2017-03-03 19:52:26 -05:00

sanitize_values.dm

…

storage.dm

Adds subtype friendly method to populate crates.

2016-10-25 21:40:28 +01:00

text_vr.dm

…

text.dm

Port's TG's Maploader

2017-09-08 12:49:26 -04:00

time.dm

POLARIS: Revamp logging to be consistent

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

turfs.dm

Teshari Tweaks

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

type2type_vr.dm

…

type2type.dm

Does work on the event manager role again

2017-10-18 20:00:01 -05:00

unsorted_vr.dm

Various and sundry admin messages

2018-01-06 19:15:54 -05:00

unsorted.dm

Port SSoverlays & Convert turfs to use it (#5004)

2018-03-05 19:43:23 -06:00

vector.dm

…