tigercat2000 b14faa19c3 Merge remote-tracking branch 'upstream/master' into SMC ...

# Conflicts:
#	code/__DEFINES/flags.dm

2018-03-22 15:35:12 -07:00

..

__DEFINES

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

2018-03-22 15:35:12 -07:00

__HELPERS

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

2018-03-22 15:35:12 -07:00

_DATASTRUCTURES

…

_globalvars

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

2018-03-22 15:35:12 -07:00

_onclick

spacing, src/loc consistency in playsound, reverted the weapon hitsound change, removed silicon/damage_procs.dm as it's unrelated and wasn't even included in the .dme, fixed some typos

2018-03-05 02:07:31 +05:00

ATMOSPHERICS

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

2018-03-22 15:35:12 -07:00

controllers

Spacing fixes.

2018-03-20 19:12:55 -07:00

datums

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

2018-03-22 15:35:12 -07:00

defines

…

game

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

2018-03-22 15:35:12 -07:00

js

…

LINDA

PS -> SMC Ports: LINDA, Spacedrift, Throwing

2018-03-02 23:58:57 -08:00

modules

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

2018-03-22 15:35:12 -07:00

_compile_options.dm

…

hub.dm

…

world.dm

PS -> SMC Ports: LINDA, Spacedrift, Throwing

2018-03-02 23:58:57 -08:00