Repede d4bb48b2f6 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Resolved Conflicts:
#	code/game/machinery/cloning.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-29 09:58:53 -04:00

..

devices

Update:

2018-06-24 17:44:44 +01:00

robot

Module change and reset animations for borgs (#3210)

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

stacks

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

2018-05-29 21:05:27 -04:00

weapons

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

2018-06-29 09:58:53 -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

…

gunbox.dm

…

latexballoon.dm

…

paintkit.dm

…

poi_items.dm

Makes closets/crates like boxes

2018-05-24 17:26:17 -04: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

…