From 545454d14865a756a894066e9ec864b1a8743c5f Mon Sep 17 00:00:00 2001 From: Sparrowbird611 Date: Fri, 1 Dec 2023 13:13:43 -0500 Subject: [PATCH] fixes gunpowder --- mojave/code/modules/mob/robots/vendortrons.dm | 8 +-- .../spawners/lootdrop/guarenteed/miscloot.dm | 4 +- mojave/effects/spawners/lootdrop/miscloot.dm | 4 +- mojave/items/crafting/components.dm | 10 ++-- .../modules/crafting/recipes/ammo_recipes.dm | 58 +++++++++---------- .../crafting/recipes/weapon_recipes.dm | 2 +- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/mojave/code/modules/mob/robots/vendortrons.dm b/mojave/code/modules/mob/robots/vendortrons.dm index dd4cf2865da..2f96bdfb079 100644 --- a/mojave/code/modules/mob/robots/vendortrons.dm +++ b/mojave/code/modules/mob/robots/vendortrons.dm @@ -129,8 +129,8 @@ /mob/living/simple_animal/hostile/retaliate/trader/ms13/gunrunner/initial_wanteds() return list( - /obj/item/ms13/component/gunpowder/lq = list(30, rand(0,6), ""), - /obj/item/ms13/component/gunpowder = list(65, rand(0,6), ""), + /obj/item/ms13/component/gunpowder = list(30, rand(0,6), ""), + /obj/item/ms13/component/gunpowder/hq = list(65, rand(0,6), ""), /obj/item/stack/sheet/ms13/scrap_lead = list(3, rand(5,30), ", per piece of lead"), /obj/item/stack/sheet/ms13/scrap_brass = list(3, rand(5,30), ", per piece of brass"), /obj/item/stack/sheet/ms13/refined_lead = list(22, rand(0,10), ", per ingot of lead"), @@ -879,8 +879,8 @@ /obj/item/ammo_box/ms13/a308 = list(240, rand(0,1)), /obj/item/ammo_box/ms13/a762 = list(240, rand(0,2)), /obj/item/ammo_box/ms13/shotgun/buckshot = list(175, rand(0,3)), - /obj/item/ms13/component/gunpowder = list(80, rand(0,3)), - /obj/item/ms13/component/gunpowder/lq = list(40, rand(1,4)) + /obj/item/ms13/component/gunpowder/hq = list(80, rand(0,3)), + /obj/item/ms13/component/gunpowder = list(40, rand(1,4)) ) /mob/living/simple_animal/hostile/retaliate/trader/ms13/drought/general_goods/initial_wanteds() diff --git a/mojave/effects/spawners/lootdrop/guarenteed/miscloot.dm b/mojave/effects/spawners/lootdrop/guarenteed/miscloot.dm index 135ca0d6547..0f667217d92 100644 --- a/mojave/effects/spawners/lootdrop/guarenteed/miscloot.dm +++ b/mojave/effects/spawners/lootdrop/guarenteed/miscloot.dm @@ -106,7 +106,7 @@ /obj/item/stack/sheet/ms13/scrap_electronics/two, /obj/item/stack/sheet/ms13/scrap_copper/two, /obj/item/stack/sheet/ms13/cloth/two, - /obj/item/ms13/component/gunpowder/lq, + /obj/item/ms13/component/gunpowder, /obj/item/ms13/component/cell, /obj/item/stack/sheet/ms13/scrap_lead/two, /obj/item/stack/sheet/ms13/scrap_silver/two, @@ -126,7 +126,7 @@ /obj/effect/spawner/random/ms13/guaranteed/crafting/highrandom name = "high tier random crafting spawner" loot = list( - /obj/item/ms13/component/gunpowder, + /obj/item/ms13/component/gunpowder/hq, /obj/item/stack/sheet/ms13/refined_lead/two, /obj/item/stack/sheet/ms13/refined_silver/two, /obj/item/stack/sheet/ms13/refined_gold/two, diff --git a/mojave/effects/spawners/lootdrop/miscloot.dm b/mojave/effects/spawners/lootdrop/miscloot.dm index 815869a8ea8..07f95df658f 100644 --- a/mojave/effects/spawners/lootdrop/miscloot.dm +++ b/mojave/effects/spawners/lootdrop/miscloot.dm @@ -114,7 +114,7 @@ /obj/item/stack/sheet/ms13/scrap_electronics/two, /obj/item/stack/sheet/ms13/scrap_copper/two, /obj/item/stack/sheet/ms13/cloth/two, - /obj/item/ms13/component/gunpowder/lq, + /obj/item/ms13/component/gunpowder, /obj/item/ms13/component/cell, /obj/item/stack/sheet/ms13/scrap_lead/two, /obj/item/stack/sheet/ms13/scrap_silver/two, @@ -135,7 +135,7 @@ name = "high tier random crafting spawner" spawn_loot_chance = 75 loot = list( - /obj/item/ms13/component/gunpowder, + /obj/item/ms13/component/gunpowder/hq, /obj/item/stack/sheet/ms13/refined_lead/two, /obj/item/stack/sheet/ms13/refined_silver/two, /obj/item/stack/sheet/ms13/refined_gold/two, diff --git a/mojave/items/crafting/components.dm b/mojave/items/crafting/components.dm index dde45e2e612..aca3c4a9fa8 100644 --- a/mojave/items/crafting/components.dm +++ b/mojave/items/crafting/components.dm @@ -44,16 +44,16 @@ grid_height = 64 /obj/item/ms13/component/gunpowder - name = "high quality gunpowder" - desc = "High quality, refined gunpowder. Can be used to make standard quality ammunition." + name = "low quality gunpowder" + desc = "Low quality, impure, and probably dangerous gunpowder. Can be used to make junk ammunition." icon_state = "gunpowder" grid_width = 32 grid_height = 32 -/obj/item/ms13/component/gunpowder/lq - name = "low quality gunpowder" - desc = "Low quality, impure, and probably dangerous gunpowder. Can be used to make junk ammunition." +/obj/item/ms13/component/gunpowder/hq + name = "high quality gunpowder" + desc = "High quality, refined gunpowder. Can be used to make standard quality ammunition." // Light items (bulbs and stuff) // diff --git a/mojave/modules/crafting/recipes/ammo_recipes.dm b/mojave/modules/crafting/recipes/ammo_recipes.dm index 073f59a7918..54c6f79dce2 100644 --- a/mojave/modules/crafting/recipes/ammo_recipes.dm +++ b/mojave/modules/crafting/recipes/ammo_recipes.dm @@ -28,7 +28,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/junk_bullets = 32, /obj/item/stack/sheet/ms13/junk_casings = 32, - /obj/item/ms13/component/gunpowder/lq = 1 + /obj/item/ms13/component/gunpowder = 1 ) category = CAT_JUNK_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -41,7 +41,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/junk_bullets = 30, /obj/item/stack/sheet/ms13/junk_casings = 30, - /obj/item/ms13/component/gunpowder/lq = 1 + /obj/item/ms13/component/gunpowder = 1 ) category = CAT_JUNK_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -54,7 +54,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/junk_bullets = 24, /obj/item/stack/sheet/ms13/junk_casings = 24, - /obj/item/ms13/component/gunpowder/lq = 1 + /obj/item/ms13/component/gunpowder = 1 ) category = CAT_JUNK_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -67,7 +67,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/junk_bullets = 21, /obj/item/stack/sheet/ms13/junk_casings = 21, - /obj/item/ms13/component/gunpowder/lq = 1 + /obj/item/ms13/component/gunpowder = 1 ) category = CAT_JUNK_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -80,7 +80,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/junk_bullets = 40, /obj/item/stack/sheet/ms13/junk_casings = 40, - /obj/item/ms13/component/gunpowder/lq = 2 + /obj/item/ms13/component/gunpowder = 2 ) category = CAT_JUNK_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -93,7 +93,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/junk_bullets = 24, /obj/item/stack/sheet/ms13/junk_casings = 24, - /obj/item/ms13/component/gunpowder/lq = 2 + /obj/item/ms13/component/gunpowder = 2 ) category = CAT_JUNK_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -106,7 +106,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/junk_bullets = 18, /obj/item/stack/sheet/ms13/junk_casings = 18, - /obj/item/ms13/component/gunpowder/lq = 1 + /obj/item/ms13/component/gunpowder = 1 ) category = CAT_JUNK_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -119,7 +119,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/junk_bullets = 20, /obj/item/stack/sheet/ms13/junk_casings = 20, - /obj/item/ms13/component/gunpowder/lq = 2 + /obj/item/ms13/component/gunpowder = 2 ) category = CAT_JUNK_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -132,7 +132,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/junk_bullets = 24, /obj/item/stack/sheet/ms13/junk_casings = 24, - /obj/item/ms13/component/gunpowder/lq = 2 + /obj/item/ms13/component/gunpowder = 2 ) category = CAT_JUNK_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -145,7 +145,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/plastic = 10, /obj/item/stack/sheet/ms13/scrap_lead = 8, - /obj/item/ms13/component/gunpowder/lq = 1 + /obj/item/ms13/component/gunpowder = 1 ) category = CAT_JUNK_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -176,7 +176,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 32, /obj/item/stack/sheet/ms13/hq_casings = 32, - /obj/item/ms13/component/gunpowder = 1 + /obj/item/ms13/component/gunpowder/hq = 1 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -189,7 +189,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 30, /obj/item/stack/sheet/ms13/hq_casings = 30, - /obj/item/ms13/component/gunpowder = 1 + /obj/item/ms13/component/gunpowder/hq = 1 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -202,7 +202,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 24, /obj/item/stack/sheet/ms13/hq_casings = 24, - /obj/item/ms13/component/gunpowder = 1 + /obj/item/ms13/component/gunpowder/hq = 1 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -215,7 +215,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 21, /obj/item/stack/sheet/ms13/hq_casings = 21, - /obj/item/ms13/component/gunpowder = 1 + /obj/item/ms13/component/gunpowder/hq = 1 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -228,7 +228,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 40, /obj/item/stack/sheet/ms13/hq_casings = 40, - /obj/item/ms13/component/gunpowder = 2 + /obj/item/ms13/component/gunpowder/hq = 2 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -241,7 +241,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 24, /obj/item/stack/sheet/ms13/hq_casings = 24, - /obj/item/ms13/component/gunpowder = 2 + /obj/item/ms13/component/gunpowder/hq = 2 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -254,7 +254,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 18, /obj/item/stack/sheet/ms13/hq_casings = 18, - /obj/item/ms13/component/gunpowder = 1 + /obj/item/ms13/component/gunpowder/hq = 1 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -267,7 +267,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 20, /obj/item/stack/sheet/ms13/hq_casings = 20, - /obj/item/ms13/component/gunpowder = 2 + /obj/item/ms13/component/gunpowder/hq = 2 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -280,7 +280,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 24, /obj/item/stack/sheet/ms13/hq_casings = 24, - /obj/item/ms13/component/gunpowder = 2 + /obj/item/ms13/component/gunpowder/hq = 2 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -293,7 +293,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/plastic = 8, /obj/item/stack/sheet/ms13/refined_lead = 2, - /obj/item/ms13/component/gunpowder = 1 + /obj/item/ms13/component/gunpowder/hq = 1 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -329,7 +329,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/junk_bullets = 24, /obj/item/stack/sheet/ms13/junk_casings = 24, - /obj/item/ms13/component/gunpowder/lq = 2 + /obj/item/ms13/component/gunpowder = 2 ) category = CAT_JUNK_AMMO crafting_interface = CRAFTING_BENCH_CAMPFIRE @@ -343,7 +343,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 24, /obj/item/stack/sheet/ms13/hq_casings = 24, - /obj/item/ms13/component/gunpowder = 4 + /obj/item/ms13/component/gunpowder/hq = 4 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -357,7 +357,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 24, /obj/item/stack/sheet/ms13/hq_casings = 24, - /obj/item/ms13/component/gunpowder = 4 + /obj/item/ms13/component/gunpowder/hq = 4 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -371,7 +371,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 16, /obj/item/stack/sheet/ms13/hq_casings = 16, - /obj/item/ms13/component/gunpowder = 2 + /obj/item/ms13/component/gunpowder/hq = 2 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -385,7 +385,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 16, /obj/item/stack/sheet/ms13/hq_casings = 16, - /obj/item/ms13/component/gunpowder = 4 + /obj/item/ms13/component/gunpowder/hq = 4 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -399,7 +399,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/hq_bullets = 16, /obj/item/stack/sheet/ms13/hq_casings = 16, - /obj/item/ms13/component/gunpowder = 4 + /obj/item/ms13/component/gunpowder/hq = 4 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -413,7 +413,7 @@ tool_paths = list() reqs = list(/obj/item/stack/sheet/ms13/plastic = 8, /obj/item/stack/sheet/ms13/refined_lead = 4, - /obj/item/ms13/component/gunpowder = 1 + /obj/item/ms13/component/gunpowder/hq = 1 ) category = CAT_STAN_AMMO crafting_interface = CRAFTING_BENCH_RELOADING @@ -422,7 +422,7 @@ /datum/crafting_recipe/lq_gp name = "low quality gunpowder" - result = /obj/item/ms13/component/gunpowder/lq + result = /obj/item/ms13/component/gunpowder time = 10 SECONDS reqs = list(/obj/item/stack/sheet/ms13/nugget/nugget_coal = 3, /obj/item/stack/sheet/ms13/nugget/sulfur = 4) @@ -431,7 +431,7 @@ /datum/crafting_recipe/lq_gp_shaman name = "conjure gunpowder" - result = /obj/item/ms13/component/gunpowder/lq + result = /obj/item/ms13/component/gunpowder time = 16 SECONDS trait = TRAIT_DRY_SHAMAN reqs = list(/obj/item/stack/sheet/ms13/nugget/nugget_coal = 3, diff --git a/mojave/modules/crafting/recipes/weapon_recipes.dm b/mojave/modules/crafting/recipes/weapon_recipes.dm index fb58d0a6f40..1319dfd8899 100644 --- a/mojave/modules/crafting/recipes/weapon_recipes.dm +++ b/mojave/modules/crafting/recipes/weapon_recipes.dm @@ -139,7 +139,7 @@ tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_SAW) tool_paths = list(/obj/item/wirecutters/ms13) reqs = list(/obj/item/stack/sheet/ms13/wood/plank = 2, - /obj/item/ms13/component/gunpowder/lq = 3, + /obj/item/ms13/component/gunpowder = 3, /obj/item/stack/sheet/ms13/scrap_parts = 6, /obj/item/stack/sheet/ms13/scrap = 4) category = CAT_WEAPONS