diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index 0e0e55b00cb5..4073d4dc2b87 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -70,7 +70,6 @@ #include "outfits/_outfits.dme" #include "world_view_bigger/_world_view_bigger.dme" #include "mecha_skins/mecha_skins.dme" -#include "new_mecha_executioner/_new_mecha_executioner.dme" #include "queue/_queue.dme" // --- PRIME --- // diff --git a/modular_ss220/new_mecha_executioner/_new_mecha_executioner.dm b/modular_ss220/new_mecha_executioner/_new_mecha_executioner.dm deleted file mode 100644 index c4546525061b..000000000000 --- a/modular_ss220/new_mecha_executioner/_new_mecha_executioner.dm +++ /dev/null @@ -1,4 +0,0 @@ -/datum/modpack/new_mecha_executioner - name = "Executor" - desc = "старо-новый мех. порт со старо пары" - author = "Lime-7" diff --git a/modular_ss220/new_mecha_executioner/_new_mecha_executioner.dme b/modular_ss220/new_mecha_executioner/_new_mecha_executioner.dme deleted file mode 100644 index 68d8958cbe82..000000000000 --- a/modular_ss220/new_mecha_executioner/_new_mecha_executioner.dme +++ /dev/null @@ -1,11 +0,0 @@ -#include "_new_mecha_executioner.dm" - -#include "code\Executor.dm" -#include "code\mech_fabricator.dm" -#include "code\mecha_actions.dm" -#include "code\mecha_construction_paths.dm" -#include "code\mecha_designs.dm" -#include "code\mecha_parts.dm" -#include "code\mecha_wreckage.dm" -#include "code\mecha.dm" -#include "code\mechfabricator_designs.dm" diff --git a/modular_ss220/new_mecha_executioner/code/Executor.dm b/modular_ss220/new_mecha_executioner/code/Executor.dm deleted file mode 100644 index d36adfcedda1..000000000000 --- a/modular_ss220/new_mecha_executioner/code/Executor.dm +++ /dev/null @@ -1,23 +0,0 @@ -/obj/mecha/combat/executioner - name = "mk. V \"The Executioner\"" - desc = "Дредноут Ордена Палача, тяжелая конфигурация огневой поддержки, созданная для уничтожения зла и еретиков. Чрезвычайно хорош в ближнем бою." - icon = 'modular_ss220/new_mecha_executioner/icons/mecha.dmi' - icon_state = "executioner" - initial_icon = "executioner" - max_temperature = 65000 - step_in = 4 - max_integrity = 350 - deflect_chance = 15 - force = 40 - resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF - armor = list("melee" = 70, "bullet" = 15, "laser" = 5, "energy" = 30, "bomb" = 20, "bio" = 0, "rad" = 100, "fire" = 100, "acid" = 100) - max_equip = 3 - wreckage = /obj/structure/mecha_wreckage/executioner - -/obj/mecha/combat/executioner/GrantActions(mob/living/user, human_occupant = 0) - . = ..() - flash_action.Grant(user, src) - -/obj/mecha/combat/executioner/RemoveActions(mob/living/user, human_occupant = 0) - . = ..() - flash_action.Remove(user) diff --git a/modular_ss220/new_mecha_executioner/code/mech_fabricator.dm b/modular_ss220/new_mecha_executioner/code/mech_fabricator.dm deleted file mode 100644 index 2aa5fb092ecd..000000000000 --- a/modular_ss220/new_mecha_executioner/code/mech_fabricator.dm +++ /dev/null @@ -1,36 +0,0 @@ -/obj/machinery/mecha_part_fabricator/Initialize(mapload) - . = ..() - // Set up some datums - var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_TRANQUILLITE, MAT_TITANIUM, MAT_BLUESPACE), 0, FALSE, /obj/item/stack, CALLBACK(src, PROC_REF(can_insert_materials)), CALLBACK(src, PROC_REF(on_material_insert))) - materials.precise_insertion = TRUE - local_designs = new /datum/research(src) - - // Components - component_parts = list() - component_parts += new /obj/item/circuitboard/mechfab(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/matter_bin(null) - component_parts += new /obj/item/stock_parts/manipulator(null) - component_parts += new /obj/item/stock_parts/micro_laser(null) - component_parts += new /obj/item/stack/sheet/glass(null) - RefreshParts() - - categories = list( - "Cyborg", - "Cyborg Repair", - "MODsuit Construction", - "MODsuit Modules", - "Ripley", - "Firefighter", - "Odysseus", - "Gygax", - "Durand", - "H.O.N.K", - "Reticence", - "Executioner", - "Phazon", - "Exosuit Equipment", - "Cyborg Upgrade Modules", - "Medical", - "Misc" - ) diff --git a/modular_ss220/new_mecha_executioner/code/mecha.dm b/modular_ss220/new_mecha_executioner/code/mecha.dm deleted file mode 100644 index 2e0906b1cb01..000000000000 --- a/modular_ss220/new_mecha_executioner/code/mecha.dm +++ /dev/null @@ -1,3 +0,0 @@ -/obj/mecha - var/flash_ready = TRUE - var/flash_cooldown = 50 diff --git a/modular_ss220/new_mecha_executioner/code/mecha_actions.dm b/modular_ss220/new_mecha_executioner/code/mecha_actions.dm deleted file mode 100644 index b8b3db07c62a..000000000000 --- a/modular_ss220/new_mecha_executioner/code/mecha_actions.dm +++ /dev/null @@ -1,34 +0,0 @@ -/obj/mecha - var/datum/action/innate/mecha/flash/flash_action = new -/datum/action/innate/mecha/flash - name = "Святой огонь" - desc = "Очистите оскверненных тварей с помощью святого света!" - icon_icon = 'modular_ss220/new_mecha_executioner/icons/actions_mecha.dmi' - button_icon_state = "holyflash" - -/datum/action/innate/mecha/flash/proc/flash_carbon(mob/living/carbon/M, mob/user = null, power = 5) - if(user) - add_attack_logs(user, M, "Flashed with [chassis]") - if(M.flash_eyes(1, 1)) - M.AdjustConfused(power) - M.Stun(5) - M.Weaken(10) - to_chat(user, "Вы ослепили [M] священным светом!") - to_chat(M, "[chassis] ослепил Вас с помощью священного света!") - else - to_chat(user, "Вам не удалось ослепить [M] священным светом!") - to_chat(M, "[chassis] не смог ослепить вас с помощью священного света!") - return - -/datum/action/innate/mecha/flash/Activate() - if(!owner || !chassis || chassis.occupant != owner) - return - if(chassis.flash_ready) - chassis.visible_message("[chassis] испускает ослепляющий святой свет!", "Твой [chassis] испускает ослепляющий святой свет!") - for(var/mob/living/carbon/M in oview(3, chassis)) - flash_carbon(M, chassis.occupant, 3, FALSE) - chassis.flash_ready = FALSE - spawn(chassis.flash_cooldown) - chassis.flash_ready = TRUE - else - chassis.occupant_message("Святой свет ещё не готов!") diff --git a/modular_ss220/new_mecha_executioner/code/mecha_construction_paths.dm b/modular_ss220/new_mecha_executioner/code/mecha_construction_paths.dm deleted file mode 100644 index 5b0c2343227b..000000000000 --- a/modular_ss220/new_mecha_executioner/code/mecha_construction_paths.dm +++ /dev/null @@ -1,308 +0,0 @@ -/datum/construction/mecha/executioner_chassis - steps = list( - list("key"=/obj/item/mecha_parts/part/executioner_torso),//1 - list("key"=/obj/item/mecha_parts/part/executioner_left_arm),//2 - list("key"=/obj/item/mecha_parts/part/executioner_right_arm),//3 - list("key"=/obj/item/mecha_parts/part/executioner_left_leg),//4 - list("key"=/obj/item/mecha_parts/part/executioner_right_leg),//5 - list("key"=/obj/item/mecha_parts/part/executioner_head) - ) - -/datum/construction/mecha/executioner_chassis/custom_action(step, atom/used_atom, mob/user) - user.visible_message("[user] прикрепил [used_atom] к [holder].", "вы прикрепили [used_atom] к [holder]") - holder.overlays += used_atom.icon_state+"+o" - qdel(used_atom) - return 1 - -/datum/construction/mecha/executioner_chassis/action(atom/used_atom,mob/user as mob) - return check_all_steps(used_atom,user) - -/datum/construction/mecha/executioner_chassis/spawn_result() - ..("mk. V \"The Executioner\"") - var/obj/item/mecha_parts/chassis/const_holder = holder - const_holder.construct = new /datum/construction/reversible/mecha/executioner(const_holder) - const_holder.icon = 'modular_ss220/new_mecha_executioner/icons/mech_construction.dmi' - const_holder.icon_state = "executioner0" - const_holder.density = TRUE - qdel(src) - return - -/datum/construction/reversible/mecha/executioner - result = /obj/mecha/combat/executioner - steps = list( - //1 - list( - "key"=/obj/item/soulstone/anybody/purified, - "backkey"=null, //Cannot remove soulstone once it's in - "desc"="камень души помещен в хранилище."), - //2 - list( - "key" = /obj/item/mecha_parts/core, - "backkey" = TOOL_SCREWDRIVER, - "desc" = "Внешняя броня заварена."), - //3 - list( - "key"=TOOL_WELDER, - "backkey"=TOOL_WRENCH, - "desc"="Внешняя броня закручена."), - //4 - list( - "key"=TOOL_WRENCH, - "backkey"=TOOL_CROWBAR, - "desc"="Внешняя броня установлена."), - //5 - list( - "key"=/obj/item/mecha_parts/part/executioner_armor, - "backkey"=TOOL_WELDER, - "desc"="святой крест заварен."), - //6 - list( - "key"=TOOL_WELDER, - "backkey"=TOOL_WRENCH, - "desc"="святой крест зкручен."), - //7 - list("key"=TOOL_WRENCH, - "backkey"=TOOL_CROWBAR, - "desc"="святой крест устоновлен."), - //8 - list( - "key"=/obj/item/stack/sheet/mineral/silver, - "backkey"=TOOL_SCREWDRIVER, - "desc"="святой шлем благословлен."), - //9 - list( - "key"=/obj/item/storage/bible, - "backkey"=TOOL_CROWBAR, - "desc"="святой шлем устоновлен."), - //10 - list( - "key"=/obj/item/clothing/head/helmet/riot/knight/templar, - "backkey"=TOOL_SCREWDRIVER, - "desc"="святая броня благословлена."), - //11 - list( - "key"=/obj/item/storage/bible, - "backkey"=TOOL_CROWBAR, - "desc"="святая броня устоновлена."), - //12 - list( - "key"=/obj/item/clothing/suit/armor/riot/knight/templar, - "backkey"=TOOL_SCREWDRIVER, - "desc"="сканирующей модуль благословлен."), - //13 - list( - "key"=/obj/item/storage/bible, - "backkey"=TOOL_CROWBAR, - "desc"="сканирующей модуль устоновлен."), - //14 - list( - "key"=/obj/item/circuitboard/mecha/executioner/targeting, - "backkey"=TOOL_SCREWDRIVER, - "desc"="периферийный контрольный модуль благословлен."), - //15 - list( - "key"=/obj/item/storage/bible, - "backkey"=TOOL_CROWBAR, - "desc"="периферийный контрольный модуль устоновлен."), - //16 - list( - "key"=/obj/item/circuitboard/mecha/executioner/peripherals, - "backkey"=TOOL_SCREWDRIVER, - "desc"="центральный контрольный модуль благословлен."), - //17 - list( - "key"=/obj/item/storage/bible, - "backkey"=TOOL_CROWBAR, - "desc"="центральный контрольный модуль устоновлен."), - //18 - list( - "key"=/obj/item/circuitboard/mecha/executioner/main, - "backkey"=TOOL_SCREWDRIVER, - "desc"="проводка устоновлена."), - //19 - list( - "key"=/obj/item/wirecutters, - "backkey"=TOOL_SCREWDRIVER, - "desc"="проводка добавлена."), - //20 - list( - "key"=/obj/item/stack/cable_coil, - "backkey"=TOOL_SCREWDRIVER, - "desc"="гидравлические системы активны."), - //21 - list( - "key"=TOOL_SCREWDRIVER, - "backkey"=TOOL_WRENCH, - "desc"="гидравлические системы устоновлены."), - //22 - list( - "key"=TOOL_WRENCH, - "desc"="Гидравлические системы отключены.") - ) - - -/datum/construction/reversible/mecha/executioner/action(atom/used_atom,mob/user as mob) - return check_step(used_atom,user) - -/datum/construction/reversible/mecha/executioner/custom_action(index, diff, atom/used_atom, mob/user) - if(!..()) - return 0 - - //TODO: better messages. - switch(index) - if(21) - user.visible_message("[user] connects the [holder] hydraulic systems", "You connect the [holder] hydraulic systems.") - holder.icon_state = "executioner1" - if(20) - if(diff==FORWARD) - user.visible_message("[user] activates the [holder] hydraulic systems.", "You activate the [holder] hydraulic systems.") - holder.icon_state = "executioner2" - else - user.visible_message("[user] disconnects the [holder] hydraulic systems", "You disconnect the [holder] hydraulic systems.") - holder.icon_state = "executioner0" - if(19) - if(diff==FORWARD) - user.visible_message("[user] adds the wiring to the [holder].", "You add the wiring to the [holder].") - holder.icon_state = "executioner3" - else - user.visible_message("[user] deactivates the [holder] hydraulic systems.", "You deactivate the [holder] hydraulic systems.") - holder.icon_state = "executioner1" - if(18) - if(diff==FORWARD) - user.visible_message("[user] adjusts the wiring of the [holder].", "You adjust the wiring of the [holder].") - holder.icon_state = "executioner4" - else - user.visible_message("[user] removes the wiring from the [holder].", "You remove the wiring from the [holder].") - var/obj/item/stack/cable_coil/coil = new /obj/item/stack/cable_coil(get_turf(holder)) - coil.amount = 4 - holder.icon_state = "executioner2" - if(17) - if(diff==FORWARD) - user.visible_message("[user] installs the central control module into the [holder].", "You install the central computer mainboard into the [holder].") - qdel(used_atom) - holder.icon_state = "executioner5" - else - user.visible_message("[user] disconnects the wiring of the [holder].", "You disconnect the wiring of the [holder].") - holder.icon_state = "executioner3" - if(16) - if(diff==FORWARD) - user.visible_message("[user] blessed the mainboard.", "You bless the mainboard.") - holder.icon_state = "executioner6" - else - user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") - new /obj/item/circuitboard/mecha/executioner/main(get_turf(holder)) - holder.icon_state = "executioner4" - if(15) - if(diff==FORWARD) - user.visible_message("[user] installs the peripherals control module into the [holder].", "You install the peripherals control module into the [holder].") - qdel(used_atom) - holder.icon_state = "executioner7" - else - user.visible_message("[user] unfastens the mainboard.", "You unfasten the mainboard.") - holder.icon_state = "executioner5" - if(14) - if(diff==FORWARD) - user.visible_message("[user] blessed the peripherals control module.", "You bless the peripherals control module.") - holder.icon_state = "executioner8" - else - user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") - new /obj/item/circuitboard/mecha/executioner/peripherals(get_turf(holder)) - holder.icon_state = "executioner6" - if(13) - if(diff==FORWARD) - user.visible_message("[user] installs the weapon control module into the [holder].", "You install the weapon control module into the [holder].") - qdel(used_atom) - holder.icon_state = "executioner9" - else - user.visible_message("[user] unfastens the peripherals control module.", "You unfasten the peripherals control module.") - holder.icon_state = "executioner7" - if(12) - if(diff==FORWARD) - user.visible_message("[user] blessed the weapon control module.", "You bless the weapon control module.") - holder.icon_state = "executioner10" - else - user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") - new /obj/item/circuitboard/mecha/executioner/targeting(get_turf(holder)) - holder.icon_state = "executioner8" - if(11) - if(diff==FORWARD) - user.visible_message("[user] installs the holy armour to the [holder].", "You install the holy armour to the [holder].") - qdel(used_atom) - holder.icon_state = "executioner11" - else - user.visible_message("[user] unfastens the weapon control module.", "You unfasten the weapon control module.") - holder.icon_state = "executioner9" - if(10) - if(diff==FORWARD) - user.visible_message("[user] blessed the holy armour.", "You bless the holy armour.") - holder.icon_state = "executioner12" - else - user.visible_message("[user] removes the holy armour from the [holder].", "You remove the holy armour from the [holder].") - new /obj/item/clothing/suit/armor/riot/knight/templar(get_turf(holder)) - holder.icon_state = "executioner10" - if(9) - if(diff==FORWARD) - user.visible_message("[user] installs the holy helmet to the [holder].", "You install holy helmet to the [holder].") - qdel(used_atom) - holder.icon_state = "executioner13" - else - user.visible_message("[user] unfastens the phasic scanner module.", "You unfasten the phasic scanner module.") - holder.icon_state = "executioner11" - if(8) - if(diff==FORWARD) - user.visible_message("[user] blessed the holy helmet.", "You bless the holy helmet.") - holder.icon_state = "executioner14" - else - user.visible_message("[user] removes the holy helmet from the [holder].", "You remove the holy helmet from the [holder].") - new /obj/item/clothing/head/helmet/riot/knight/templar(get_turf(holder)) - holder.icon_state = "executioner12" - if(7) - if(diff==FORWARD) - user.visible_message("[user] installs the holy cross to the [holder].", "You install the holy cross to the [holder].") - holder.icon_state = "executioner15" - else - user.visible_message("[user] unfastens the holy helmet.", "You unfasten the holy helmet.") - holder.icon_state = "executioner13" - if(6) - if(diff==FORWARD) - user.visible_message("[user] secures the holy cross.", "You secure the holy cross.") - holder.icon_state = "executioner16" - else - user.visible_message("[user] pries holy cross from the [holder].", "You pry holy cross from the [holder].") - var/obj/item/stack/sheet/metal/MS = new /obj/item/stack/sheet/mineral/silver(get_turf(holder)) - MS.amount = 5 - holder.icon_state = "executioner14" - if(5) - if(diff==FORWARD) - user.visible_message("[user] welds the holy cross to the [holder].", "You weld holy cross to the [holder].") - holder.icon_state = "executioner17" - else - user.visible_message("[user] unfastens the holy cross.", "You unfasten the holy cross.") - holder.icon_state = "executioner15" - if(4) - if(diff==FORWARD) - user.visible_message("[user] installs the Executioner Armor Plates to the [holder].", "You install Executioner Armor Plates to the [holder].") - qdel(used_atom) - holder.icon_state = "executioner18" - else - user.visible_message("[user] cuts the holy cross from the [holder].", "You cut the holy cross from the [holder].") - holder.icon_state = "executioner16" - if(3) - if(diff==FORWARD) - user.visible_message("[user] secures Executioner Armor Plates.", "You secure Executioner Armor Plates.") - holder.icon_state = "executioner19" - else - user.visible_message("[user] pries Executioner Armor Plates from the [holder].", "You pry Executioner Armor Plates from the [holder].") - new /obj/item/mecha_parts/part/durand_armor(get_turf(holder)) - holder.icon_state = "executioner17" - if(2) - if(diff==FORWARD) - user.visible_message("[user] welds Executioner Armor Plates to the [holder].", "You weld Executioner Armor Plates to the [holder].") - else - user.visible_message("[user] unfastens Executioner Armor Plates.", "You unfasten Executioner Armor Plates.") - holder.icon_state = "executioner18" - if(1) - if(diff==FORWARD) - user.visible_message("[user] put soulstone to the [holder]'s locket. Exosuit seems awaken now.", "You put soulstone to the [holder]'s locket. Exosuit seems awaken now.") - qdel(used_atom) - return 1 diff --git a/modular_ss220/new_mecha_executioner/code/mecha_designs.dm b/modular_ss220/new_mecha_executioner/code/mecha_designs.dm deleted file mode 100644 index 5266c00e79c2..000000000000 --- a/modular_ss220/new_mecha_executioner/code/mecha_designs.dm +++ /dev/null @@ -1,30 +0,0 @@ -// Executioner -/datum/design/executioner_main - name = "Exosuit Board (\"Executioner\" Central Control module)" - desc = "Allows for the construction of a \"Executioner\" Central Control module." - id = "executioner_main" - req_tech = list("programming" = 4, "combat" = 4, "engineering" = 4) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000) - build_path = /obj/item/circuitboard/mecha/executioner/main - category = list("Exosuit Modules") - -/datum/design/executioner_peri - name = "Exosuit Board (\"Executioner\" Peripherals Control module)" - desc = "Allows for the construction of a \"Executioner\" Peripheral Control module." - id = "executioner_peri" - req_tech = list("programming" = 4, "combat" = 4, "engineering" = 4) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000) - build_path = /obj/item/circuitboard/mecha/executioner/peripherals - category = list("Exosuit Modules") - -/datum/design/executioner_targ - name = "Exosuit Board (\"Executioner\" Weapons & Targeting Control module)" - desc = "Allows for the construction of a \"Executioner\" Weapons & Targeting Control module." - id = "executioner_targ" - req_tech = list("programming" = 5, "combat" = 4, "engineering" = 4) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000) - build_path = /obj/item/circuitboard/mecha/executioner/targeting - category = list("Exosuit Modules") diff --git a/modular_ss220/new_mecha_executioner/code/mecha_parts.dm b/modular_ss220/new_mecha_executioner/code/mecha_parts.dm deleted file mode 100644 index c2253dfd1c37..000000000000 --- a/modular_ss220/new_mecha_executioner/code/mecha_parts.dm +++ /dev/null @@ -1,66 +0,0 @@ -//////////// Executioner - -/obj/item/mecha_parts/chassis/executioner - name = "\improper Executioner Chassis" - -/obj/item/mecha_parts/chassis/executioner/New() - ..() - construct = new /datum/construction/mecha/executioner_chassis(src) - -/obj/item/mecha_parts/part/executioner_torso - name="\improper Executioner Torso" - icon = 'modular_ss220/new_mecha_executioner/icons/mech_construct.dmi' - icon_state = "durand_harness" - origin_tech = "programming=2;materials=3;biotech=3;engineering=3" - -/obj/item/mecha_parts/part/executioner_head - name="\improper Executioner Head" - icon = 'modular_ss220/new_mecha_executioner/icons/mech_construct.dmi' - icon_state = "durand_head" - origin_tech = "programming=2;materials=3;magnets=3;engineering=3" - -/obj/item/mecha_parts/part/executioner_left_arm - name="\improper Executioner Left Arm" - icon = 'modular_ss220/new_mecha_executioner/icons/mech_construct.dmi' - icon_state = "durand_l_arm" - origin_tech = "programming=2;materials=3;engineering=3" - -/obj/item/mecha_parts/part/executioner_right_arm - name="\improper Executioner Right Arm" - icon = 'modular_ss220/new_mecha_executioner/icons/mech_construct.dmi' - icon_state = "durand_r_arm" - origin_tech = "programming=2;materials=3;engineering=3" - -/obj/item/mecha_parts/part/executioner_left_leg - name="\improper Executioner Left Leg" - icon = 'modular_ss220/new_mecha_executioner/icons/mech_construct.dmi' - icon_state = "durand_l_leg" - origin_tech = "programming=2;materials=3;engineering=3" - -/obj/item/mecha_parts/part/executioner_right_leg - name="\improper Executioner Right Leg" - icon = 'modular_ss220/new_mecha_executioner/icons/mech_construct.dmi' - icon_state = "durand_r_leg" - origin_tech = "programming=2;materials=3;engineering=3" - -/obj/item/mecha_parts/part/executioner_armor - name="\improper Executioner Armour Plates" - icon = 'modular_ss220/new_mecha_executioner/icons/mech_construct.dmi' - icon_state = "executioner_armor" - origin_tech = "materials=5;combat=4;engineering=4" - -/obj/item/circuitboard/mecha/executioner - origin_tech = "programming=5;combat=4;engineering=4" - -/obj/item/circuitboard/mecha/executioner/peripherals - name = "Circuit board (Executioner Peripherals Control module)" - icon_state = "mcontroller" - -/obj/item/circuitboard/mecha/executioner/targeting - name = "Circuit board (Executionerurand Weapon Control and Targeting module)" - icon_state = "mcontroller" - origin_tech = "programming=5;combat=5;engineering=4" - -/obj/item/circuitboard/mecha/executioner/main - name = "Circuit board (Executioner Central Control module)" - icon_state = "mainboard" diff --git a/modular_ss220/new_mecha_executioner/code/mecha_wreckage.dm b/modular_ss220/new_mecha_executioner/code/mecha_wreckage.dm deleted file mode 100644 index 706f67aacce1..000000000000 --- a/modular_ss220/new_mecha_executioner/code/mecha_wreckage.dm +++ /dev/null @@ -1,7 +0,0 @@ -/obj/structure/mecha_wreckage/executioner - name = "\improper Executioner wreckage" - desc = "Он потерпел неудачу. Но.. он вернулся. он некогда не оставит человечество." - icon = 'modular_ss220/new_mecha_executioner/icons/mecha.dmi' - icon_state = "executioner-broken" - parts = list(/obj/item/soulstone/anybody/purified) - diff --git a/modular_ss220/new_mecha_executioner/code/mechfabricator_designs.dm b/modular_ss220/new_mecha_executioner/code/mechfabricator_designs.dm deleted file mode 100644 index 03bbce6a7b8c..000000000000 --- a/modular_ss220/new_mecha_executioner/code/mechfabricator_designs.dm +++ /dev/null @@ -1,72 +0,0 @@ -//Executioner -/datum/design/executioner_chassis - name = "Exosuit Chassis (\"Executioner\")" - id = "Executioner_chassis" - build_type = MECHFAB - build_path = /obj/item/mecha_parts/chassis/executioner - materials = list(MAT_METAL=30000,MAT_GLASS=5000) - construction_time = 100 - category = list("Executioner") - -/datum/design/executioner_torso - name = "Exosuit Torso (\"Executioner\")" - id = "executioner_torso" - build_type = MECHFAB - build_path = /obj/item/mecha_parts/part/executioner_torso - materials = list(MAT_METAL=30000,MAT_GLASS=20000,MAT_SILVER=10000) - construction_time = 300 - category = list("Executioner") - -/datum/design/executioner_head - name = "Exosuit Head (\"Executioner\")" - id = "executioner_head" - build_type = MECHFAB - build_path = /obj/item/mecha_parts/part/executioner_head - materials = list(MAT_METAL=10000,MAT_SILVER=10000) - construction_time = 200 - category = list("Executioner") - -/datum/design/executioner_left_arm - name = "Exosuit Left Arm (\"Executioner\")" - id = "executioner_left_arm" - build_type = MECHFAB - build_path = /obj/item/mecha_parts/part/executioner_left_arm - materials = list(MAT_METAL=10000,MAT_SILVER=10000) - construction_time = 200 - category = list("Executioner") - -/datum/design/executioner_right_arm - name = "Exosuit Right Arm (\"Executioner\")" - id = "executioner_right_arm" - build_type = MECHFAB - build_path = /obj/item/mecha_parts/part/executioner_right_arm - materials = list(MAT_METAL=10000,MAT_SILVER=10000) - construction_time = 200 - category = list("Executioner") - -/datum/design/executioner_left_leg - name = "Exosuit Left Leg (\"Executioner\")" - id = "executioner_left_leg" - build_type = MECHFAB - build_path = /obj/item/mecha_parts/part/executioner_left_leg - materials = list(MAT_METAL=15000,MAT_SILVER=10000) - construction_time = 200 - category = list("Executioner") - -/datum/design/executioner_right_leg - name = "Exosuit Right Leg (\"Executioner\")" - id = "executioner_right_leg" - build_type = MECHFAB - build_path = /obj/item/mecha_parts/part/executioner_right_leg - materials = list(MAT_METAL=15000,MAT_SILVER=10000) - construction_time = 200 - category = list("Executioner") - -/datum/design/executioner_armor - name = "Exosuit Armor (\"executioner\")" - id = "Executioner_armor" - build_type = MECHFAB - build_path = /obj/item/mecha_parts/part/executioner_armor - materials = list(MAT_METAL=30000,MAT_SILVER=20000,MAT_TITANIUM=25000,MAT_URANIUM=23000) - construction_time = 600 - category = list("Executioner") diff --git a/modular_ss220/new_mecha_executioner/icons/actions_mecha.dmi b/modular_ss220/new_mecha_executioner/icons/actions_mecha.dmi deleted file mode 100644 index 10c72624f795..000000000000 Binary files a/modular_ss220/new_mecha_executioner/icons/actions_mecha.dmi and /dev/null differ diff --git a/modular_ss220/new_mecha_executioner/icons/mech_construct.dmi b/modular_ss220/new_mecha_executioner/icons/mech_construct.dmi deleted file mode 100644 index def4f1b13075..000000000000 Binary files a/modular_ss220/new_mecha_executioner/icons/mech_construct.dmi and /dev/null differ diff --git a/modular_ss220/new_mecha_executioner/icons/mech_construction.dmi b/modular_ss220/new_mecha_executioner/icons/mech_construction.dmi deleted file mode 100644 index bfdc18b45832..000000000000 Binary files a/modular_ss220/new_mecha_executioner/icons/mech_construction.dmi and /dev/null differ diff --git a/modular_ss220/new_mecha_executioner/icons/mecha.dmi b/modular_ss220/new_mecha_executioner/icons/mecha.dmi deleted file mode 100644 index cae38220323c..000000000000 Binary files a/modular_ss220/new_mecha_executioner/icons/mecha.dmi and /dev/null differ