From f4d09856f5ec02b36778c29eaeae110140ca98a1 Mon Sep 17 00:00:00 2001 From: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com> Date: Sat, 4 Sep 2021 23:47:21 -0400 Subject: [PATCH] primitive centrifuge (#7973) * primitive centrifuge * suggestions --- .../items/stacks/sheets/sheet_types.dm | 5 +++- .../code/ash_centrifuge.dm | 24 ++++++++++++++++++ .../icons/chemical.dmi | Bin 0 -> 316 bytes .../modules/ash_chemical_centrifuge/readme.md | 20 +++++++++++++++ tgstation.dme | 1 + 5 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 modular_skyrat/modules/ash_chemical_centrifuge/code/ash_centrifuge.dm create mode 100644 modular_skyrat/modules/ash_chemical_centrifuge/icons/chemical.dmi create mode 100644 modular_skyrat/modules/ash_chemical_centrifuge/readme.md diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 1b1ab93a4e1..1323bf6dbbe 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -131,8 +131,11 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ new/datum/stack_recipe("hygienebot assembly", /obj/item/bot_assembly/hygienebot, 2, time = 5 SECONDS), \ new/datum/stack_recipe("shower frame", /obj/structure/showerframe, 2, time= 2 SECONDS), \ null, \ + //SKYRAT EDIT START: REAGENT FORGING & PRIMITIVE CENTRIFUGE new/datum/stack_recipe("anvil", /obj/structure/reagent_anvil, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE), \ - new/datum/stack_recipe("forge", /obj/structure/reagent_forge, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE) + new/datum/stack_recipe("forge", /obj/structure/reagent_forge, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("primitive centrifuge", /obj/item/reagent_containers/glass/primitive_centrifuge, 10) + //SKYRAT EDIT STOP: REAGENT FORGING & PRIMITIVE CENTRIFUGE )) //the wrestling turnbuckle recipe is a SKYRAT EDIT diff --git a/modular_skyrat/modules/ash_chemical_centrifuge/code/ash_centrifuge.dm b/modular_skyrat/modules/ash_chemical_centrifuge/code/ash_centrifuge.dm new file mode 100644 index 00000000000..4c4dd2c64aa --- /dev/null +++ b/modular_skyrat/modules/ash_chemical_centrifuge/code/ash_centrifuge.dm @@ -0,0 +1,24 @@ +/obj/item/reagent_containers/glass/primitive_centrifuge + name = "primitive centrifuge" + desc = "A small cup that allows a person to slowly spin out liquids they do not desire." + icon = 'modular_skyrat/modules/ash_chemical_centrifuge/icons/chemical.dmi' + icon_state = "primitive_centrifuge" + +/obj/item/reagent_containers/glass/primitive_centrifuge/examine() + . = ..() + . += span_notice("Ctrl + Click to select chemicals to remove.") + +/obj/item/reagent_containers/glass/primitive_centrifuge/CtrlClick(mob/user) + if(!length(reagents.reagent_list)) + return + var/datum/user_input = tgui_input_list(user, "Select which chemical to remove.", "Removal Selection", reagents.reagent_list) + if(!user_input) + to_chat(user, span_warning("A selection was not made.")) + return + if(!do_after(user, 5 SECONDS, target = src)) + to_chat(user, span_warning("You stopped attempting to spin out the chemicals.")) + return + reagents.del_reagent(user_input.type) + to_chat(user, span_notice("You remove a reagent from [src].")) + + diff --git a/modular_skyrat/modules/ash_chemical_centrifuge/icons/chemical.dmi b/modular_skyrat/modules/ash_chemical_centrifuge/icons/chemical.dmi new file mode 100644 index 0000000000000000000000000000000000000000..362908c27dfe08166d401dc4dfd5a6536a0e5c65 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*VnIKceb|5$;havsH|AF zZ2R`@XU?2CaNxkB-ihadY8Xp`{DK)Ap4~_Ta>}YgB1&9Ri<65o3raHc^B5Q^=BW1W z=5ufmV0e9d{f!IV;j0Cexau5Ro^Jba;@+e0u`kk$j9Opa2KU1QwR5J-t&|CyH=LYHCVqDoxqYA}J}YIn_de z#p(3rOP8D`u*5hwGI%x|WYrLQ)Re;A%`Kpy$)Lr^)Ky~yH1NI(&zbLkeu@B@44$rj JF6*2UngDlsbiV)q literal 0 HcmV?d00001 diff --git a/modular_skyrat/modules/ash_chemical_centrifuge/readme.md b/modular_skyrat/modules/ash_chemical_centrifuge/readme.md new file mode 100644 index 00000000000..6273a746d7a --- /dev/null +++ b/modular_skyrat/modules/ash_chemical_centrifuge/readme.md @@ -0,0 +1,20 @@ +## Title: Ash Farming + +MODULE ID: ASH_FARM + +### Description: + +As a way to increase the agrarian life for ashwalkers, the ability to plant on lavaland is being introduced. +This will not be limited to ashies, but will be increased to non-ashies trying to plant + +### TG Proc Changes: + +### Defines: + +### Master file additions + +### Included files that are not contained in this module: + +### Credits: + +Jake Park diff --git a/tgstation.dme b/tgstation.dme index 3f11d67a1c3..b9b79a6e68d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4073,6 +4073,7 @@ #include "modular_skyrat\modules\antagonists\eldritch_cult\knowledge\ash_lore_skyrat.dm" #include "modular_skyrat\modules\antagonists\eldritch_cult\knowledge\flesh_lore_skyrat.dm" #include "modular_skyrat\modules\apocolypse_of_scythes\code\scythes.dm" +#include "modular_skyrat\modules\ash_chemical_centrifuge\code\ash_centrifuge.dm" #include "modular_skyrat\modules\ash_farming\code\ash_farming.dm" #include "modular_skyrat\modules\ashwalker_change\code\ash_walker_den.dm" #include "modular_skyrat\modules\ashwalkers\Ashwalker\Ashwalkers.dm"