LetterJay e8f581bb56 Merge branch 'master' into upstream-merge-31077

2017-09-29 12:46:25 -04:00

..

area

[MIRROR] Fixes to more Initialize procs (#2733)

2017-09-13 22:54:12 -05:00

gamemodes

Merge pull request #2991 from Citadel-Station-13/upstream-merge-31078

2017-09-29 01:44:17 -04:00

machinery

Merge pull request #2999 from Citadel-Station-13/upstream-merge-31072

2017-09-29 01:46:14 -04:00

mecha

Update combat.dm

2017-09-27 16:27:21 -05:00

objects

Merge branch 'master' into upstream-merge-31077

2017-09-29 12:46:25 -04:00

turfs

Merge pull request #2993 from Citadel-Station-13/upstream-merge-30714

2017-09-29 01:44:54 -04:00

alternate_appearance.dm

…

atoms_movable.dm

Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at (#30967)

2017-09-26 04:29:18 -05:00

atoms.dm

[MIRROR] Cleans up internal temp code (#2853)

2017-09-22 20:20:56 -05:00

communications.dm

Annihilates the colons!

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

data_huds.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

say.dm

Prevents hallucinations revealing people's identity

2017-09-02 05:33:55 -05:00

shuttle_engines.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

skincmd.dm

…

sound.dm

[MIRROR] Removes spawn()s in securitrons (#2901)

2017-09-22 22:37:07 -05:00

world.dm

[MIRROR] Log file for PDA messages (#2848)

2017-09-19 06:34:53 -05:00