From 71ad9fd1dc6d65b6a5d5a02526108bf9923cc74e Mon Sep 17 00:00:00 2001 From: Aylong Date: Tue, 20 Jun 2023 04:26:58 +0300 Subject: [PATCH 1/2] tech cost --- code/modules/reagents/reagent_containers/glass_containers.dm | 2 +- code/modules/research/designs/medical_designs.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 591b06f9184..c8293f43df5 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -291,7 +291,7 @@ amount_per_transfer_from_this = 10 possible_transfer_amounts = list(1,2,5,10,15,25,30,50,100,300,500,1000) container_type = OPENCONTAINER - origin_tech = "bluespace=6;materials=5;plasmatech=5" + origin_tech = "bluespace=6;materials=6;plasmatech=6" /obj/item/reagent_containers/glass/beaker/cryoxadone list_reagents = list("cryoxadone" = 30) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index c3cf96d1d0b..484e40173ca 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -26,7 +26,7 @@ name = "Bluespace Beaker XL" desc = "Big capacity bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 1000 units." id = "bluespace_beaker_xl" - req_tech = list("bluespace" = 7, "materials" = 7, "plasmatech" = 6) + req_tech = list("bluespace" = 7, "materials" = 7, "plasmatech" = 7) build_type = PROTOLATHE materials = list(MAT_GLASS = 4500, MAT_PLASMA = 4500, MAT_DIAMOND = 375, MAT_BLUESPACE = 375) build_path = /obj/item/reagent_containers/glass/beaker/bluespace/xl From e3bbea408cd7b186064cd5265028807479eac33f Mon Sep 17 00:00:00 2001 From: Aylong Date: Wed, 21 Jun 2023 09:04:43 +0300 Subject: [PATCH 2/2] bAlAncE --- code/__DEFINES/is_helpers.dm | 1 + .../items/weapons/grenades/chem_grenade.dm | 19 ++++++++++++++++--- .../reagent_containers/glass_containers.dm | 16 ++++++++-------- .../research/designs/medical_designs.dm | 8 ++++---- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 2d98ad2f7c8..f9882549196 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -55,6 +55,7 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list( #define isprox(O) (istype(O, /obj/item/assembly/prox_sensor)) #define issignaler(O) (istype(O, /obj/item/assembly/signaler)) #define istimer(O) (istype(O, /obj/item/assembly/timer)) +#define isvoice_analyzer(O) (istype(O, /obj/item/assembly/voice)) //Turfs diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 5bc3f8f669e..fbffcbc2ef2 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -15,6 +15,7 @@ var/stage = EMPTY var/list/beakers = list() var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle) + var/list/blacklisted_containers = list(/obj/item/reagent_containers/glass/beaker/bluespace/large) var/affected_area = 3 var/obj/item/assembly_holder/nadeassembly = null var/label = null @@ -164,6 +165,9 @@ if(beakers.len == 2) to_chat(user, "[src] can not hold more containers.") return + if(stage == WIRED && is_type_in_list(I, blacklisted_containers)) + to_chat(user, "You cannot put a [I] to the [src]") + return else if(I.reagents.total_volume) to_chat(user, "You add [I] to the assembly.") @@ -177,7 +181,14 @@ var/obj/item/assembly_holder/A = I if(!A.secured) return - if(isigniter(A.a_left) == isigniter(A.a_right)) //Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it + if(isigniter(A.a_left) == isigniter(A.a_right)) + to_chat(user, "You cannot add [I] to the [src]!") //Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it + return + if(isvoice_analyzer(A.a_left) && isigniter(A.a_right)) + to_chat(user, "You cannot add [I] to the [src]!") + return + if(isvoice_analyzer(A.a_right) && isigniter(A.a_left)) + to_chat(user, "You cannot add [I] to the [src]!") return user.drop_item() @@ -321,8 +332,10 @@ desc = "A custom made large grenade. It affects a larger area." icon_state = "large_grenade" bomb_state = "largebomb" - allowed_containers = list(/obj/item/reagent_containers/glass,/obj/item/reagent_containers/food/condiment, - /obj/item/reagent_containers/food/drinks) + allowed_containers = list( + /obj/item/reagent_containers/glass, + /obj/item/reagent_containers/food/condiment, + /obj/item/reagent_containers/food/drinks) origin_tech = "combat=3;engineering=3" affected_area = 5 ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades. diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index c8293f43df5..89b3e9823ea 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -9,8 +9,8 @@ icon_state = "null" item_state = "null" amount_per_transfer_from_this = 10 - possible_transfer_amounts = list(1,2,5,10,15,25,30,50) - volume = 50 + possible_transfer_amounts = list(1,2,5,10,15,25,30,50,60) + volume = 60 container_type = OPENCONTAINER has_lid = TRUE resistance_flags = ACID_PROOF @@ -217,12 +217,12 @@ /obj/item/reagent_containers/glass/beaker/large name = "large beaker" - desc = "A large beaker. Can hold up to 100 units." + desc = "A large beaker. Can hold up to 120 units." icon_state = "beakerlarge" materials = list(MAT_GLASS=2500) - volume = 100 + volume = 120 amount_per_transfer_from_this = 10 - possible_transfer_amounts = list(1,2,5,10,15,25,30,50,100) + possible_transfer_amounts = list(1,2,5,10,15,25,30,50,100,120) container_type = OPENCONTAINER /obj/item/reagent_containers/glass/beaker/vial @@ -282,9 +282,9 @@ container_type = OPENCONTAINER origin_tech = "bluespace=5;materials=4;plasmatech=4" -/obj/item/reagent_containers/glass/beaker/bluespace/xl - name = "xl bluespace beaker" - desc = "Big capacity bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 1000 units." +/obj/item/reagent_containers/glass/beaker/bluespace/large + name = "large bluespace beaker" + desc = "A large capacity bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 1000 units." icon_state = "beaker_bluespace_xl" materials = list(MAT_GLASS=4500) volume = 1000 diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 484e40173ca..6591e92de47 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -22,14 +22,14 @@ build_path = /obj/item/reagent_containers/glass/beaker/bluespace category = list("Medical") -/datum/design/bluespace_beaker_xl +/datum/design/bluespace_beaker_large name = "Bluespace Beaker XL" - desc = "Big capacity bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 1000 units." - id = "bluespace_beaker_xl" + desc = "A large capacity bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 1000 units." + id = "bluespace_beaker_large" req_tech = list("bluespace" = 7, "materials" = 7, "plasmatech" = 7) build_type = PROTOLATHE materials = list(MAT_GLASS = 4500, MAT_PLASMA = 4500, MAT_DIAMOND = 375, MAT_BLUESPACE = 375) - build_path = /obj/item/reagent_containers/glass/beaker/bluespace/xl + build_path = /obj/item/reagent_containers/glass/beaker/bluespace/large category = list("Medical") /datum/design/bluespace_syringe