Citrus 78f1ec9343 Merge remote-tracking branch 'origin/master' into hedges

2020-01-02 20:15:44 -05:00

..

effects

Adds several more uses for plastics (Trinkets, Trash, Decor, and Killing the Environment) (#48337)

2020-01-03 02:13:43 +01:00

items

Adds several more uses for plastics (Trinkets, Trash, Decor, and Killing the Environment) (#48337)

2020-01-03 02:13:43 +01:00

structures

Merge remote-tracking branch 'origin/master' into hedges

2020-01-02 20:15:44 -05:00

buckling.dm

[ready] Smooth-ish move rising: revengeance (#47817)

2019-12-05 02:34:46 +00:00

empulse.dm

Fix Travis grep script to use PCRE to actually match things (#47065)

2019-10-19 10:21:05 -07:00

items.dm

Updates energy gun overlays and inhands (#47913)

2019-11-25 17:22:58 +01:00

obj_defense.dm

Batch of runtime fixes. (#48268)

2019-12-21 18:40:10 +01:00

objs.dm

Removes unreachable code (#48143)

2019-12-10 20:52:13 +13:00

structures.dm

ghosts can't use monitors; dextrous animals can climb crates; fixes atrocious spelling (#47262)

2019-10-22 04:37:35 -07:00