Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 ...

# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#

2018-01-09 14:40:09 -05:00

..

devices

Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09

2018-01-09 14:40:09 -05:00

robot

Polaris sync

2017-12-21 04:01:07 -05:00

stacks

Polaris sync

2017-12-21 04:01:07 -05:00

weapons

Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09

2018-01-09 14:40:09 -05:00

antag_spawners.dm

Additional types which need Destroy to return qdel hints (and other Destroy fixes)

2017-12-30 16:02:27 -05:00

apc_frame.dm

…

blueprints.dm

Pol sync part 2

2017-10-27 15:30:51 -04:00

bodybag.dm

Standardization & grammar.

2017-11-17 13:18:32 -05:00

contraband_vr.dm

De-equips combat hardsuit from stolen package

2017-11-28 23:52:18 -05:00

contraband.dm

…

crayons.dm

…

glassjar.dm

…

gunbox.dm

Allows detectives to take an optional revolver + some other stuff (#4217)

2017-11-05 22:53:11 -06:00

latexballoon.dm

…

paintkit.dm

…

shooting_range.dm

…

toys.dm

Adds bracelets!

2017-11-17 18:27:35 +00:00

trash_vr.dm

Some dogborg equipment fixes.

2017-12-13 11:26:52 +02:00

trash.dm

…