Kelshark aea1eee615 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt

2018-02-21 22:19:24 -05:00

..

devices

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07

2018-02-07 19:30:50 -05:00

robot

Polaris sync

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

stacks

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

weapons

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-02-21 22:19:24 -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

…

bodybag.dm

…

contraband_vr.dm

…

contraband.dm

…

crayons.dm

…

glassjar.dm

…

gunbox_vr.dm

More guns for the gun box

2018-01-18 18:53:43 -05:00

gunbox.dm

…

latexballoon.dm

…

paintkit.dm

Suit modkits can now be used for hoodies.

2018-02-01 20:40:11 -08:00

poi_items.dm

Added Decoupled starship engine PoI (#4649)

2018-01-28 01:08:40 -08:00

shooting_range.dm

…

toys.dm

…

trash_vr.dm

Squashed commit of the following:

2018-02-04 22:43:02 +02:00

trash.dm

…