LetterJay 6dd7c44bbc Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829 ...

[MIRROR] Merges the two turf/Entereds

2017-08-18 13:41:23 -05:00

..

area

Update areas.dm

2017-08-15 19:08:05 -05:00

gamemodes

Blobs can now sense loving cuddles!

2017-08-16 18:00:54 -05:00

machinery

Changes smes, cells, cell charger, terminals and apcs icons

2017-08-16 20:02:24 -05:00

mecha

Merge branch 'master' into upstream-merge-29690

2017-08-15 19:18:22 -05:00

objects

Merge pull request #2352 from Citadel-Station-13/upstream-merge-29858

2017-08-18 13:41:07 -05:00

turfs

Merge pull request #2361 from Citadel-Station-13/upstream-merge-29829

2017-08-18 13:41:23 -05:00

alternate_appearance.dm

…

atoms_movable.dm

Standardized CENTCOM spelling

2017-08-08 09:05:44 -05:00

atoms.dm

[ready]Makes bIcon better

2017-08-13 17:41:12 -05:00

communications.dm

Annihilates the colons!

2017-08-15 10:49:55 -05:00

data_huds.dm

Proper mirror PR for the disease refactor because I fucked up the first one. (#2026)

2017-07-31 23:41:22 -07:00

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

Update sound.dm

2017-08-15 18:56:57 -05:00

sound.dm.rej

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

world.dm

Moves most of world.dm

2017-08-16 17:51:33 -05:00