mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-24 04:28:12 +01:00
Allows Construction of Serenity in Robotics
This commit is contained in:
@@ -474,7 +474,11 @@ CIRCUITS BELOW
|
||||
req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2)
|
||||
build_path = /obj/item/weapon/circuitboard/mecha/gygax/targeting
|
||||
sort_string = "NAACC"
|
||||
<<<<<<< HEAD
|
||||
//VOREStation Edit to make Serenity Constructable
|
||||
=======
|
||||
|
||||
>>>>>>> fcc8242... Allows Construction of Serenity in Robotics (#6380)
|
||||
/datum/design/circuit/mecha/gygax_medical
|
||||
name = "'Serenity' medical control"
|
||||
id = "gygax_medical"
|
||||
|
||||
@@ -107,13 +107,21 @@
|
||||
|
||||
/datum/design/item/mechfab/gygax
|
||||
category = "Gygax"
|
||||
<<<<<<< HEAD
|
||||
//VOREStation Edit to make Serenity Constructable
|
||||
=======
|
||||
|
||||
>>>>>>> fcc8242... Allows Construction of Serenity in Robotics (#6380)
|
||||
/datum/design/item/mechfab/gygax/chassis/serenity
|
||||
name = "Serenity Chassis"
|
||||
id = "serenity_chassis"
|
||||
build_path = /obj/item/mecha_parts/chassis/serenity
|
||||
materials = list(DEFAULT_WALL_MATERIAL = 18750, "phoron" = 4000)
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> fcc8242... Allows Construction of Serenity in Robotics (#6380)
|
||||
/datum/design/item/mechfab/gygax/chassis
|
||||
name = "Gygax Chassis"
|
||||
id = "gygax_chassis"
|
||||
|
||||
Reference in New Issue
Block a user