Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make hypercharged slime battery EMP-proof #1190

Merged
merged 1 commit into from
Mar 2, 2024
Merged

Make hypercharged slime battery EMP-proof #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/cargo/exports/xenobio.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 2 additions & 7 deletions code/modules/research/xenobiology/crossbreeding/_misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/research/xenobiology/crossbreeding/charged.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!"))
..()

Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/modules/aesthetics/mobs/slime.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Loading