From 0f94cdaf0a08374be737e961e00ee97cd526e59b Mon Sep 17 00:00:00 2001 From: Sparrowbird611 Date: Fri, 10 Nov 2023 18:32:28 -0500 Subject: [PATCH 1/3] mostly fixes shit. --- mojave/code/datums/wielding/twohanded.dm | 3 +++ mojave/items/melee/special.dm | 24 +++++++++++-------- .../crafting/recipes/weapon_recipes.dm | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/mojave/code/datums/wielding/twohanded.dm b/mojave/code/datums/wielding/twohanded.dm index 0cff4d1f2cb..154afe9640b 100644 --- a/mojave/code/datums/wielding/twohanded.dm +++ b/mojave/code/datums/wielding/twohanded.dm @@ -41,3 +41,6 @@ force_multiplier = null force_unwielded = 15 force_wielded = 30 + +/datum/wield_info/twohanded/thunderstick + force_multiplier = null diff --git a/mojave/items/melee/special.dm b/mojave/items/melee/special.dm index 8147718f2d6..4967fbd78b4 100644 --- a/mojave/items/melee/special.dm +++ b/mojave/items/melee/special.dm @@ -97,6 +97,9 @@ icon_state = "spear_thunder" icon_prefix = "spear_thunder" sharpness = NONE // the end is a god damn explosive charge + slot_flags = null //it has no back sprite, we don't need bums stowing invisible suicide spears on their back + wield_info = /datum/wield_info/twohanded/thunderstick + pickup_sound = 'mojave/sound/ms13weapons/meleesounds/general_pickup.ogg' /obj/item/spear/explosive/ms13/Initialize(mapload) . = ..() @@ -109,14 +112,15 @@ icon_state = "spear_thunder" inhand_icon_state = "spear_thunder" -/obj/item/spear/explosive/ms13/attack_self(mob/user) - . = ..() - if(wielded) - icon_state = "spear_thunder" - inhand_icon_state = "spear_thunder_wielded" - wielded = TRUE +// triggered on wielding of a two handed item. +/obj/item/spear/explosive/ms13/on_wield(obj/item/source, mob/user) + SIGNAL_HANDLER + playsound(src.loc, 'mojave/sound/ms13weapons/meleesounds/general_grip.ogg', 50, TRUE) + inhand_icon_state = "spear_thunder_wielded" + wielded = TRUE - else - icon_state = "spear_thunder" - inhand_icon_state = "spear_thunder" - wielded = FALSE +// triggered on unwielding of two handed item. +/obj/item/spear/explosive/ms13/on_unwield(obj/item/source, mob/user) + SIGNAL_HANDLER + playsound(src.loc, 'mojave/sound/ms13weapons/meleesounds/general_grip.ogg', 35, TRUE) + wielded = FALSE \ No newline at end of file diff --git a/mojave/modules/crafting/recipes/weapon_recipes.dm b/mojave/modules/crafting/recipes/weapon_recipes.dm index c1e45ad493c..3ddf34c72cd 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/stack/sheet/ms13/nugget/sulfur = 10, + /obj/item/ms13/component/gunpowder/lq = 3, /obj/item/stack/sheet/ms13/scrap_parts = 6, /obj/item/stack/sheet/ms13/scrap = 4) category = CAT_WEAPONS From f4ff284284d3d753d7ca80e11ca9f759dbe3ca51 Mon Sep 17 00:00:00 2001 From: Sparrowbird611 Date: Fri, 1 Dec 2023 01:26:16 -0500 Subject: [PATCH 2/3] Actually fixes it this time. --- mojave/items/melee/special.dm | 39 ---------- mojave/items/melee/twohanded.dm | 71 +++++++++++++++++++ .../crafting/recipes/weapon_recipes.dm | 2 +- 3 files changed, 72 insertions(+), 40 deletions(-) diff --git a/mojave/items/melee/special.dm b/mojave/items/melee/special.dm index 4967fbd78b4..88b500393b1 100644 --- a/mojave/items/melee/special.dm +++ b/mojave/items/melee/special.dm @@ -85,42 +85,3 @@ playsound(loc, 'sound/weapons/genhit2.ogg', 50, TRUE) */ -/obj/item/spear/explosive/ms13 - name = "thunder stick" - icon = 'mojave/icons/objects/melee/melee_world.dmi' - lefthand_file = 'mojave/icons/mob/inhands/weapons/melee_inhand_left.dmi' - righthand_file = 'mojave/icons/mob/inhands/weapons/melee_inhand_right.dmi' - worn_icon = 'mojave/icons/mob/worn_melee.dmi' - worn_icon_state = "empty_placeholder" - attack_verb_continuous = list("whacks", "jabs", "smacks", "pokes") - attack_verb_simple = list("whack", "jab", "smack", "poke") - icon_state = "spear_thunder" - icon_prefix = "spear_thunder" - sharpness = NONE // the end is a god damn explosive charge - slot_flags = null //it has no back sprite, we don't need bums stowing invisible suicide spears on their back - wield_info = /datum/wield_info/twohanded/thunderstick - pickup_sound = 'mojave/sound/ms13weapons/meleesounds/general_pickup.ogg' - -/obj/item/spear/explosive/ms13/Initialize(mapload) - . = ..() - set_explosive(new /obj/item/grenade/frag/ms13/charge) - AddElement(/datum/element/world_icon, null, icon, 'mojave/icons/objects/melee/melee_inventory.dmi') - desc = "A long stick, with an explosive charge stuck on the end. Point towards enemy!" // Overwrites the TG one that would otherwise be here due to initialization. - -/obj/item/spear/explosive/ms13/update_icon_state() - . = ..() - icon_state = "spear_thunder" - inhand_icon_state = "spear_thunder" - -// triggered on wielding of a two handed item. -/obj/item/spear/explosive/ms13/on_wield(obj/item/source, mob/user) - SIGNAL_HANDLER - playsound(src.loc, 'mojave/sound/ms13weapons/meleesounds/general_grip.ogg', 50, TRUE) - inhand_icon_state = "spear_thunder_wielded" - wielded = TRUE - -// triggered on unwielding of two handed item. -/obj/item/spear/explosive/ms13/on_unwield(obj/item/source, mob/user) - SIGNAL_HANDLER - playsound(src.loc, 'mojave/sound/ms13weapons/meleesounds/general_grip.ogg', 35, TRUE) - wielded = FALSE \ No newline at end of file diff --git a/mojave/items/melee/twohanded.dm b/mojave/items/melee/twohanded.dm index 219a81ae1a6..fd3ad76032f 100644 --- a/mojave/items/melee/twohanded.dm +++ b/mojave/items/melee/twohanded.dm @@ -338,3 +338,74 @@ for(var/X in actions) var/datum/action/A = X A.UpdateButtonIcon() + +//THUNDER STICK// + +/obj/item/ms13/twohanded/thunderstick + name = "thunder stick" + desc = "A long stick, with an explosive charge stuck on the end. Point towards enemy!" + force = 15 + icon_state = "spear_thunder" + inhand_icon_state = "spear_thunder" + worn_icon = 'mojave/icons/mob/worn_melee.dmi' + worn_icon_state = "empty_placeholder" + attack_verb_continuous = list("whacks", "jabs", "smacks", "pokes") + attack_verb_simple = list("whack", "jab", "smack", "poke") + sharpness = NONE // the end is a god damn explosive charge + wield_info = /datum/wield_info/twohanded/thunderstick + slot_flags = null //it has no back sprite, we don't need bums stowing invisible suicide spears on their back + stowable = FALSE //this isn't your every day carry weapon + var/obj/item/grenade/explosive = /obj/item/grenade/frag/ms13/charge + +/obj/item/ms13/twohanded/thunderstick/Initialize(mapload) + . = ..() + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield) + set_explosive(new /obj/item/grenade/frag/ms13/charge()) //For admin-spawned explosive lances + +/obj/item/ms13/twohanded/thunderstick/proc/set_explosive(obj/item/grenade/G) + if(explosive) + QDEL_NULL(explosive) + G.forceMove(src) + explosive = G + desc = "A makeshift spear with [G] attached to it" + +/obj/item/ms13/twohanded/thunderstick/CheckParts(list/parts_list) + var/obj/item/grenade/G = locate() in parts_list + if(G) + var/obj/item/spear/lancePart = locate() in parts_list + var/datum/component/two_handed/comp_twohand = lancePart.GetComponent(/datum/component/two_handed) + if(comp_twohand) + var/lance_wielded = comp_twohand.force_wielded + var/lance_unwielded = comp_twohand.force_unwielded + AddComponent(/datum/component/two_handed, force_unwielded=lance_unwielded, force_wielded=lance_wielded) + throwforce = lancePart.throwforce + parts_list -= G + parts_list -= lancePart + set_explosive(G) + qdel(lancePart) + ..() + +/obj/item/ms13/twohanded/thunderstick/suicide_act(mob/living/carbon/user) + user.visible_message(span_suicide("[user] begins to sword-swallow \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) + explosive.forceMove(user) + explosive.detonate() + user.gib() + qdel(src) + return BRUTELOSS + +/obj/item/ms13/twohanded/thunderstick/afterattack(atom/movable/AM, mob/user, proximity) + . = ..() + if(!proximity || !wielded || !istype(AM)) + return + if(AM.resistance_flags & INDESTRUCTIBLE) //due to the lich incident of 2021, embedding grenades inside of indestructible structures is forbidden + return + if(ismob(AM)) + var/mob/mob_target = AM + if(mob_target.status_flags & GODMODE) //no embedding grenade phylacteries inside of ghost poly either + return + if(iseffect(AM)) //and no accidentally wasting your moment of glory on graffiti + return + explosive.forceMove(AM) + explosive.detonate(lanced_by=user) + qdel(src) diff --git a/mojave/modules/crafting/recipes/weapon_recipes.dm b/mojave/modules/crafting/recipes/weapon_recipes.dm index 3ddf34c72cd..fb58d0a6f40 100644 --- a/mojave/modules/crafting/recipes/weapon_recipes.dm +++ b/mojave/modules/crafting/recipes/weapon_recipes.dm @@ -134,7 +134,7 @@ /datum/crafting_recipe/thunder_stick name = "thunder stick" - result = /obj/item/spear/explosive/ms13 + result = /obj/item/ms13/twohanded/thunderstick time = 21 SECONDS tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_SAW) tool_paths = list(/obj/item/wirecutters/ms13) From 545454d14865a756a894066e9ec864b1a8743c5f Mon Sep 17 00:00:00 2001 From: Sparrowbird611 Date: Fri, 1 Dec 2023 13:13:43 -0500 Subject: [PATCH 3/3] 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