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 |
|
Hawk_v3
|
6b1055adc8
|
Commenting out Phoronics until new map.
Removing design boards from R&D
|
2018-06-22 20:16:21 +01:00 |
|
RadiantFlash7
|
9d46e68742
|
blueshield, more clothes/vests, more weapons, phorochem fixes,
Map additions, Phorochem interface fix, some phoreagents fixed, Added
gauss weaponry and blueshield x01, added blueshield role with
uniform/closet.
|
2018-06-11 21:27:11 -04:00 |
|
RadiantFlash7
|
22d13f10c2
|
All my changes so far.
note to self: Engineering, Perma, civil jobs, and electricity+piping
|
2018-02-02 04:57:01 -05:00 |
|