Repede e44e346352 Release Update ...

Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate

# Conflicts:
#	code/__defines/machinery.dm
#	code/controllers/configuration.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/doors/blast_door.dm
#	code/game/machinery/pipe/pipe_recipes.dm
#	code/game/objects/items/devices/radio/radio_vr.dm
#	code/modules/client/preferences_vr.dm
#	code/modules/clothing/glasses/hud_vr.dm
#	code/modules/clothing/under/accessories/accessory_vr.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/gamemaster/actions/planet_weather_change.dm
#	code/modules/projectiles/guns/energy/netgun_vr.dm
#	code/modules/projectiles/guns/energy/protector_vr.dm
#	code/modules/vore/appearance/sprite_accessories_taur_vr.dm
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	code/modules/vore/fluffstuff/custom_guns_vr.dm
#	icons/obj/power.dmi
#	vorestation.dme

2020-04-16 21:07:33 -04:00

..

css

Mergey Merge Polaris VChat

2020-03-29 15:37:43 -04:00

html

Some VChat Tweaks

2020-03-04 20:53:35 -05:00

js

Update vchat.js

2020-04-14 16:02:49 +02:00

vchat_client.dm

Adds pref to toggle vchat without 60s wait for linux users (#6980)

2020-04-12 00:51:57 -04:00

vchat_db.dm

Change VChat sqllite error message handler

2020-03-30 20:24:55 -04:00