LetterJay 8d31153fdc Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223 ...

[MIRROR] Organ Update [Cloning isn't broken edition]

2017-07-15 23:18:53 -05:00

..

area

Changes some 1s and 0s to TRUE and FALSE (#1967)

2017-07-10 16:13:16 -07:00

gamemodes

Rename Bumped to CollidedWith (#2017)

2017-07-15 11:44:12 -07:00

machinery

Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223

2017-07-15 23:18:53 -05:00

mecha

[MIRROR] Cleaned up some emag_acts (#2018)

2017-07-15 13:17:56 -07:00

objects

Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223

2017-07-15 23:18:53 -05:00

turfs

Rename Bumped to CollidedWith (#2017)

2017-07-15 11:44:12 -07:00

alternate_appearance.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

atoms_movable.dm

Rename Bumped to CollidedWith (#2017)

2017-07-15 11:44:12 -07:00

atoms.dm

Rename Bumped to CollidedWith (#2017)

2017-07-15 11:44:12 -07:00

communications.dm

…

data_huds.dm

im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025)

2017-07-15 11:41:36 -07:00

say.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

shuttle_engines.dm

Removes now-unnecessary obj_integrity definitions

2017-07-09 19:44:48 -05:00

skincmd.dm

…

sound.dm

Removes the entry in sound.dm for servostep.ogg (#2004)

2017-07-14 19:35:48 -07:00