deathride58 7150c207aa Fixes a merge conflict

2018-06-19 07:30:52 -04:00

..

_masks.dm

Merge branch 'master' into upstream-merge-37486

2018-05-21 11:59:57 -05:00

boxing.dm

…

breath.dm

adds missing /'s at the starts of some obj instances (#7169)

2018-06-18 11:53:33 -07:00

gasmask.dm

adds missing /'s at the starts of some obj instances (#7169)

2018-06-18 11:53:33 -07:00

hailer.dm

Moves several clothing-specific flags from /atom to their proper type

2018-04-28 13:21:48 -05:00

miscellaneous.dm

Fixes a merge conflict

2018-06-19 07:30:52 -04:00

vg_masks.dm

LOCAL SUNE PORTS... OH GOD WHAT HAPPENED

2018-03-18 09:02:13 -05:00