diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 2a8378cefa..0533b207c5 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -25,6 +25,8 @@ /obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R) if(..()) return 0 + R.pixel_x = initial(pixel_x) //VOREStation Edit + R.pixel_y = initial(pixel_y) //VOREStation Edit R.uneq_all() R.modtype = initial(R.modtype) R.hands.icon_state = initial(R.hands.icon_state) diff --git a/code/game/objects/items/robot/robot_upgrades_vr.dm b/code/game/objects/items/robot/robot_upgrades_vr.dm deleted file mode 100644 index 80ca38113b..0000000000 --- a/code/game/objects/items/robot/robot_upgrades_vr.dm +++ /dev/null @@ -1,23 +0,0 @@ -/* - -/obj/item/borg/upgrade/reset/action/proc/resetborg(var/mob/living/silicon/robot/R) - if(..()) return 0 - R.uneq_all() - R.modtype = initial(R.modtype) - R.hands.icon_state = initial(R.hands.icon_state) - R.icon = 'icons/mob/robots.dmi' - R.pixel_x = initial(pixel_x) - R.pixel_y = initial(pixel_y) - - R.notify_ai(ROBOT_NOTIFICATION_MODULE_RESET, R.module.name) - R.module.Reset(R) - qdel(R.module) - R.module = null - R.updatename("Default") -*/ - -//Make it so reset module doesn't bug up borgs. Not a huge problem, but should be added in before launch. - -//Could probably do -//if(attempt_vr(src,"resetborg(var/mob/living/silicon/robot/R)",args)) return //VOREStation Code -//or something like that \ No newline at end of file diff --git a/code/modules/shuttles/shuttles_vr.dm b/code/modules/shuttles/shuttles_vr.dm index 71a1cf25ac..a65dd328cf 100644 --- a/code/modules/shuttles/shuttles_vr.dm +++ b/code/modules/shuttles/shuttles_vr.dm @@ -10,7 +10,7 @@ /obj/machinery/computer/shuttle_control/belter name = "belter control console" - req_access = list(access_mining) + req_one_access = list(access_research, access_mining) //Allows xenoarch AND miners to use it. // shuttle_tag = "Belter" //The scanning console needs to enable/disable this at will. /obj/machinery/computer/shuttle_control/mining diff --git a/vorestation.dme b/vorestation.dme index 3ce3f4060e..615abe33e3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -841,7 +841,6 @@ #include "code\game\objects\items\robot\robot_items.dm" #include "code\game\objects\items\robot\robot_parts.dm" #include "code\game\objects\items\robot\robot_upgrades.dm" -#include "code\game\objects\items\robot\robot_upgrades_vr.dm" #include "code\game\objects\items\stacks\fifty_spawner.dm" #include "code\game\objects\items\stacks\matter_synth.dm" #include "code\game\objects\items\stacks\medical.dm"