mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
e44e346352
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