From 927dbf77f2a2cffe027f7af96c335d669d4aee5e Mon Sep 17 00:00:00 2001 From: ariaworld <143797359+ariaworld@users.noreply.github.com> Date: Mon, 1 Jan 2024 22:42:28 +0100 Subject: [PATCH] Makes the BEPIS less annoying. --- code/modules/paperwork/pen.dm | 8 +++----- code/modules/research/bepis.dm | 1 - .../research/techweb/nodes/bepis_nodes.dm | 20 +++++-------------- .../modules/research/designs/bepis_designs.dm | 20 +++++++++++++++++++ .../modules/research/designs/misc_designs.dm | 20 ------------------- tgstation.dme | 1 + 6 files changed, 29 insertions(+), 41 deletions(-) create mode 100644 modular_splurt/code/modules/research/designs/bepis_designs.dm diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 0a7d6d05da..d469186ab6 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -290,12 +290,10 @@ icon = 'icons/obj/bureaucracy.dmi' icon_state = "digging_pen" item_state = "pen" - // item_state = "pen" - // worn_icon_state = "pen" - force = 3 + force = 10 w_class = WEIGHT_CLASS_TINY - custom_materials = list(/datum/material/iron=10, /datum/material/diamond=100, /datum/material/titanium = 10) + custom_materials = list(/datum/material/iron=2500, /datum/material/diamond=2500, /datum/material/titanium = 2500) pressure_resistance = 2 grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1) tool_behaviour = TOOL_MINING //For the classic "digging out of prison with a spoon but you're in space so this analogy doesn't work" situation. - toolspeed = 10 //You will never willingly choose to use one of these over a shovel. + toolspeed = 0.3 // Like a diamond pickaxe. diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm index 3ce23522a7..c8ae1d741b 100644 --- a/code/modules/research/bepis.dm +++ b/code/modules/research/bepis.dm @@ -35,7 +35,6 @@ var/negative_cash_offset = 0 var/list/minor_rewards = list( //To add a new minor reward, add it here. - /obj/item/stack/circuit_stack/full, /obj/item/pen/survival, /obj/item/circuitboard/machine/sleeper/party, /obj/item/toy/sprayoncan, diff --git a/code/modules/research/techweb/nodes/bepis_nodes.dm b/code/modules/research/techweb/nodes/bepis_nodes.dm index ec29979bdf..169c097b49 100644 --- a/code/modules/research/techweb/nodes/bepis_nodes.dm +++ b/code/modules/research/techweb/nodes/bepis_nodes.dm @@ -30,22 +30,12 @@ hidden = TRUE experimental = TRUE -/datum/techweb_node/rolling_table - id = "rolling_table" - display_name = "Advanced Wheel Applications" - description = "Adding wheels to things can lead to extremely beneficial outcomes." +/datum/techweb_node/bepis_miscellaneous + id = "bepis_miscellaneous" + display_name = "Miscellaneous B.E.P.I.S. Technology" + description = "A bunch of abandoned technology that might have never seen the light of day." prereq_ids = list("base") - design_ids = list("rolling_table") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - hidden = TRUE - experimental = TRUE - -/datum/techweb_node/Mauna_Mug - id = "mauna_mug" - display_name = "Mauna Mug" - description = "A bored scientist was thinking to himself for very long...and then realized his coffee got cold! He made this invention to solve this extreme problem." - prereq_ids = list("base") - design_ids = list("mauna_mug") + design_ids = list("rolling_table","mauna_mug") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) hidden = TRUE experimental = TRUE diff --git a/modular_splurt/code/modules/research/designs/bepis_designs.dm b/modular_splurt/code/modules/research/designs/bepis_designs.dm new file mode 100644 index 0000000000..4dc3ceabb8 --- /dev/null +++ b/modular_splurt/code/modules/research/designs/bepis_designs.dm @@ -0,0 +1,20 @@ +/datum/design/flashdark + name = "Flashdark" + desc= "A strange device manufactured with mysterious elements that somehow emits darkness." + id = "flashdark" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 2250, /datum/material/glass = 2250, /datum/material/plasma = 2250) + build_path = /obj/item/flashlight/flashdark + reagents_list = list(/datum/reagent/liquid_dark_matter = 10) + category = list("Misc", "Equipment") + departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/spraycan_bluespace + name = "Bluespace Spray Can" + desc= "A spray can infused with bluespace technology, that is also able to change the color of the sprayed object's innate light emissions." + id = "spraycan_bluespace" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 2250, /datum/material/glass = 2250, /datum/material/bluespace = 500) + build_path = /obj/item/toy/crayon/spraycan/bluespace + category = list("Misc", "Equipment") + departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SERVICE diff --git a/modular_splurt/code/modules/research/designs/misc_designs.dm b/modular_splurt/code/modules/research/designs/misc_designs.dm index c04ef3abd9..4f81993d00 100644 --- a/modular_splurt/code/modules/research/designs/misc_designs.dm +++ b/modular_splurt/code/modules/research/designs/misc_designs.dm @@ -26,23 +26,3 @@ category = list("Misc", "Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SERVICE -/datum/design/flashdark - name = "Flashdark" - desc= "A strange device manufactured with mysterious elements that somehow emits darkness." - id = "flashdark" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 2250, /datum/material/glass = 2250, /datum/material/plasma = 2250) - build_path = /obj/item/flashlight/flashdark - reagents_list = list(/datum/reagent/liquid_dark_matter = 10) - category = list("Misc", "Equipment") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING - -/datum/design/spraycan_bluespace - name = "Bluespace Spray Can" - desc= "A spray can infused with bluespace technology, that is also able to change the color of the sprayed object's innate light emissions." - id = "spraycan_bluespace" - build_type = PROTOLATHE - materials = list(/datum/material/iron = 2250, /datum/material/glass = 2250, /datum/material/bluespace = 500) - build_path = /obj/item/toy/crayon/spraycan/bluespace - category = list("Misc", "Equipment") - departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SERVICE diff --git a/tgstation.dme b/tgstation.dme index 984de4dcf4..935d27631d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4983,6 +4983,7 @@ #include "modular_splurt\code\modules\reagents\reagent_containers\spray.dm" #include "modular_splurt\code\modules\research\designs\AI_module_designs.dm" #include "modular_splurt\code\modules\research\designs\autoylathe_designs.dm" +#include "modular_splurt\code\modules\research\designs\bepis_designs.dm" #include "modular_splurt\code\modules\research\designs\biogenerator_designs.dm" #include "modular_splurt\code\modules\research\designs\bluespace_designs.dm" #include "modular_splurt\code\modules\research\designs\limbgrower_designs.dm"