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

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

..

dominator_countdown.dm

…

dominator.dm

More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)

2020-06-02 15:22:06 -07:00

gang_datums.dm

Force pushed updates

2020-03-22 01:43:19 +01:00

gang_decals.dm

Plane adjustments on several low layer objects. (#12286)

2020-05-17 17:02:57 -07:00

gang_hud.dm

…

gang_items.dm

a tonne of fixes

2020-06-11 20:18:36 +01:00

gang_pen.dm

…

gang.dm

Merge pull request #11897 from DeltaFire15/gang-decon-message

2020-04-20 11:43:37 -07:00

gangs.dm

I have a bad habit to edit people's (especially trilby) PRs out of the wild. Sorry

2020-02-09 02:56:17 +01:00

gangtool.dm

…

implant_gang.dm

…