Artur ddcfcb5cd8 Conflicts sure are !!FUN!! ...

Also adds dolphin gloves to the glove crate, and fixes fortitude

2020-04-15 12:33:59 +03:00

..

bounties

CogChamp

2020-02-10 21:18:51 -05:00

exports

Conflicts sure are !!FUN!!

2020-04-15 12:33:59 +03:00

packs

Merge remote-tracking branch 'upstream/master' into tackling_and_lunge

2020-04-15 12:19:37 +03:00

bounty_console.dm

ID console fixes and other tweaks.

2019-11-11 17:10:14 +01:00

bounty.dm

Reworked a bit of bounty stuff.

2019-11-01 01:38:27 -04:00

centcom_podlauncher.dm

fix everything

2020-04-11 15:32:09 +08:00

console.dm

Fixes points

2020-01-30 18:54:39 +01:00

export_scanner.dm

export scanners.

2020-02-06 23:08:32 +01:00

exports.dm

First tweak to cargo reagents selling.

2020-02-06 22:34:54 +01:00

expressconsole.dm

Merge pull request #11145 from Ghommie/Ghommie-cit586

2020-02-19 18:59:10 -07:00

gondolapod.dm

Ports some hud and update_icon code updates.

2019-12-16 23:29:20 +01:00

order.dm

Standardises all files from CRLF to LF

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

packs.dm

Clarifies comments and locks defusal kits behind an emag

2020-02-15 14:17:22 -05:00

supplypod_beacon.dm

WIP

2020-03-08 19:26:01 +01:00

supplypod.dm

WIP

2020-03-08 19:26:01 +01:00