diff --git a/aurorastation.dme b/aurorastation.dme index eec06ced5f1..f80520d79d4 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1373,7 +1373,6 @@ #include "code\game\objects\items\weapons\vaurca_items.dm" #include "code\game\objects\items\weapons\weaponry.dm" #include "code\game\objects\items\weapons\circuitboards\circuitboard.dm" -#include "code\game\objects\items\weapons\circuitboards\mecha.dm" #include "code\game\objects\items\weapons\circuitboards\rig.dm" #include "code\game\objects\items\weapons\circuitboards\computer\air_management.dm" #include "code\game\objects\items\weapons\circuitboards\computer\camera_monitor.dm" diff --git a/code/__DEFINES/circuitboard.dm b/code/__DEFINES/circuitboard.dm index 189c0d11338..e5748b9098c 100644 --- a/code/__DEFINES/circuitboard.dm +++ b/code/__DEFINES/circuitboard.dm @@ -9,5 +9,4 @@ #define T_BOARD(name) "" + "circuit board " + "(" + (name) + ")" #define T_BOARD_HARDSUIT(name) "" + "hardsuit circuit board " + "(" + (name) + ")" #define T_BOARD_HARDSUIT_TARGETING(name) "" + "hardsuit control and targeting circuit board " + "(" + (name) + ")" -#define T_BOARD_MECHA(name) "" + "exosuit module circuit board " + "(" + (name) + ")" #define T_BOARD_VEHICLE(name) "" + "vehicle software " + "(" + (name) + ")" diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index b3c7ef2d477..1606d86a668 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -160,7 +160,3 @@ return else ..() - -/obj/machinery/computer/pod/old/swf - name = "Magix System IV" - desc = "An arcane artifact that holds much magic. Running E-Knock 2.2: Sorceror's Edition" diff --git a/code/game/objects/items/weapons/circuitboards/computer/computer.dm b/code/game/objects/items/weapons/circuitboards/computer/computer.dm index c7b565f1711..fdba7a921e4 100644 --- a/code/game/objects/items/weapons/circuitboards/computer/computer.dm +++ b/code/game/objects/items/weapons/circuitboards/computer/computer.dm @@ -68,10 +68,6 @@ name = T_BOARD("ProComp Executive") build_path = /obj/machinery/computer/pod/old/syndicate -/obj/item/circuitboard/swfdoor - name = T_BOARD("Magix") - build_path = /obj/machinery/computer/pod/old/swf - /obj/item/circuitboard/rdservercontrol name = T_BOARD("R&D server control console") build_path = /obj/machinery/computer/rdservercontrol diff --git a/code/game/objects/items/weapons/circuitboards/mecha.dm b/code/game/objects/items/weapons/circuitboards/mecha.dm deleted file mode 100644 index 34db01ae850..00000000000 --- a/code/game/objects/items/weapons/circuitboards/mecha.dm +++ /dev/null @@ -1,110 +0,0 @@ -/obj/item/circuitboard/mecha - name = "exosuit circuit board" - icon = 'icons/obj/module.dmi' - icon_state = "std_mod" - item_state = "electronic" - board_type = "other" - - -/obj/item/circuitboard/mecha/ripley - origin_tech = list(TECH_DATA = 3) - -/obj/item/circuitboard/mecha/ripley/peripherals - name = T_BOARD_MECHA("Ripley peripherals control") - icon_state = "mcontroller" - -/obj/item/circuitboard/mecha/ripley/main - name = T_BOARD_MECHA("Ripley central control") - icon_state = "mainboard" - - -/obj/item/circuitboard/mecha/gygax - origin_tech = list(TECH_DATA = 4) - -/obj/item/circuitboard/mecha/gygax/peripherals - name = T_BOARD_MECHA("Gygax peripherals control") - icon_state = "mcontroller" - -/obj/item/circuitboard/mecha/gygax/targeting - name = T_BOARD_MECHA("Gygax weapon control and targeting") - icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 4) - -/obj/item/circuitboard/mecha/gygax/main - name = T_BOARD_MECHA("Gygax central control") - icon_state = "mainboard" - - -/obj/item/circuitboard/mecha/durand - origin_tech = list(TECH_DATA = 4) - -/obj/item/circuitboard/mecha/durand/peripherals - name = T_BOARD_MECHA("Durand peripherals control") - icon_state = "mcontroller" - -/obj/item/circuitboard/mecha/durand/targeting - name = T_BOARD_MECHA("Durand weapon control and targeting") - icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 4, TECH_COMBAT = 4) - -/obj/item/circuitboard/mecha/durand/main - name = T_BOARD_MECHA("Durand central control") - icon_state = "mainboard" - - -/obj/item/circuitboard/mecha/honker - origin_tech = list(TECH_DATA = 4) - -/obj/item/circuitboard/mecha/honker/peripherals - name = T_BOARD_MECHA("H.O.N.K peripherals control") - icon_state = "mcontroller" - -/obj/item/circuitboard/mecha/honker/targeting - name = T_BOARD_MECHA("H.O.N.K weapon control and targeting") - icon_state = "mcontroller" - -/obj/item/circuitboard/mecha/honker/main - name = T_BOARD_MECHA("H.O.N.K central control") - icon_state = "mainboard" - - -/obj/item/circuitboard/mecha/odysseus - origin_tech = list(TECH_DATA = 3) - -/obj/item/circuitboard/mecha/odysseus/peripherals - name = T_BOARD_MECHA("Odysseus peripherals control") - icon_state = "mcontroller" - -/obj/item/circuitboard/mecha/odysseus/main - name = T_BOARD_MECHA("Odysseus central control") - icon_state = "mainboard" - -/obj/item/circuitboard/mecha/hermes - origin_tech = list(TECH_DATA = 2) - -/obj/item/circuitboard/mecha/hermes/peripherals - name = T_BOARD_MECHA("Hermes peripherals control") - icon_state = "mcontroller" - -/obj/item/circuitboard/mecha/hermes/main - name = T_BOARD_MECHA("Hermes central control") - icon_state = "mainboard" - -/obj/item/circuitboard/mecha/phazon - origin_tech = list(TECH_DATA = 5, TECH_BLUESPACE = 5) - -/obj/item/circuitboard/mecha/phazon/peripherals - name = T_BOARD_MECHA("Phazon peripherals control") - icon_state = "mcontroller" - -/obj/item/circuitboard/mecha/phazon/targeting - name = T_BOARD_MECHA("Phazon weapon control and targeting") - icon_state = "mcontroller" - origin_tech = list(TECH_DATA = 5, TECH_COMBAT = 6, TECH_BLUESPACE = 5) - -/obj/item/circuitboard/mecha/phazon/main - name = T_BOARD_MECHA("Phazon central control") - icon_state = "mainboard" - -//Undef the macro, shouldn't be needed anywhere else -#undef T_BOARD_MECHA diff --git a/code/game/objects/items/weapons/circuitboards/rig.dm b/code/game/objects/items/weapons/circuitboards/rig.dm index 4fd883096d4..0d0054f6dec 100644 --- a/code/game/objects/items/weapons/circuitboards/rig.dm +++ b/code/game/objects/items/weapons/circuitboards/rig.dm @@ -1,4 +1,4 @@ -/obj/item/circuitboard/rig_assembly +ABSTRACT_TYPE(/obj/item/circuitboard/rig_assembly) name = "rig circuit board" icon = 'icons/obj/module.dmi' icon_state = "std_mod" @@ -9,7 +9,7 @@ ////CIVILIAN BOARDS//// /////////////////////// -/obj/item/circuitboard/rig_assembly/civilian +ABSTRACT_TYPE(/obj/item/circuitboard/rig_assembly/civilian) origin_tech = list(TECH_DATA = 4) /obj/item/circuitboard/rig_assembly/civilian/industrial @@ -35,7 +35,7 @@ ////COMBAT BOARDS//// ///////////////////// -/obj/item/circuitboard/rig_assembly/combat +ABSTRACT_TYPE(/obj/item/circuitboard/rig_assembly/combat) origin_tech = list(TECH_DATA = 5) /obj/item/circuitboard/rig_assembly/combat/targeting @@ -69,7 +69,7 @@ ////ILLEGAL BOARDS//// ////////////////////// -/obj/item/circuitboard/rig_assembly/illegal +ABSTRACT_TYPE(/obj/item/circuitboard/rig_assembly/illegal) origin_tech = list(TECH_DATA = 7, TECH_ILLEGAL = 4) /obj/item/circuitboard/rig_assembly/illegal/targeting diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm index 91cc2b4810f..5a2ac3f0885 100644 --- a/code/modules/cargo/random_stock/t1_common.dm +++ b/code/modules/cargo/random_stock/t1_common.dm @@ -137,9 +137,15 @@ STOCK_ITEM_COMMON(circuitboard, 1) var/list/allboards = subtypesof(/obj/item/circuitboard) var/list/exclusion = list( /obj/item/circuitboard/unary_atmos, - /obj/item/circuitboard/telecomms + /obj/item/circuitboard/telecomms, + /* Remove abstract hardsuit circuit boards. + These 4 aren't used in hardsuit construction. + Their children are used instead. */ + /obj/item/circuitboard/rig_assembly, + /obj/item/circuitboard/rig_assembly/civilian, + /obj/item/circuitboard/rig_assembly/combat, + /obj/item/circuitboard/rig_assembly/illegal ) - exclusion += typesof(/obj/item/circuitboard/mecha) allboards -= exclusion var/type = pick(allboards) diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm index 682441f41b4..b8c79df362d 100644 --- a/code/modules/cargo/random_stock/t2_uncommon.dm +++ b/code/modules/cargo/random_stock/t2_uncommon.dm @@ -120,9 +120,15 @@ STOCK_ITEM_UNCOMMON(circuitboards, 3) var/list/allboards = subtypesof(/obj/item/circuitboard) var/list/exclusion = list( /obj/item/circuitboard/unary_atmos, - /obj/item/circuitboard/telecomms + /obj/item/circuitboard/telecomms, + /* Remove abstract hardsuit circuit boards. + These 4 aren't used in hardsuit construction. + Their children are used instead. */ + /obj/item/circuitboard/rig_assembly, + /obj/item/circuitboard/rig_assembly/civilian, + /obj/item/circuitboard/rig_assembly/combat, + /obj/item/circuitboard/rig_assembly/illegal ) - exclusion += typesof(/obj/item/circuitboard/mecha) allboards -= exclusion for(var/i in 1 to rand(1, 2)) diff --git a/html/changelogs/hellfirejag-remove-unused-old-mech-boards.yml b/html/changelogs/hellfirejag-remove-unused-old-mech-boards.yml new file mode 100644 index 00000000000..438d15ce5b2 --- /dev/null +++ b/html/changelogs/hellfirejag-remove-unused-old-mech-boards.yml @@ -0,0 +1,5 @@ +author: Hellfirejag +delete-after: True +changes: + - rscdel: "Removed circuit boards for deprecated \"old mechs\" that could no longer be manufactured." + - rscdel: "Removed the abstract parent of hardsuit circuit boards from circuit board spawners." diff --git a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm index 8348f1e5b62..beaf2f67aa7 100644 --- a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm +++ b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm @@ -1683,10 +1683,6 @@ /turf/simulated/floor/reinforced/airless, /area/abandoned_industrial_station/atmos) "fz" = ( -/obj/item/circuitboard/mecha/ripley{ - pixel_x = 3; - pixel_y = 8 - }, /obj/effect/decal/remains/robot{ pixel_x = -18; pixel_y = -5 diff --git a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm index 4ced6e762bd..f84cee500e4 100644 --- a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm +++ b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm @@ -830,7 +830,6 @@ /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "rG" = ( -/obj/item/circuitboard/mecha/phazon/peripherals, /obj/structure/largecrate/hoverpod, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) @@ -986,7 +985,6 @@ /obj/structure/window/reinforced/tinted{ dir = 8 }, -/obj/item/circuitboard/mecha/phazon/main, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "uR" = ( @@ -1531,7 +1529,6 @@ /area/wrecked_nt_ship) "Jc" = ( /obj/structure/table/reinforced/steel, -/obj/item/circuitboard/mecha/phazon, /turf/simulated/floor/tiled/steel/airless, /area/wrecked_nt_ship) "Jw" = ( diff --git a/maps/away/away_site/zavod_shuttle_destroyed/zavod_shuttle_destroyed.dmm b/maps/away/away_site/zavod_shuttle_destroyed/zavod_shuttle_destroyed.dmm index 3b8ce30e3e1..d34df902e79 100644 --- a/maps/away/away_site/zavod_shuttle_destroyed/zavod_shuttle_destroyed.dmm +++ b/maps/away/away_site/zavod_shuttle_destroyed/zavod_shuttle_destroyed.dmm @@ -819,8 +819,6 @@ /area/zavod_shuttle_destroyed) "zV" = ( /obj/structure/closet/crate/drop/grey, -/obj/item/circuitboard/mecha, -/obj/item/circuitboard/mecha, /obj/item/robot_parts/robot_component/actuator, /obj/item/robot_parts/robot_component/actuator, /obj/item/robot_parts/robot_component/actuator,