alberyk 4b32268c1a Merge branch 'master' into final_shuttle_touches_and_stuff ...

# Conflicts:
#	code/game/objects/structures/window.dm
#	code/modules/client/preference_setup/loadout/loadout_uniform.dm

2021-12-21 16:51:40 -03:00

..

ATM.dm

Adds sensitive hearing (#12151)

2021-10-15 19:02:12 +02:00

cash.dm

Charge Card Cargo (#10843)

2020-12-25 14:15:48 +01:00

economy_misc.dm

Langserver Fixes (#7740)

2019-12-22 17:51:24 +02:00

EFTPOS.dm

Fix CCIA Access on CentCom (#12037)

2021-06-15 13:54:42 -03:00

Events_Mundane.dm

…

Events.dm

Replaced all instances of armour/armoury with armor/armory (#9593)

2020-08-06 20:57:30 +02:00

OrderTerminal.dm

adds helpful descriptions to certain items (#12743)

2021-11-21 21:03:19 +01:00

quikpay.dm

All jobs

2021-09-23 23:07:28 -03:00

TradeDestinations.dm

…