Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

sorts

Commit One

2020-07-19 16:24:56 -04:00

_global_objects_vr.dm

…

_global_objects.dm

…

_lists.dm

Add serial comma

2020-05-16 17:06:21 -04:00

atmospherics.dm

…

atom_movables.dm

…

events.dm

…

files.dm

…

game.dm

TGUI'ified Medical Everything

2020-07-25 00:44:51 -07:00

global_lists_ch.dm

…

global_lists_vr.dm

'Reverts' a bunch of changes that we've made through the years and see if any of those could have been the cause for out of memory errors to start appearing, unchecks a bunch of unused things like mining rewards and coin-shop as well as some admin systems that are not checked on upstream.

2020-07-26 12:48:22 -04:00

global_lists.dm

Merge pull request #7522 from Meghan-Rossi/cleanbotaitweak

2020-08-21 01:28:12 -04:00

icons_vr.dm

VS: Tweak some icon blending

2020-05-18 13:42:42 -04:00

icons.dm

Shapeshifter color selection knows default/current

2020-05-21 11:59:54 -04:00

logging_vr.dm

…

logging.dm

Update asset_cache to modern /tg/, and make TGUI compatible with it. CDN support, etc.

2020-07-19 20:46:12 -07:00

matrices.dm

…

mobs.dm

Cached version of icon_states() proc

2020-05-06 16:06:44 -04:00

names.dm

…

sanitize_values.dm

…

storage.dm

…

text_vr.dm

…

text.dm

NanoUI PDAs made Modular (lazy commit)

2020-09-16 21:31:49 -07:00

time.dm

Re-adds articles, fixes year yet again

2020-06-16 04:03:21 -04:00

turfs.dm

Port Eris' extensive floor blending system

2020-05-29 14:00:43 -04:00

type2type.dm

Aurora Cooking Port

2020-07-30 15:13:46 -04:00

unsorted_vr.dm

…

unsorted.dm

TGUI Backend Tweaks & Fixes

2020-08-07 00:29:50 -07:00

view.dm

…

visual_filters.dm

Makes using BYOND Filters easier.

2020-07-30 15:34:07 -04:00