deathride58 a9b3b0b7f4 Merge branch 'master' into upstream-merge-36242

2018-03-09 20:38:39 +00:00

..

area

[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]

2018-03-07 20:49:25 -06:00

gamemodes

controllers, datums, game

2018-03-06 21:16:46 -06:00

machinery

Merge pull request #5853 from Citadel-Station-13/upstream-merge-35475

2018-03-09 20:36:58 +00:00

mecha

Merge pull request #5857 from Citadel-Station-13/upstream-merge-35947

2018-03-09 19:24:35 +00:00

objects

Merge branch 'master' into upstream-merge-36242

2018-03-09 20:38:39 +00:00

turfs

[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]

2018-03-07 20:49:25 -06:00

alternate_appearance.dm

cult lol xd

2018-01-31 08:07:22 -06:00

atoms_movable.dm

Fixes dogborg offsets and gun layering (#5668)

2018-02-22 23:48:24 -06:00

atoms.dm

code folder. 221 files changed wew

2018-02-12 21:03:40 -05:00

communications.dm

…

data_huds.dm

[MIRROR] Disease antagonist (#5815)

2018-03-05 15:20:59 -06:00

say.dm

…

shuttle_engines.dm

[MIRROR] Ports more operations to "tool_act" (#5718)

2018-02-27 05:04:27 -06:00

sound.dm

…

world.dm

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00