From d94808f10948e44fa531c75f53751a3a803f37d5 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 1 Jul 2015 13:57:22 -0400 Subject: [PATCH 1/9] Changes it to Announcement and keeps it ... open ended to clearly define that there is no "X wins by this point". Also had to fix 214 because 'bad name'.... I'm not sure why, Based Byond strikes again. --- code/game/gamemodes/malfunction/malfunction.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 6d0feda4a1e..40bc7104518 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -117,8 +117,7 @@ /datum/game_mode/malfunction/proc/capture_the_station() - world << "The AI has accessed the station's Core Files!" - world << "It has fully taken control of all of [station_name()]'s systems." + minor_announce("The Intelligence Unit has accessed the core files!", null, 'sound/AI/aimalf.ogg', "Priority") to_nuke_or_not_to_nuke = 1 for(var/datum/mind/AI_mind in malf_ai) @@ -212,7 +211,7 @@ /datum/game_mode/malfunction/proc/ai_win() set category = "Malfunction" set name = "Explode" - set desc = "Activates the self-destruct device on [world.name]." + set desc = "Activates the self-destruct device on the station." if (!ticker.mode:to_nuke_or_not_to_nuke) return ticker.mode:to_nuke_or_not_to_nuke = 0 From 5d6cd1b235e14b9f13384fe52f3a504df18405d0 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 23 Jul 2015 12:30:36 -0400 Subject: [PATCH 2/9] Revert "Changes it to Announcement and keeps it ..." This reverts commit 786ceee2e4f7dc703f06f63786975d430a77b203. --- code/game/gamemodes/malfunction/malfunction.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index 40bc7104518..6d0feda4a1e 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -117,7 +117,8 @@ /datum/game_mode/malfunction/proc/capture_the_station() - minor_announce("The Intelligence Unit has accessed the core files!", null, 'sound/AI/aimalf.ogg', "Priority") + world << "The AI has accessed the station's Core Files!" + world << "It has fully taken control of all of [station_name()]'s systems." to_nuke_or_not_to_nuke = 1 for(var/datum/mind/AI_mind in malf_ai) @@ -211,7 +212,7 @@ /datum/game_mode/malfunction/proc/ai_win() set category = "Malfunction" set name = "Explode" - set desc = "Activates the self-destruct device on the station." + set desc = "Activates the self-destruct device on [world.name]." if (!ticker.mode:to_nuke_or_not_to_nuke) return ticker.mode:to_nuke_or_not_to_nuke = 0 From 98561a60c1d1354576730eef47e7837f5883dd01 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 15 Aug 2015 19:05:05 -0400 Subject: [PATCH 3/9] Moves Cloning Machines/Comps to Medical Section --- .../research/designs/comp_board_designs.dm | 29 ---------- .../research/designs/machine_designs.dm | 30 ++++++++++ tgstation.dme | 58 +++++++++++++++++++ 3 files changed, 88 insertions(+), 29 deletions(-) diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 0f657da38b0..5b99724b022 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -160,35 +160,6 @@ build_path = /obj/item/weapon/circuitboard/robotics category = list("Computer Boards") -/datum/design/clonecontrol - name = "Computer Design (Cloning Machine Console)" - desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console." - id = "clonecontrol" - req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/cloning - category = list("Computer Boards") - -/datum/design/clonepod - name = "Machine Design (Clone Pod)" - desc = "Allows for the construction of circuit boards used to build a Cloning Pod." - id = "clonepod" - req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/clonepod - category = list("Computer Boards") - -/datum/design/clonescanner - name = "Machine Design (Cloning Scanner)" - desc = "Allows for the construction of circuit boards used to build a Cloning Scanner." - id = "clonescanner" - req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/clonescanner - category = list("Computer Boards") /datum/design/arcadebattle name = "Computer Design (Battle Arcade Machine)" diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 75202c87387..c62281d10d7 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -142,6 +142,36 @@ build_path = /obj/item/weapon/circuitboard/chem_heater category = list ("Medical Machinery") +/datum/design/clonecontrol + name = "Computer Design (Cloning Machine Console)" + desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console." + id = "clonecontrol" + req_tech = list("programming" = 3, "biotech" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/cloning + category = list("Medical Machinery") + +/datum/design/clonepod + name = "Machine Design (Clone Pod)" + desc = "Allows for the construction of circuit boards used to build a Cloning Pod." + id = "clonepod" + req_tech = list("programming" = 3, "biotech" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/clonepod + category = list("Medical Machinery") + +/datum/design/clonescanner + name = "Machine Design (Cloning Scanner)" + desc = "Allows for the construction of circuit boards used to build a Cloning Scanner." + id = "clonescanner" + req_tech = list("programming" = 3, "biotech" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/clonescanner + category = list("Medical Machinery") + /datum/design/biogenerator name = "Machine Design (Biogenerator Board)" desc = "The circuit board for a biogenerator." diff --git a/tgstation.dme b/tgstation.dme index 7677d19fc8f..52812a0252d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,6 +6,64 @@ // BEGIN_FILE_DIR #define FILE_DIR . +#define FILE_DIR "code" +#define FILE_DIR "code/modules" +#define FILE_DIR "code/modules/games" +#define FILE_DIR "code/modules/html_interface" +#define FILE_DIR "code/modules/html_interface/cards" +#define FILE_DIR "code/modules/html_interface/nanotrasen" +#define FILE_DIR "html" +#define FILE_DIR "icons" +#define FILE_DIR "icons/ass" +#define FILE_DIR "icons/effects" +#define FILE_DIR "icons/mecha" +#define FILE_DIR "icons/misc" +#define FILE_DIR "icons/mob" +#define FILE_DIR "icons/mob/inhands" +#define FILE_DIR "icons/obj" +#define FILE_DIR "icons/obj/assemblies" +#define FILE_DIR "icons/obj/atmospherics" +#define FILE_DIR "icons/obj/atmospherics/components" +#define FILE_DIR "icons/obj/atmospherics/pipes" +#define FILE_DIR "icons/obj/clothing" +#define FILE_DIR "icons/obj/doors" +#define FILE_DIR "icons/obj/flora" +#define FILE_DIR "icons/obj/food" +#define FILE_DIR "icons/obj/guns" +#define FILE_DIR "icons/obj/hydroponics" +#define FILE_DIR "icons/obj/machines" +#define FILE_DIR "icons/obj/power_cond" +#define FILE_DIR "icons/obj/smooth_structures" +#define FILE_DIR "icons/obj/smooth_structures/alien" +#define FILE_DIR "icons/pda_icons" +#define FILE_DIR "icons/spideros_icons" +#define FILE_DIR "icons/stamp_icons" +#define FILE_DIR "icons/Testing" +#define FILE_DIR "icons/turf" +#define FILE_DIR "icons/turf/floors" +#define FILE_DIR "icons/turf/walls" +#define FILE_DIR "icons/vending_icons" +#define FILE_DIR "nano" +#define FILE_DIR "nano/images" +#define FILE_DIR "sound" +#define FILE_DIR "sound/AI" +#define FILE_DIR "sound/ambience" +#define FILE_DIR "sound/arcade" +#define FILE_DIR "sound/effects" +#define FILE_DIR "sound/guitar" +#define FILE_DIR "sound/hallucinations" +#define FILE_DIR "sound/items" +#define FILE_DIR "sound/machines" +#define FILE_DIR "sound/magic" +#define FILE_DIR "sound/mecha" +#define FILE_DIR "sound/misc" +#define FILE_DIR "sound/piano" +#define FILE_DIR "sound/spookoween" +#define FILE_DIR "sound/violin" +#define FILE_DIR "sound/voice" +#define FILE_DIR "sound/voice/complionator" +#define FILE_DIR "sound/vox_fem" +#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES From 1ee8f0ce10535834429b0007b7c5df0e758b913e Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 15 Aug 2015 19:05:53 -0400 Subject: [PATCH 4/9] Adds Health Analyzer to Protolathe --- code/modules/research/designs/medical_designs.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 1501167a730..d0568f1b491 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -2,6 +2,17 @@ ////////////Medical Tools//////////////// ///////////////////////////////////////// +/datum/design/healthanalyzer + name = "Health Analyzer" + desc = "A hand-held body scanner able to distinguish vital signs of the subject." + id = "healthanalyzer" + req_tech = list("biotech" = 2, "magnets" = 1, "power" = 1) + build_type = PROTOLATHE + materials = list(MAT_METAL = 25, MAT_GLASS = 20) + reliability = 76 + build_path = /obj/item/device/healthanalyzer + category = list("Medical Designs") + /datum/design/mass_spectrometer name = "Mass-Spectrometer" desc = "A device for analyzing chemicals in the blood." From 6d6fcddc67ce59e0208eb986a95ce65d5a959ca9 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 15 Aug 2015 19:15:32 -0400 Subject: [PATCH 5/9] Edits Required Tech --- code/modules/research/designs/medical_designs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index d0568f1b491..fdad0d5102d 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -6,7 +6,7 @@ name = "Health Analyzer" desc = "A hand-held body scanner able to distinguish vital signs of the subject." id = "healthanalyzer" - req_tech = list("biotech" = 2, "magnets" = 1, "power" = 1) + req_tech = list("biotech" = 1, "magnets" = 1) build_type = PROTOLATHE materials = list(MAT_METAL = 25, MAT_GLASS = 20) reliability = 76 From 01bf5472ebde5735d0d609169c68b626dd96da8c Mon Sep 17 00:00:00 2001 From: ExcessiveUseOfCobblestone Date: Tue, 18 Aug 2015 15:45:51 -0400 Subject: [PATCH 6/9] Revert "Moves Cloning Machines/Comps to Medical Section" This reverts commit 98561a60c1d1354576730eef47e7837f5883dd01. --- .../research/designs/comp_board_designs.dm | 29 ++++++++++ .../research/designs/machine_designs.dm | 30 ---------- tgstation.dme | 58 ------------------- 3 files changed, 29 insertions(+), 88 deletions(-) diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 5b99724b022..0f657da38b0 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -160,6 +160,35 @@ build_path = /obj/item/weapon/circuitboard/robotics category = list("Computer Boards") +/datum/design/clonecontrol + name = "Computer Design (Cloning Machine Console)" + desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console." + id = "clonecontrol" + req_tech = list("programming" = 3, "biotech" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/cloning + category = list("Computer Boards") + +/datum/design/clonepod + name = "Machine Design (Clone Pod)" + desc = "Allows for the construction of circuit boards used to build a Cloning Pod." + id = "clonepod" + req_tech = list("programming" = 3, "biotech" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/clonepod + category = list("Computer Boards") + +/datum/design/clonescanner + name = "Machine Design (Cloning Scanner)" + desc = "Allows for the construction of circuit boards used to build a Cloning Scanner." + id = "clonescanner" + req_tech = list("programming" = 3, "biotech" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/clonescanner + category = list("Computer Boards") /datum/design/arcadebattle name = "Computer Design (Battle Arcade Machine)" diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index c62281d10d7..75202c87387 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -142,36 +142,6 @@ build_path = /obj/item/weapon/circuitboard/chem_heater category = list ("Medical Machinery") -/datum/design/clonecontrol - name = "Computer Design (Cloning Machine Console)" - desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console." - id = "clonecontrol" - req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/cloning - category = list("Medical Machinery") - -/datum/design/clonepod - name = "Machine Design (Clone Pod)" - desc = "Allows for the construction of circuit boards used to build a Cloning Pod." - id = "clonepod" - req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/clonepod - category = list("Medical Machinery") - -/datum/design/clonescanner - name = "Machine Design (Cloning Scanner)" - desc = "Allows for the construction of circuit boards used to build a Cloning Scanner." - id = "clonescanner" - req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/clonescanner - category = list("Medical Machinery") - /datum/design/biogenerator name = "Machine Design (Biogenerator Board)" desc = "The circuit board for a biogenerator." diff --git a/tgstation.dme b/tgstation.dme index ae825e3bf2e..a212ac871cd 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6,64 +6,6 @@ // BEGIN_FILE_DIR #define FILE_DIR . -#define FILE_DIR "code" -#define FILE_DIR "code/modules" -#define FILE_DIR "code/modules/games" -#define FILE_DIR "code/modules/html_interface" -#define FILE_DIR "code/modules/html_interface/cards" -#define FILE_DIR "code/modules/html_interface/nanotrasen" -#define FILE_DIR "html" -#define FILE_DIR "icons" -#define FILE_DIR "icons/ass" -#define FILE_DIR "icons/effects" -#define FILE_DIR "icons/mecha" -#define FILE_DIR "icons/misc" -#define FILE_DIR "icons/mob" -#define FILE_DIR "icons/mob/inhands" -#define FILE_DIR "icons/obj" -#define FILE_DIR "icons/obj/assemblies" -#define FILE_DIR "icons/obj/atmospherics" -#define FILE_DIR "icons/obj/atmospherics/components" -#define FILE_DIR "icons/obj/atmospherics/pipes" -#define FILE_DIR "icons/obj/clothing" -#define FILE_DIR "icons/obj/doors" -#define FILE_DIR "icons/obj/flora" -#define FILE_DIR "icons/obj/food" -#define FILE_DIR "icons/obj/guns" -#define FILE_DIR "icons/obj/hydroponics" -#define FILE_DIR "icons/obj/machines" -#define FILE_DIR "icons/obj/power_cond" -#define FILE_DIR "icons/obj/smooth_structures" -#define FILE_DIR "icons/obj/smooth_structures/alien" -#define FILE_DIR "icons/pda_icons" -#define FILE_DIR "icons/spideros_icons" -#define FILE_DIR "icons/stamp_icons" -#define FILE_DIR "icons/Testing" -#define FILE_DIR "icons/turf" -#define FILE_DIR "icons/turf/floors" -#define FILE_DIR "icons/turf/walls" -#define FILE_DIR "icons/vending_icons" -#define FILE_DIR "nano" -#define FILE_DIR "nano/images" -#define FILE_DIR "sound" -#define FILE_DIR "sound/AI" -#define FILE_DIR "sound/ambience" -#define FILE_DIR "sound/arcade" -#define FILE_DIR "sound/effects" -#define FILE_DIR "sound/guitar" -#define FILE_DIR "sound/hallucinations" -#define FILE_DIR "sound/items" -#define FILE_DIR "sound/machines" -#define FILE_DIR "sound/magic" -#define FILE_DIR "sound/mecha" -#define FILE_DIR "sound/misc" -#define FILE_DIR "sound/piano" -#define FILE_DIR "sound/spookoween" -#define FILE_DIR "sound/violin" -#define FILE_DIR "sound/voice" -#define FILE_DIR "sound/voice/complionator" -#define FILE_DIR "sound/vox_fem" -#define FILE_DIR "sound/weapons" // END_FILE_DIR // BEGIN_PREFERENCES From e800add01bab401f0878eedc17de725ff6529934 Mon Sep 17 00:00:00 2001 From: ExcessiveUseOfCobblestone Date: Tue, 18 Aug 2015 15:50:09 -0400 Subject: [PATCH 7/9] OK WE FIXED IT BOYS fuck the DME amirite --- .../research/designs/comp_board_designs.dm | 30 ------------------- .../research/designs/machine_designs.dm | 30 +++++++++++++++++++ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index 0f657da38b0..be4b869c5d2 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -160,36 +160,6 @@ build_path = /obj/item/weapon/circuitboard/robotics category = list("Computer Boards") -/datum/design/clonecontrol - name = "Computer Design (Cloning Machine Console)" - desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console." - id = "clonecontrol" - req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/cloning - category = list("Computer Boards") - -/datum/design/clonepod - name = "Machine Design (Clone Pod)" - desc = "Allows for the construction of circuit boards used to build a Cloning Pod." - id = "clonepod" - req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/clonepod - category = list("Computer Boards") - -/datum/design/clonescanner - name = "Machine Design (Cloning Scanner)" - desc = "Allows for the construction of circuit boards used to build a Cloning Scanner." - id = "clonescanner" - req_tech = list("programming" = 3, "biotech" = 3) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/clonescanner - category = list("Computer Boards") - /datum/design/arcadebattle name = "Computer Design (Battle Arcade Machine)" desc = "Allows for the construction of circuit boards used to build a new arcade machine." diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 75202c87387..881c62217e2 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -142,6 +142,36 @@ build_path = /obj/item/weapon/circuitboard/chem_heater category = list ("Medical Machinery") + /datum/design/clonecontrol + name = "Computer Design (Cloning Machine Console)" + desc = "Allows for the construction of circuit boards used to build a new Cloning Machine console." + id = "clonecontrol" + req_tech = list("programming" = 3, "biotech" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/cloning + category = list("Medical Machinery") + +/datum/design/clonepod + name = "Machine Design (Clone Pod)" + desc = "Allows for the construction of circuit boards used to build a Cloning Pod." + id = "clonepod" + req_tech = list("programming" = 3, "biotech" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/clonepod + category = list("Medical Machinery") + +/datum/design/clonescanner + name = "Machine Design (Cloning Scanner)" + desc = "Allows for the construction of circuit boards used to build a Cloning Scanner." + id = "clonescanner" + req_tech = list("programming" = 3, "biotech" = 3) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/clonescanner + category = list("Medical Machinery") + /datum/design/biogenerator name = "Machine Design (Biogenerator Board)" desc = "The circuit board for a biogenerator." From 928d7e874d78a696d1dcf5319aaffe28b6d95ab1 Mon Sep 17 00:00:00 2001 From: ExcessiveUseOfCobblestone Date: Tue, 18 Aug 2015 19:28:40 -0400 Subject: [PATCH 8/9] For you Scones [Telesci stuff moved to Tele Sec.] but I still have a crush on pap sooo >.> --- .../research/designs/comp_board_designs.dm | 19 ------------------ .../research/designs/machine_designs.dm | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index be4b869c5d2..9748ab6ffbe 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -110,15 +110,6 @@ build_path = /obj/item/weapon/circuitboard/crew category = list("Computer Boards") -/datum/design/teleconsole - name = "Computer Design (Teleporter Console)" - desc = "Allows for the construction of circuit boards used to build a teleporter control console." - id = "teleconsole" - req_tech = list("programming" = 3, "bluespace" = 2) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/teleporter - category = list("Computer Boards") /datum/design/secdata name = "Computer Design (Security Records Console)" @@ -320,16 +311,6 @@ build_path = /obj/item/weapon/circuitboard/comm_traffic category = list("Computer Boards") -/datum/design/telesci_console - name = "Computer Design (Telepad Control Console Board)" - desc = "Allows for the construction of circuit boards used to build a telescience console." - id = "telesci_console" - req_tech = list("programming" = 3, "bluespace" = 2) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/telesci_console - category = list("Computer Boards") - /datum/design/aifixer name = "Computer Design (AI Integrity Restorer)" desc = "Allows for the construction of circuit boards used to build an AI Integrity Restorer." diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 881c62217e2..8b60ab13056 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -92,6 +92,26 @@ build_path = /obj/item/weapon/circuitboard/telesci_pad category = list ("Teleportation Machinery") +/datum/design/teleconsole + name = "Computer Design (Teleporter Console)" + desc = "Allows for the construction of circuit boards used to build a teleporter control console." + id = "teleconsole" + req_tech = list("programming" = 3, "bluespace" = 2) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/teleporter + category = list("Teleportation Machinery") + +/datum/design/telesci_console + name = "Computer Design (Telepad Control Console Board)" + desc = "Allows for the construction of circuit boards used to build a telescience console." + id = "telesci_console" + req_tech = list("programming" = 3, "bluespace" = 2) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/telesci_console + category = list("Teleportation Machinery") + /datum/design/sleeper name = "Machine Design (Sleeper Board)" desc = "The circuit board for a sleeper." From d85cae38bbf258aab4ba7696497568e7f636b398 Mon Sep 17 00:00:00 2001 From: ExcessiveUseOfCobblestone Date: Mon, 31 Aug 2015 15:56:42 -0400 Subject: [PATCH 9/9] Moved to Auto --- code/modules/research/designs/autolathe_designs.dm | 8 ++++++++ code/modules/research/designs/medical_designs.dm | 10 ---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index a9ef8e34eed..d82ec7b0942 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -266,6 +266,14 @@ build_path = /obj/item/weapon/reagent_containers/glass/beaker/large category = list("initial", "Medical") +/datum/design/healthanalyzer + name = "Health Analyzer" + id = "healthanalyzer" + build_type = AUTOLATHE + materials = list(MAT_METAL = 500, MAT_GLASS = 50) + build_path = /obj/item/device/healthanalyzer + category = list("initial", "Medical") + /datum/design/beanbag_slug name = "Beanbag slug" id = "beanbag_slug" diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index a6281b80375..329066dfa42 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -2,16 +2,6 @@ ////////////Medical Tools//////////////// ///////////////////////////////////////// -/datum/design/healthanalyzer - name = "Health Analyzer" - desc = "A hand-held body scanner able to distinguish vital signs of the subject." - id = "healthanalyzer" - req_tech = list("biotech" = 1, "magnets" = 1) - build_type = PROTOLATHE - materials = list(MAT_METAL = 25, MAT_GLASS = 20) - reliability = 76 - build_path = /obj/item/device/healthanalyzer - category = list("Medical Designs") /datum/design/mass_spectrometer name = "Mass-Spectrometer"