LetterJay d200bff9f4 spaces. spaces caused the file to conflict.

2017-05-22 11:26:47 -05:00

..

area

Winter Wonderland holodeck no longer has freon, and it's no longer restricted

2017-04-30 15:12:51 -05:00

gamemodes

spaces. spaces caused the file to conflict.

2017-05-22 11:26:47 -05:00

machinery

Merge pull request #1039 from Citadel-Station-13/upstream-merge-27367

2017-05-19 01:00:41 -04:00

mecha

[MIRROR] Fixes language code ignoring holder restrictions (#858)

2017-05-18 04:13:57 -05:00

objects

Decentralized and Vastly Improved Gang Influence System

2017-05-20 18:37:48 -05:00

turfs

[READY]Peacekeeper cyborg projectile dampening fields, attempt three

2017-05-18 16:36:50 -05:00

alternate_appearance.dm

Fixes carelessness. (#577)

2017-04-26 10:37:57 -05:00

atoms_movable.dm

[MIRROR] Allows varediting loc and coords of atom/movables (#1020)

2017-05-18 14:28:24 -05:00

atoms.dm

Merge branch 'master' into upstream-merge-26776

2017-05-17 05:14:18 -04:00

communications.dm

…

data_huds.dm

When jumpsuits take severe damage, their suit sensors break.

2017-04-27 02:32:35 -05:00

say.dm

[MIRROR] Fixes saying nothing when you have no language (#861)

2017-05-18 06:12:39 -05:00

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

[MIRROR] Moves playsound_local() to mob and gets rid of a useless proc. (#710)

2017-05-18 01:39:16 -05:00