From d9f1ebd6f52d2ee50f61a17a87f6bd236edb84f8 Mon Sep 17 00:00:00 2001 From: lolman360 Date: Mon, 24 Aug 2020 11:44:18 +1000 Subject: [PATCH] MOVING SOME LINES AROUND FOLKS --- code/modules/smithing/anvil.dm | 2 +- code/modules/smithing/finished_items.dm | 5 +++-- code/modules/smithing/smithed_items.dm | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/smithing/anvil.dm b/code/modules/smithing/anvil.dm index 73c748e148..ffa8790a17 100644 --- a/code/modules/smithing/anvil.dm +++ b/code/modules/smithing/anvil.dm @@ -114,6 +114,7 @@ if(user.mind.skill_holder) var/skillmod = user.mind.get_skill_level(/datum/skill/level/dorfy/blacksmithing)/10 + 1 steptime = 100 / skillmod + playsound(src, 'sound/effects/clang2.ogg',20, 2) if(!do_after(user, steptime, target = src)) return FALSE switch(stepdone) @@ -157,7 +158,6 @@ "You [stepdone] the metal with a loud clang!") playsound(src, 'sound/effects/clang2.ogg',20, 2) addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/effects/clang2.ogg', 20, 2), 15) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/effects/clang2.ogg', 20, 2), 30) if(length(stepsdone) >= 3) tryfinish(user) diff --git a/code/modules/smithing/finished_items.dm b/code/modules/smithing/finished_items.dm index f36287b33a..33a258cbd2 100644 --- a/code/modules/smithing/finished_items.dm +++ b/code/modules/smithing/finished_items.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/smith.dmi' icon_state = "mace_greyscale" item_state = "mace_greyscale" + color = null material_flags = MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS total_mass = TOTAL_MASS_MEDIEVAL_WEAPON //yeah ok slot_flags = ITEM_SLOT_BELT @@ -185,7 +186,7 @@ /obj/item/melee/smith/wakizashi name = "wakizashi" sharpness = SHARP_EDGED - item_flags = NEEDS_PERMIT | ITEM_CAN_PARRY + item_flags = NEEDS_PERMIT | ITEM_CAN_PARRY | UNIQUE_RENAME icon_state = "waki" overlay_state = "wakihilt" block_parry_data = /datum/block_parry_data/waki @@ -225,7 +226,7 @@ overlay_state = "katanahilt" force = 7 wielded_mult = 2 - item_flags = ITEM_CAN_PARRY | UNIQUE_RENAME //want to name your katana "DEMON BLADE" or some shit? go ahead, idiot. + item_flags = ITEM_CAN_PARRY | UNIQUE_RENAME | NEEDS_PERMIT //want to name your katana "DEMON BLADE" or some shit? go ahead, idiot. block_parry_data = /datum/block_parry_data/captain_saber //todo /obj/item/melee/smith/sabre diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm index 1e8c549dd7..121b26c671 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -117,8 +117,8 @@ qualname = "above-average" var/datum/material/mat = custom_materials[1] mat = mat.name - finalitem.name = "[qualname] [mat] [finalitem.name]" - finalitem.desc = "A [qualname] [finalitem.name]." + finalitem.name = "[qualname] [mat] [initial(finalitem.name)]" + finalitem.desc = "A [qualname] [initial(finalitem.name)]." finalitem.forceMove(get_turf(src)) qdel(src) @@ -248,7 +248,7 @@ finalitem = /obj/item/melee/smith/shortsword/scimitar icon_state = "scimitar" -/obj/item/smithing/shortswordblade/startfinish() +/obj/item/smithing/scimitarblade/startfinish() finalitem = new /obj/item/melee/smith/shortsword/scimitar(src) finalitem.force += quality ..()