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

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

Fixed conflicts, fixed race racism money bs

2018-04-27 21:45:13 -04:00

..

devices

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018

2018-04-25 17:23:33 -04:00

robot

Module change and reset animations for borgs (#3210)

2018-03-16 20:35:08 -04:00

stacks

Reverts gauze disinfecting until a proper solution can be put in place.

2018-04-08 20:24:48 -04:00

weapons

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

2018-04-27 21:45:13 -04:00

antag_spawners.dm

…

apc_frame.dm

Fix building frames on walls and windows.

2018-04-11 23:13:54 -04:00

blueprints.dm

…

bodybag.dm

Cryobag oxygen supply increased (#4866)

2018-02-18 11:48:30 -08:00

contraband_vr.dm

…

contraband.dm

…

crayons.dm

Reverted use of 'usr' back to 'user' from commit 05fd53ebcc

2018-04-01 22:03:10 -04:00

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

Prod suit modkits

2018-02-12 13:10:26 -08:00

poi_items.dm

Added Decoupled starship engine PoI (#4649)

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

shooting_range.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

toys.dm

- Fixes carp plushies to now have a base sprite & be selectable in the loadout.

2018-04-20 09:55:09 -05:00

trash_vr.dm

VS: Rewrites basically all of how bellies work

2018-02-27 13:29:45 -05:00

trash.dm

…