diff --git a/code/modules/smithing/anvil.dm b/code/modules/smithing/anvil.dm index f3dcefed22..8e57aaccd3 100644 --- a/code/modules/smithing/anvil.dm +++ b/code/modules/smithing/anvil.dm @@ -44,6 +44,7 @@ var/outrightfailchance = 1 //todo: document this shit var/stepsdone = "" var/rng = FALSE + var/debug = FALSE //vv this if you want an artifact var/itemqualitymax = 20 var/list/smithrecipes = list(RECIPE_HAMMER = /obj/item/smithing/hammerhead, RECIPE_SCYTHE = /obj/item/smithing/scytheblade, @@ -114,7 +115,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) + playsound(src, 'sound/effects/clang2.ogg',40, 2) if(!do_after(user, steptime, target = src)) return FALSE switch(stepdone) @@ -156,14 +157,14 @@ currentquality -= 1 user.visible_message("[user] works the metal on the anvil with their hammer with a loud clang!", \ "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) + playsound(src, 'sound/effects/clang2.ogg',40, 2) + addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/effects/clang2.ogg', 40, 2), 15) if(length(stepsdone) >= 3) tryfinish(user) /obj/structure/anvil/proc/tryfinish(mob/user) - var/artifactchance = (1+(user.mind.get_skill_level(/datum/skill/level/dorfy/blacksmithing)/4))/2500 - var/artifact = prob(artifactchance) + var/artifactchance = (1+(get_skill_level(/datum/skill/level/dorfy/blacksmithing)/4))/2500 + var/artifact = max(prob(artifactchance), debug) var/finalfailchance = outrightfailchance if(user.mind.skill_holder) var/skillmod = user.mind.get_skill_level(/datum/skill/level/dorfy/blacksmithing)/10 + 1 diff --git a/code/modules/smithing/finished_items.dm b/code/modules/smithing/finished_items.dm index 55082d3992..133009e5d1 100644 --- a/code/modules/smithing/finished_items.dm +++ b/code/modules/smithing/finished_items.dm @@ -220,7 +220,7 @@ /obj/item/melee/smith/twohand/zweihander name = "zweihander" - icon_state = "zweihander" + icon_state = "zwei" overlay_state = "zweihilt" total_mass = TOTAL_MASS_MEDIEVAL_WEAPON * 2 force = 4 diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm index 47fd9727e2..7e89b88afb 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -129,10 +129,10 @@ /obj/item/smithing/proc/dwarfyartifact(var/obj/item/finalitem, var/mat) - var/finaldesc = "A [initial(finalitem.name)] made of [mat], all craftsmanship is of the highest quality. " + var/finaldesc = "A [initial(finalitem.name)] made of [mat], all craftsmanship is of the highest quality. It " switch(pick(1,2,3,4,5)) if(1) - finaldesc += "It is encrusted with [pick("","synthetic ","multi-faceted ","magical ","sparkling ") + pick("rubies","emeralds","jade","opals","lapiz lazuli")]." + finaldesc += "is encrusted with [pick("","synthetic ","multi-faceted ","magical ","sparkling ") + pick("rubies","emeralds","jade","opals","lapiz lazuli")]." if(2) finaldesc += "is laced with studs of [pick("gold","silver","aluminium","titanium")]." if(3) @@ -140,7 +140,7 @@ if(4) finaldesc += "menaces with spikes of [pick("ytterbium","uranium","white pearl","black steel")]." if(5) - finaldesc += "It is encrusted with [pick("","synthetic ","multi-faceted ","magical ","sparkling ") + pick("rubies","emeralds","jade","opals","lapiz lazuli")],laced with studs of [pick("gold","silver","aluminium","titanium")], encircled with bands of [pick("durasteel","metallic hydrogen","ferritic-alloy","plasteel","duranium")] and menaces with spikes of [pick("ytterbium","uranium","white pearl","black steel")]." + finaldesc += "is encrusted with [pick("","synthetic ","multi-faceted ","magical ","sparkling ") + pick("rubies","emeralds","jade","opals","lapiz lazuli")],laced with studs of [pick("gold","silver","aluminium","titanium")], encircled with bands of [pick("durasteel","metallic hydrogen","ferritic-alloy","plasteel","duranium")] and menaces with spikes of [pick("ytterbium","uranium","white pearl","black steel")]." finalitem.desc = finaldesc finalitem.name = pick("Delersibnir", "Nekolangrir", "Zanoreshik","Öntakrítin", "Nogzatan", "Vunomam", "Nazushagsaldôbar", "Sergeb", "Zafaldastot", "Vudnis", "Dostust", "Shotom", "Mugshith", "Angzak", "Oltud", "Deleratîs", "Nökornomal") //one of these is literally BLOOD POOL CREATE.iirc its Nazushagsaldôbar. @@ -347,7 +347,7 @@ name = "smithed zweihander blade" finishingitem = /obj/item/swordhandle finalitem = /obj/item/melee/smith/twohand/zweihander - icon_state = "zweihander" + icon_state = "zwei" /obj/item/smithing/zweiblade/startfinish() var/obj/item/melee/smith/twohand/zweihander/finalforreal = new /obj/item/melee/smith/twohand/zweihander(src)