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

Robotics changes.

Browse Source
This commit is contained in:
Alberyk
2020-03-27 20:09:49 -03:00
parent 7edd8270a6
commit ac6080c8dd
3 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
code/modules/research/designs/mechfab/mechs/designs_exosuits.dm
View File

@@ -43,7 +43,7 @@
id = "mech_frame"
build_path = /obj/structure/heavy_vehicle_frame
time = 70
materials = list(DEFAULT_WALL_MATERIAL = 20000)
materials = list(DEFAULT_WALL_MATERIAL = 15000)
category = "Exosuits"
/datum/design/item/mechfab/exosuit/basic_armour
@@ -51,7 +51,7 @@
id = "mech_armour_basic"
build_path = /obj/item/robot_parts/robot_component/armor/mech
time = 30
materials = list(DEFAULT_WALL_MATERIAL = 7500)
materials = list(DEFAULT_WALL_MATERIAL = 6000)
/datum/design/item/mechfab/exosuit/radproof_armour
name = "radiation-proof exosuit armour"
@@ -121,34 +121,34 @@
id = "ripley_head"
build_path = /obj/item/mech_component/sensors/ripley
time = 15
materials = list(DEFAULT_WALL_MATERIAL = 5000)
materials = list(DEFAULT_WALL_MATERIAL = 3500)
/datum/design/item/mechfab/exosuit/ripley_torso
name = "power loader chassis"
id = "ripley_body"
build_path = /obj/item/mech_component/chassis/ripley
time = 50
materials = list(DEFAULT_WALL_MATERIAL = 20000)
time = 35
materials = list(DEFAULT_WALL_MATERIAL = 15000)
/datum/design/item/mechfab/exosuit/ripley_arms
name = "power loader manipulators"
id = "ripley_arms"
build_path = /obj/item/mech_component/manipulators/ripley
time = 30
materials = list(DEFAULT_WALL_MATERIAL = 6000)
time = 25
materials = list(DEFAULT_WALL_MATERIAL = 4500)
/datum/design/item/mechfab/exosuit/ripley_legs
name = "power loader motivators"
id = "ripley_legs"
build_path = /obj/item/mech_component/propulsion/ripley
time = 30
materials = list(DEFAULT_WALL_MATERIAL = 6000)
time = 25
materials = list(DEFAULT_WALL_MATERIAL = 4500)
/datum/design/item/mechfab/exosuit/light_head
name = "light exosuit sensors"
id = "light_head"
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 8000)
materials = list(DEFAULT_WALL_MATERIAL = 6500)
build_path = /obj/item/mech_component/sensors/light
req_tech = list(TECH_MATERIAL = 1)
@@ -156,7 +156,7 @@
name = "light exosuit chassis"
id = "light_body"
time = 40
materials = list(DEFAULT_WALL_MATERIAL = 30000)
materials = list(DEFAULT_WALL_MATERIAL = 25000)
build_path = /obj/item/mech_component/chassis/light
req_tech = list(TECH_MATERIAL = 1)
@@ -180,7 +180,7 @@
name = "heavy exosuit sensors"
id = "heavy_head"
time = 35
materials = list(DEFAULT_WALL_MATERIAL = 16000)
materials = list(DEFAULT_WALL_MATERIAL = 12000)
build_path = /obj/item/mech_component/sensors/heavy
req_tech = list(TECH_COMBAT = 2)

30
code/modules/research/designs/mechfab/robot/robot.dm
View File

@@ -16,53 +16,53 @@
name = "Robot exoskeleton"
id = "robot_exoskeleton"
build_path = /obj/item/robot_parts/robot_suit
time = 50
materials = list(DEFAULT_WALL_MATERIAL = 50000)
time = 35
materials = list(DEFAULT_WALL_MATERIAL = 35000)
/datum/design/item/mechfab/robot/torso
name = "Robot torso"
id = "robot_torso"
build_path = /obj/item/robot_parts/chest
time = 35
materials = list(DEFAULT_WALL_MATERIAL = 40000)
time = 25
materials = list(DEFAULT_WALL_MATERIAL = 25000)
/datum/design/item/mechfab/robot/head
name = "Robot head"
id = "robot_head"
build_path = /obj/item/robot_parts/head
time = 35
materials = list(DEFAULT_WALL_MATERIAL = 25000)
time = 25
materials = list(DEFAULT_WALL_MATERIAL = 15000)
/datum/design/item/mechfab/robot/l_arm
name = "Robot left arm"
id = "robot_l_arm"
build_path = /obj/item/robot_parts/l_arm
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 18000)
time = 10
materials = list(DEFAULT_WALL_MATERIAL = 10000)
/datum/design/item/mechfab/robot/r_arm
name = "Robot right arm"
id = "robot_r_arm"
build_path = /obj/item/robot_parts/r_arm
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 18000)
time = 10
materials = list(DEFAULT_WALL_MATERIAL = 10000)
/datum/design/item/mechfab/robot/l_leg
name = "Robot left leg"
id = "robot_l_leg"
build_path = /obj/item/robot_parts/l_leg
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 15000)
time = 10
materials = list(DEFAULT_WALL_MATERIAL = 10000)
/datum/design/item/mechfab/robot/r_leg
name = "Robot right leg"
id = "robot_r_leg"
build_path = /obj/item/robot_parts/r_leg
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 15000)
time = 10
materials = list(DEFAULT_WALL_MATERIAL = 10000)
/datum/design/item/mechfab/robot/component
time = 20
time = 10
materials = list(DEFAULT_WALL_MATERIAL = 5000)
/datum/design/item/mechfab/robot/component/synthetic_flash

49
code/modules/research/rdconsole.dm
View File

@@ -41,11 +41,15 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/obj/machinery/r_n_d/protolathe/linked_lathe = null //Linked Protolathe
var/obj/machinery/r_n_d/circuit_imprinter/linked_imprinter = null //Linked Circuit Imprinter
var/allow_analyzer = TRUE
var/allow_lathe = TRUE
var/allow_imprinter = TRUE
var/screen = 1.0 //Which screen is currently showing.
var/id = 0 //ID of the computer (for server restrictions).
var/sync = 1 //If sync = 0, it doesn't show up on Server Control Console
req_access = list(access_research) //Data and setting manipulation requires scientist access.
req_access = list(access_tox) //Data and setting manipulation requires scientist access.
/obj/machinery/computer/rdconsole/proc/CallMaterialName(var/ID)
var/return_name = ID
@@ -74,15 +78,15 @@ won't update every console in existence) but it's more of a hassle to do. Also,
for(var/obj/machinery/r_n_d/D in range(3, src))
if(D.linked_console != null || D.panel_open)
continue
if(istype(D, /obj/machinery/r_n_d/destructive_analyzer))
if(istype(D, /obj/machinery/r_n_d/destructive_analyzer) && allow_analyzer)
if(linked_destroy == null)
linked_destroy = D
D.linked_console = src
else if(istype(D, /obj/machinery/r_n_d/protolathe))
else if(istype(D, /obj/machinery/r_n_d/protolathe) && allow_lathe)
if(linked_lathe == null)
linked_lathe = D
D.linked_console = src
else if(istype(D, /obj/machinery/r_n_d/circuit_imprinter))
else if(istype(D, /obj/machinery/r_n_d/circuit_imprinter) && allow_imprinter)
if(linked_imprinter == null)
linked_imprinter = D
D.linked_console = src
@@ -598,19 +602,25 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "<A href='?src=\ref[src];find_device=1'>Re-sync with Nearby Devices</A><HR>"
dat += "Linked Devices:"
dat += "<UL>"
if(linked_destroy)
dat += "<LI>Destructive Analyzer <A href='?src=\ref[src];disconnect=destroy'>(Disconnect)</A>"
else
dat += "<LI>(No Destructive Analyzer Linked)"
if(linked_lathe)
dat += "<LI>Protolathe <A href='?src=\ref[src];disconnect=lathe'>(Disconnect)</A>"
else
dat += "<LI>(No Protolathe Linked)"
if(linked_imprinter)
dat += "<LI>Circuit Imprinter <A href='?src=\ref[src];disconnect=imprinter'>(Disconnect)</A>"
else
dat += "<LI>(No Circuit Imprinter Linked)"
dat += "</UL>"
if(allow_analyzer)
if(linked_destroy)
dat += "<LI>Destructive Analyzer <A href='?src=\ref[src];disconnect=destroy'>(Disconnect)</A>"
else
dat += "<LI>(No Destructive Analyzer Linked)"
if(allow_lathe)
if(linked_lathe)
dat += "<LI>Protolathe <A href='?src=\ref[src];disconnect=lathe'>(Disconnect)</A>"
else
dat += "<LI>(No Protolathe Linked)"
if(allow_imprinter)
if(linked_imprinter)
dat += "<LI>Circuit Imprinter <A href='?src=\ref[src];disconnect=imprinter'>(Disconnect)</A>"
else
dat += "<LI>(No Circuit Imprinter Linked)"
dat += "</UL>"
////////////////////DESTRUCTIVE ANALYZER SCREENS////////////////////////////
if(2.0)
@@ -800,8 +810,9 @@ won't update every console in existence) but it's more of a hassle to do. Also,
name = "Robotics R&D Console"
id = 2
req_access = list(access_robotics)
allow_analyzer = FALSE
allow_lathe = FALSE
/obj/machinery/computer/rdconsole/core
name = "Core R&D Console"
id = 1
req_access = list(access_tox) //so scientists and lab assistants can use it
id = 1