LemonInTheDark dbdb2d33fe Merge conflict begone

2020-07-12 17:37:14 -07:00

..

effects

Merge pull request #52158 from LemonInTheDark/help-me

2020-07-12 11:56:26 +02:00

items

Merge conflict begone

2020-07-12 17:37:14 -07:00

structures

Merge conflict begone

2020-07-12 17:37:14 -07:00

buckling.dm

Support fireman carrying people onto morgue trays and other bucklable objects (stasis beds, operating tables, chairs) (#51539)

2020-07-02 19:25:15 -04: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

Reverts, changes, and fixes to sawoff and energy weapons' icons

2020-06-28 17:34:41 -05:00

obj_defense.dm

Fixes all bits of code that check if something is under a tile that weren't being done

2020-07-10 22:14:37 -07:00

objs.dm

Paper icon fixes, adds support for objects to have custom fire overlays (#51862)

2020-06-29 19:16:45 +02:00

structures.dm

HERETICS: Solo Antagonist that grows with power (#51199)

2020-06-14 18:10:16 +02:00