Timothy Teakettle 7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes

2020-06-15 22:48:26 +01:00

..

ballistic

Merge remote-tracking branch 'upstream/master' into embed-changes

2020-06-15 22:48:26 +01:00

caseless

arrow craft nitpicking (alt title: "why are subtypes like this") (#11516)

2020-03-18 19:34:14 +01:00

energy

[Ready] Improvised Weapons Update: Part 2 (#12386)

2020-06-12 13:38:27 -07:00

special

Standardises all files from CRLF to LF

2020-01-12 14:28:01 +00:00

_ammunition.dm

Ok, done.

2020-03-08 22:51:36 +01:00

_firing.dm

part 2

2020-06-10 23:14:25 +01:00