cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nerfs knife availability (#31318)

Browse Source
This commit is contained in:
PollardTheDragon
2025-12-25 23:09:59 +00:00
committed by GitHub
parent eeb980f191
commit b211866196
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/smithing/components/knife_components.dm
+8 -8
View File
@@ -3,24 +3,24 @@
desc = ABSTRACT_TYPE_DESC
icon_state = "knife_blade"
part_type = PART_PRIMARY
hammer_time = 4
hammer_time = 6
/obj/item/smithed_item/component/knife_blade/utility
name = "utility knife blade"
desc = "Smithed component part of a utility knife. The blade has yet to be honed."
materials = list(MAT_METAL = 18000)
materials = list(MAT_METAL = 30000)
finished_product = /obj/item/kitchen/knife/smithed/utility
/obj/item/smithed_item/component/knife_blade/throwing
name = "throwing knife blade"
desc = "Lightweight smithed component part of a knife. The shape is optimally balanced."
materials = list(MAT_METAL = 9000, MAT_TITANIUM = 9000)
materials = list(MAT_METAL = 28000, MAT_TITANIUM = 28000)
finished_product = /obj/item/kitchen/knife/smithed/thrown
/obj/item/smithed_item/component/knife_blade/combat
name = "combat knife blade"
desc = "Heavyweight smithed component part of a knife. A toothed edge runs across the top."
materials = list(MAT_TITANIUM = 9000, MAT_PLASMA = 9000)
materials = list(MAT_TITANIUM = 28000, MAT_PLASMA = 28000)
finished_product = /obj/item/kitchen/knife/smithed/combat
/obj/item/smithed_item/component/knife_handle
@@ -28,22 +28,22 @@
desc = ABSTRACT_TYPE_DESC
icon_state = "knife_handle"
part_type = PART_SECONDARY
hammer_time = 2
hammer_time = 4
/obj/item/smithed_item/component/knife_handle/utility
name = "utility knife handle"
desc = "Smithed component part of a utility knife. The handle fits comfortably in your hand."
materials = list(MAT_METAL = 6000)
materials = list(MAT_METAL = 18000)
finished_product = /obj/item/kitchen/knife/smithed/utility
/obj/item/smithed_item/component/knife_handle/throwing
name = "throwing knife handle"
desc = "Lightweight smithed component part of a knife. There is a small ring on the end of the handle."
materials = list(MAT_METAL = 3000, MAT_TITANIUM = 3000)
materials = list(MAT_METAL = 10000, MAT_TITANIUM = 10000)
finished_product = /obj/item/kitchen/knife/smithed/thrown
/obj/item/smithed_item/component/knife_handle/combat
name = "combat knife handle"
desc = "Heavyweight smithed component part of a knife. The handle is thick and rugged."
materials = list(MAT_TITANIUM = 3000, MAT_PLASMA = 3000)
materials = list(MAT_TITANIUM = 10000, MAT_PLASMA = 10000)
finished_product = /obj/item/kitchen/knife/smithed/combat
code/modules/smithing/machinery/kinetic_assembler.dm
+7
View File
@@ -24,6 +24,10 @@
)
/// Amount of extra items made in batches
var/batch_extras = 1
/// Products that can not be affected by productivity bits
var/list/no_productivity_types = list(
/obj/item/kitchen/knife/smithed,
)
/obj/machinery/smithing/kinetic_assembler/Initialize(mapload)
. = ..()
@@ -36,6 +40,7 @@
component_parts += new /obj/item/stock_parts/micro_laser(null)
component_parts += new /obj/item/stack/sheet/glass(null)
batched_item_types = typecacheof(batched_item_types)
no_productivity_types = typecacheof(no_productivity_types)
RefreshParts()
/obj/machinery/smithing/kinetic_assembler/Destroy()
@@ -266,6 +271,8 @@
var/total_extras = clamp(round(1 * i.bit_productivity_mod / 2), 0, 2)
if(is_type_in_typecache(finished_product, batched_item_types))
total_extras += clamp(round(batch_extras * i.bit_productivity_mod / 2), 1, 4)
if(is_type_in_typecache(finished_product, no_productivity_types))
total_extras = 0
for(var/iterator in 1 to total_extras)
var/obj/item/product
if(istype(finished_product, /obj/item/smithed_item))