izac112
|
e28994b7be
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
All conflicts resolved
Signed-off-by: izac112 <izac10@live.com>
|
2020-05-06 21:53:03 +02:00 |
|
Aronai Sieyes
|
6ebd249748
|
Rewrite examine() to pass a list around
|
2020-04-29 16:42:50 -04:00 |
|
Repede
|
4cf7f71be6
|
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/teleportation.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/events/event_container_vr.dm
# code/modules/mining/ore_box.dm
# code/modules/paperwork/paper.dm
# code/modules/rogueminer_vr/zone_console.dm
# config/custom_items.txt
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/suits.dmi
# maps/tether/tether_defines.dm
|
2020-02-22 12:38:04 -05:00 |
|
Novacat
|
33570d10e6
|
Update ore_box.dm
|
2020-02-17 01:33:15 -05:00 |
|
Novacat
|
332e3271d9
|
Update ore_box.dm
|
2020-02-17 01:31:48 -05:00 |
|
Atermonera
|
c5b6dfa259
|
Fixes mining borg ore box movement astral sorcery
|
2020-02-17 01:18:31 -05:00 |
|