Verkister a5ff9415fa Merge branch 'master' of https://github.com/VOREStation/VOREStation into gimmicktraits ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/blank_vr.dm

2017-11-15 17:52:15 +02:00

..

devices

Polaris Sync

2017-11-04 13:37:13 -04:00

robot

Polaris sync

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

stacks

Polaris sync

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

weapons

Adds a cosmetic "armor vest" taur saddlebag subtype.

2017-11-14 16:18:47 +02:00

antag_spawners.dm

Syndicate Borgs II, Return of the Salt

2017-10-20 13:01:45 -04:00

apc_frame.dm

…

blueprints.dm

Pol sync part 2

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

bodybag.dm

…

contraband_vr.dm

LOTS OF FIXES

2017-10-08 18:05:27 -04: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

tweaks v2

2017-10-31 20:49:17 +00:00

trash_vr.dm

Adds 2 neutral gimmick traits and borgo feeding.

2017-11-13 20:01:58 +02:00

trash.dm

…