cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Crystal Agitators (#8609)

Browse Source
This commit is contained in:
Geeves
2020-09-01 14:04:12 +02:00
committed by GitHub
parent 737c201738
commit a24f4ddb79
36 changed files with 2062 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/subsystems/radio.dm
View File

@@ -173,6 +173,8 @@ var/datum/controller/subsystem/radio/SSradio
. = "airadio"
if (SEC_FREQ,SEC_I_FREQ)
. = "secradio"
if (PEN_FREQ)
. = "penradio"
if (ENG_FREQ)
. = "engradio"
if (SCI_FREQ)

26
code/controllers/subsystems/virtual_reality.dm
View File

@@ -6,11 +6,11 @@
flags = SS_NO_FIRE
// MECHA
var/list/mechnetworks = list("remotemechs", "aimechs", "prisonmechs") // A list of all the networks a mech can possibly connect to
var/list/mechnetworks = list(REMOTE_GENERIC_MECH, REMOTE_AI_MECH, REMOTE_PRISON_MECH) // A list of all the networks a mech can possibly connect to
var/list/list/mechs = list() // A list of lists, containing the mechs and their networks
// IPC BODIES
var/list/robotnetworks = list("remoterobots", "bunkerrobots", "prisonrobots")
var/list/robotnetworks = list(REMOTE_GENERIC_ROBOT, REMOTE_BUNKER_ROBOT, REMOTE_PRISON_ROBOT, REMOTE_WARDEN_ROBOT)
var/list/list/robots = list()
/datum/controller/subsystem/virtualreality/New()
@@ -125,7 +125,6 @@
/datum/controller/subsystem/virtualreality/proc/mech_selection(var/user, var/network)
var/list/mech = list()
mech["Return"] = null
for(var/mob/living/heavy_vehicle/R in mechs[network])
var/turf/T = get_turf(R)
@@ -144,23 +143,20 @@
continue
mech[R.name] = R
if(mech.len == 1)
if(!length(mech))
to_chat(user, SPAN_WARNING("No active remote mechs are available."))
return
var/desc = input("Please select a remote control compatible mech to take over.", "Remote Mech Selection") in mech|null
if(!desc)
var/choice = input("Please select a remote control compatible mech to take over.", "Remote Mech Selection") as null|anything in mech
if(!choice)
return
var/mob/living/heavy_vehicle/chosen_mech = mech[desc]
var/mob/living/heavy_vehicle/chosen_mech = mech[choice]
var/mob/living/remote_pilot = chosen_mech.pilots[1] // the first pilot
mind_transfer(user, remote_pilot)
return
/datum/controller/subsystem/virtualreality/proc/robot_selection(var/user, var/network)
var/list/robot = list()
robot["Return"] = null
for(var/mob/living/R in robots[network])
var/turf/T = get_turf(R)
@@ -174,14 +170,12 @@
continue
robot[R.name] = R
if(robot.len == 1)
if(!length(robot))
to_chat(user, SPAN_WARNING("No active remote robots are available."))
return
var/desc = input("Please select a remote control robot to take over.", "Remote Robot Selection") in robot|null
if(!desc)
var/choice = input("Please select a remote control robot to take over.", "Remote Robot Selection") as null|anything in robot
if(!choice)
return
mind_transfer(user, robot[desc])
return
mind_transfer(user, robot[choice])