From 4e3d4a4e28e97568f26410daea4fb316217a5dc1 Mon Sep 17 00:00:00 2001 From: Lucy Date: Sun, 11 Feb 2024 15:58:59 -0500 Subject: [PATCH] Halve slimes needed to crossbreed; make hypercharged slime battery EMP-proof --- code/modules/cargo/exports/xenobio.dm | 2 +- code/modules/research/xenobiology/crossbreeding/_misc.dm | 9 ++------- .../research/xenobiology/crossbreeding/charged.dm | 2 +- monkestation/code/modules/aesthetics/mobs/slime.dm | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/code/modules/cargo/exports/xenobio.dm b/code/modules/cargo/exports/xenobio.dm index fdd8d38aa4fc..728d8cbcb599 100644 --- a/code/modules/cargo/exports/xenobio.dm +++ b/code/modules/cargo/exports/xenobio.dm @@ -28,7 +28,7 @@ /datum/export/slime/hypercharged cost = CARGO_CRATE_VALUE * 1.2 unit_name = "hypercharged slime core" - export_types = list(/obj/item/stock_parts/cell/high/slime_hypercharged) + export_types = list(/obj/item/stock_parts/cell/emproof/slime/hypercharged) // monke edit: make hypercharged slime cells EMP-proof, by changing their parent from cell/high to cell/emproof /datum/export/slime/epic //EPIIIIIIC cost = CARGO_CRATE_VALUE * 0.44 diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm index ed9b9983ae33..9f57486f5301 100644 --- a/code/modules/research/xenobiology/crossbreeding/_misc.dm +++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm @@ -86,17 +86,12 @@ Slimecrossing Items return . | ..() //Hypercharged slime cell - Charged Yellow -/obj/item/stock_parts/cell/high/slime_hypercharged +/obj/item/stock_parts/cell/emproof/slime/hypercharged // monke edit: make hypercharged slime cells EMP-proof, by changing their parent from cell/high to cell/emproof name = "hypercharged slime core" - desc = "A charged yellow slime extract, infused with plasma. It almost hurts to touch." - icon = 'icons/mob/simple/slimes.dmi' - icon_state = "yellow slime extract" + desc = "A charged yellow slime extract, infused with plasma. It almost hurts to touch. Its organic nature makes it immune to EMPs." rating = 7 - custom_materials = null maxcharge = 50000 chargerate = 2500 - charge_light_type = null - connector_type = "slimecore" //Barrier cube - Chilling Grey /obj/item/barriercube diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm index e41741840b20..a125cd7276e3 100644 --- a/code/modules/research/xenobiology/crossbreeding/charged.dm +++ b/code/modules/research/xenobiology/crossbreeding/charged.dm @@ -81,7 +81,7 @@ Charged extracts: effect_desc = "Creates a hypercharged slime cell battery, which has high capacity but takes longer to recharge." /obj/item/slimecross/charged/yellow/do_effect(mob/user) - new /obj/item/stock_parts/cell/high/slime_hypercharged(get_turf(user)) + new /obj/item/stock_parts/cell/emproof/slime/hypercharged(user.drop_location()) // monke edit: make hypercharged slime cells EMP-proof, by changing their parent from cell/high to cell/emproof user.visible_message(span_notice("[src] sparks violently, and swells with electric power!")) ..() diff --git a/monkestation/code/modules/aesthetics/mobs/slime.dm b/monkestation/code/modules/aesthetics/mobs/slime.dm index 98a9eec3ab89..abde54b2ca69 100644 --- a/monkestation/code/modules/aesthetics/mobs/slime.dm +++ b/monkestation/code/modules/aesthetics/mobs/slime.dm @@ -7,5 +7,5 @@ /obj/item/slime_extract icon = 'monkestation/icons/mob/slimes.dmi' -/obj/item/stock_parts/cell/high/slime_hypercharged +/obj/item/stock_parts/cell/emproof/slime/hypercharged icon = 'monkestation/icons/mob/slimes.dmi'