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

# Conflicts:
#	code/modules/admin/verbs/adminhelp.dm
#	maps/virgo-1.dmm

2017-01-21 01:42:11 -05:00

..

devices

Polaris sync

2017-01-15 18:12:15 -05:00

robot

Polaris sync

2016-08-06 20:34:44 -07:00

stacks

Replaces [stack]/fifty atoms with atoms that spawn the normal stack

2016-12-17 17:27:04 -06:00

weapons

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

2017-01-21 01:42:11 -05:00

apc_frame.dm

…

blueprints.dm

…

bodybag.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

contraband_vr.dm

50 sheet stacks fix

2016-12-27 08:42:59 -05:00

contraband.dm

…

crayons.dm

…

glassjar.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

latexballoon.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

paintkit.dm

…

shooting_range.dm

…

toys.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

trash.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00