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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt
#	icons/mob/vore/taurs_vr.dmi
#	maps/tether/tether_defines.dm

2017-07-20 15:50:53 -04:00

..

devices

Adds in body snatcher device (#1822)

2017-07-19 15:26:34 -04:00

robot

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

2017-04-01 19:19:42 -04:00

stacks

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

weapons

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

2017-07-20 15:50:53 -04:00

apc_frame.dm

…

blueprints.dm

Made blueprints able to expand station areas into spae

2017-03-04 23:14:12 -05:00

bodybag.dm

Some more types which need Destroy to return qdel hints!

2017-06-14 01:13:54 -04:00

contraband_vr.dm

Destroy() cleanups in VOREStation code

2017-06-10 22:44:03 -04:00

contraband.dm

…

crayons.dm

…

glassjar.dm

Polaris Sync October 9th (#633)

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

latexballoon.dm

Ports a bunch of fluff stuff

2017-02-21 13:50:14 -06:00

paintkit.dm

…

shooting_range.dm

…

toys.dm

Polaris Sync October 9th (#633)

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

trash.dm

Adds in an Unathi-made jerky snack

2017-04-07 23:36:22 -05:00