CornMyCob 05c2629021 resolve conflicts

2020-06-29 15:20:03 +01:00

..

area

Updates Ship Ambience (#13635)

2020-06-28 15:18:37 -06:00

dna

Fix entering pods and stuff while buckled

2020-06-09 14:29:03 +02:00

gamemodes

Merge pull request #13714 from farie82/blob-fix

2020-06-28 17:14:06 -04:00

jobs

Speech bubble refactor and Features (#13598)

2020-06-28 14:23:32 -06:00

machinery

Speech bubble refactor and Features (#13598)

2020-06-28 14:23:32 -06:00

magic

Makes all global variables handled by the GLOB controller (#13152)

2020-03-20 21:56:37 -06:00

mecha

Speech bubble refactor and Features (#13598)

2020-06-28 14:23:32 -06:00

objects

resolve conflicts

2020-06-29 15:20:03 +01:00

turfs

Merge pull request #13688 from Fox-McCloud/floor-tile-cleanup

2020-06-27 00:53:34 -04:00

verbs

Makes all global variables handled by the GLOB controller (#13152)

2020-03-20 21:56:37 -06:00

alternate_appearance.dm

…

atoms_movable.dm

Merge pull request #13661 from Fox-McCloud/minor-gc-fixes

2020-06-27 00:55:21 -04:00

atoms.dm

resolve conflicts

2020-06-29 15:20:03 +01:00

data_huds.dm

Bumps to DreamChecker 1.4

2020-06-20 10:51:26 +01:00

shuttle_engines.dm

File standardisation (#13131)

2020-03-17 18:08:51 -04:00

sound.dm

File standardisation (#13131)

2020-03-17 18:08:51 -04:00

world.dm

Travis Update Finale: Unit Tests + SQL Validation (#13331)

2020-06-27 01:26:58 -06:00