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

# Conflicts:
#	code/__DEFINES/flags.dm

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

..

simulated

Merge pull request #8674 from uraniummeltdown/attacks

2018-03-22 11:55:53 -07:00

space

Adds RPD_ALLOWED_HERE flag to deny use of the RPD to certain turf types

2018-03-11 03:44:42 +00:00

unsimulated

airlock assembly states have defines, removed redundant door layer defines

2018-01-22 20:27:34 +05:00

simulated.dm

Adds RPD_ALLOWED_HERE flag to deny use of the RPD to certain turf types

2018-03-11 03:44:42 +00:00

turf.dm

PS -> SMC Ports: LINDA, Spacedrift, Throwing

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

unsimulated.dm

Removes dust from vox raider base (#4649)

2016-06-13 23:11:03 -04:00