Arokha Sieyes a77da3b5df Clean up merge conflicts

2020-05-14 09:44:52 -04:00

..

antagonist

Refactor job joins for noncarbons

2020-05-07 19:48:25 -04:00

area

Merge pull request #7046 from Neerti/system_3_fixes

2020-04-29 17:27:57 -04:00

dna

Updates machines to use default_apply_parts()

2020-05-07 00:40:34 -04:00

gamemodes

Put APCs and SMESes into GLOB lists to ease iteration

2020-05-11 22:05:41 -04:00

jobs

Merge pull request #7800 from VOREStation/aro-moresafe

2020-05-12 11:36:14 -04:00

machinery

Clean up merge conflicts

2020-05-14 09:44:52 -04:00

magic

…

mecha

Fix weird stray commas

2020-05-09 16:54:14 -04:00

objects

Clean up merge conflicts

2020-05-14 09:44:52 -04:00

turfs

Fix floors so adding flooring updates the icon.

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

vehicles

…

verbs

Rearrange staffwho bot command output

2020-05-13 15:48:35 -04:00

atoms_movable_vr.dm

VS: Smooth

2020-05-02 19:21:02 -04:00

atoms_movable.dm

Further tweak smooth movement

2020-05-02 19:20:54 -04:00

atoms.dm

Testing init fixes

2020-05-10 23:40:47 -04:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team_vr.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Update sound.dm

2020-05-10 18:55:29 -04:00

supplyshuttle.dm

…

trader_visit_vr.dm

…

trader_visit.dm

…

world.dm

Switch to using GLOB.admins instead of admins

2020-05-12 11:16:54 -04:00