From 78f4a2fd3f70875a59413865f7ae6d9eeff205ef Mon Sep 17 00:00:00 2001 From: SplinterGP Date: Thu, 30 Apr 2020 20:08:06 -0300 Subject: [PATCH] Autolathe patch, fixes teleporter stuff making it buildable --- code/__defines/research.dm | 2 +- code/datums/autolathe/arms_1.dm | 7 +++++++ code/datums/autolathe/devices_1.dm | 6 ++++++ .../objects/items/weapons/circuitboards/frame.dm | 4 ++-- .../research/designs/circuits/circuits_yw.dm | 13 +++++++++++++ vorestation.dme | 1 + 6 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 code/modules/research/designs/circuits/circuits_yw.dm diff --git a/code/__defines/research.dm b/code/__defines/research.dm index 7abea58c4e..fc049ca473 100644 --- a/code/__defines/research.dm +++ b/code/__defines/research.dm @@ -18,4 +18,4 @@ #define MECHFAB 0x0004 //Mechfab #define CHASSIS 0x0008 //For protolathe, but differently #define PROSFAB 0x0010 //For prosthetics fab -#define AUTOLATHE 12 //YW add, for autolathe \ No newline at end of file +#define AUTOLATHE 32 //YW add, for autolathe \ No newline at end of file diff --git a/code/datums/autolathe/arms_1.dm b/code/datums/autolathe/arms_1.dm index 7d3a598ee1..9274b3b964 100644 --- a/code/datums/autolathe/arms_1.dm +++ b/code/datums/autolathe/arms_1.dm @@ -327,6 +327,13 @@ materials = list(DEFAULT_WALL_MATERIAL = 625) hidden = 1 +/datum/design/item/autolathe/arms/tacknife + name = "tactical knife" + id = "tacknife" + build_path = /obj/item/weapon/material/knife/tacknife + materials = list(DEFAULT_WALL_MATERIAL = 625) + hidden = 1 + /datum/design/item/autolathe/arms/flamethrower name = "flamethrower" id = "flamethrower" diff --git a/code/datums/autolathe/devices_1.dm b/code/datums/autolathe/devices_1.dm index 5cfdc6afa7..875a12588a 100644 --- a/code/datums/autolathe/devices_1.dm +++ b/code/datums/autolathe/devices_1.dm @@ -43,3 +43,9 @@ build_path = /obj/item/device/radio/electropack materials = list(DEFAULT_WALL_MATERIAL = 12500, "glass" = 3125) hidden = 1 + +/datum/design/item/autolathe/devices/timer + name = "timer" + id = "timer" + build_path = /obj/item/device/assembly/timer + materials = list(DEFAULT_WALL_MATERIAL = 1000, "glass" = 250) \ No newline at end of file diff --git a/code/game/objects/items/weapons/circuitboards/frame.dm b/code/game/objects/items/weapons/circuitboards/frame.dm index 5bd472be6c..5af072e8f9 100644 --- a/code/game/objects/items/weapons/circuitboards/frame.dm +++ b/code/game/objects/items/weapons/circuitboards/frame.dm @@ -182,7 +182,7 @@ /obj/item/weapon/circuitboard/teleporter_hub name = T_BOARD("teleporter hub") build_path = /obj/machinery/teleport/hub - board_type = "teleporter_hub" + board_type = new /datum/frame/frame_types/machine // origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 4) req_components = list( /obj/item/weapon/stock_parts/scanning_module = 4, @@ -192,7 +192,7 @@ /obj/item/weapon/circuitboard/teleporter_station name = T_BOARD("teleporter station") build_path = /obj/machinery/teleport/station - board_type = "teleporter_station" + board_type = new /datum/frame/frame_types/machine // origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 3) req_components = list( /obj/item/weapon/stock_parts/console_screen = 1, diff --git a/code/modules/research/designs/circuits/circuits_yw.dm b/code/modules/research/designs/circuits/circuits_yw.dm new file mode 100644 index 0000000000..4d1756d24f --- /dev/null +++ b/code/modules/research/designs/circuits/circuits_yw.dm @@ -0,0 +1,13 @@ +/datum/design/circuit/teleporter_hub + name = "teleporter hub" + id = "teleporter_hub" + req_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 2) + build_path = /obj/item/weapon/circuitboard/teleporter_hub + sort_string = "HAAAA" + +/datum/design/circuit/teleporter_station + name = "teleporter station" + id = "teleporter_station" + req_tech = list(TECH_DATA = 3, TECH_BLUESPACE = 2) + build_path = /obj/item/weapon/circuitboard/teleporter_station + sort_string = "HAAAA" \ No newline at end of file diff --git a/vorestation.dme b/vorestation.dme index abc6f7c49c..6123624ae6 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3328,6 +3328,7 @@ #include "code\modules\research\designs\circuits\ai_modules.dm" #include "code\modules\research\designs\circuits\circuits.dm" #include "code\modules\research\designs\circuits\circuits_vr.dm" +#include "code\modules\research\designs\circuits\circuits_yw.dm" #include "code\modules\research\designs\circuits\disks.dm" #include "code\modules\resleeving\circuitboards.dm" #include "code\modules\resleeving\computers.dm"