LetterJay 3e95574d1e Merge pull request #5941 from Citadel-Station-13/upstream-merge-36346 ...

[MIRROR] Makes touching (8)balls take less time

2018-03-14 10:42:13 -05:00

..

effects

Merge branch 'master' into upstream-merge-36242

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

items

Merge pull request #5941 from Citadel-Station-13/upstream-merge-36346

2018-03-14 10:42:13 -05:00

structures

[MIRROR] You can now non-violently place people on tables (#5891)

2018-03-10 07:43:14 -06:00

buckling.dm

Fixes lavaboat buckling (#34450)

2018-01-16 14:31:02 -06:00

empulse.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

items.dm

[READY FOR MERGE] The Giant Combat Reworks - Part 1: Goodbye stuns, hello staminacrit (#5463)

2018-03-11 13:32:44 -07:00

obj_defense.dm

Tg 1 28 sync testing/confirmation (#5178)

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

objs.dm

[READY] NTNet airlocks

2018-03-08 22:42:46 -06:00

structures.dm

Adds minor roundstart traits! (ala CDDA, etc.)

2018-03-02 14:38:18 -06:00