Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
Unknown
0424f4b907
More Fixes
2019-03-27 04:22:08 -04:00
Unknown
95f57bb8c7
Conflict Fixes
2019-03-27 02:19:02 -04:00
Michael Gosselin
a47cf6841a
Ground work for Player picked engines.
...
Lays down the ground work for players being able to select the engine at
the start of the round.
Proof of Concept using a pickEngine() proc that can be called from the
mapping controller.
2018-06-26 02:18:42 -04:00
Arokha Sieyes
d5c9d3cb4e
Port /tg/ lavaland shelters
...
Nanotech twist rather than bluespace, but whatever.
2018-04-23 15:25:35 -04:00
Arokha Sieyes
e82f535d0e
VS: Mapping subsystem supports lists only, now.
...
That's probably how it should have been.
2018-02-07 20:03:39 -05:00
Leshana
38f20304ca
Initialize procs for virgo
2018-02-03 01:00:57 -05:00
Arokha Sieyes
20450d848c
VS: Allow preloading maps from map datums in the mapping controller
2018-01-26 16:29:12 -05:00
Leshana
71b3ef47a9
Add checks to allow Tesla to fully dissipate once it runs out of energy.
2018-01-21 16:19:13 -05:00
