Fox McCloud 03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc ...

# Conflicts:
#	code/game/objects/items.dm

2019-04-07 19:54:14 -04:00

..

area

Resolve some issues that the compiler doesn't spot

2019-03-29 16:21:15 +01:00

dna

Crit Rework Final Submission

2019-03-28 17:28:00 -04:00

gamemodes

Merge pull request #11221 from Arkatos1/Destroy_Engine_Rework

2019-04-07 21:23:43 +08:00

jobs

clarify

2019-03-29 22:32:30 -07:00

machinery

Merge pull request #11246 from TDSSS/upload

2019-04-07 21:20:03 +08:00

magic

…

mecha

Merge pull request #11165 from Markolie/issues

2019-04-01 18:22:43 -04:00

objects

Merge remote-tracking branch 'upstream/master' into fix-cqc

2019-04-07 19:54:14 -04:00

turfs

oh no fox lost it

2019-03-19 18:23:04 -04:00

verbs

Merge pull request #11026 from farie82/popup-limiting

2019-04-07 20:41:24 +08:00

alternate_appearance.dm

…

asteroid.dm

Chem Dispenser Refactor

2019-03-26 18:29:11 -04:00

atoms_movable.dm

mobs on helpful intent no longer push pulled structures or players pulling structures, structure.dm follows mob.dm's issilicon for isstructure as per contributing no hacky code, pulledby now set to null when stop_pulling() is called, thus they actually stop pulling

2019-01-29 21:09:53 -08:00

atoms.dm

Crit Rework Final Submission

2019-03-28 17:28:00 -04:00

data_huds.dm

Crit Rework Final Submission

2019-03-28 17:28:00 -04:00

shuttle_engines.dm

…

sound.dm

comment

2019-04-01 17:51:41 -04:00

world.dm

Makes the Master Controller Actually Shutdown

2019-03-26 05:08:00 -04:00