LetterJay 6a575f19d1 Merge branch 'master' into upstream-merge-37597

2018-05-22 07:21:53 -05:00

..

bullets

Makes pacifists able to use .50BMG Soporific Rounds (#37506)

2018-04-29 10:11:42 -05:00

energy

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

magic

things with stuff (#6233)

2018-04-07 23:07:09 -04:00

reusable

Fixes oversight with foam (#37898)

2018-05-18 08:29:48 -05:00

special

Merge branch 'master' into upstream-merge-37423

2018-05-16 12:17:57 -05:00

beams.dm

…

bullets.dm

…

energy.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

magic.dm

replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2

2018-05-02 13:14:43 -05:00

megabuster.dm

…

plasma.dm

…