mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-22 04:22:39 +01:00
Value Reorganization (#19879)
Deletes the worths files and moves them to their values instead, ctrl + click will now go to the correct definition in VSCode. No user facing changes.
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
/obj/item/material/kitchen
|
||||
icon = 'icons/obj/kitchen.dmi'
|
||||
contained_sprite = TRUE
|
||||
worth_multiplier = 1.1
|
||||
|
||||
/*
|
||||
* Utensils
|
||||
|
||||
@@ -146,6 +146,7 @@
|
||||
attack_verb = list("patted", "tapped")
|
||||
force_divisor = 0.25 // 15 when wielded with hardness 60 (steel)
|
||||
thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel)
|
||||
worth_multiplier = 8
|
||||
|
||||
/obj/item/material/knife/butterfly/update_force()
|
||||
if(active)
|
||||
|
||||
@@ -24,6 +24,9 @@
|
||||
var/material/material
|
||||
var/drops_debris = TRUE
|
||||
|
||||
/// Multiplies the amount this item is worth with the following calculation: material.value * worth_multiplier
|
||||
var/worth_multiplier = 1
|
||||
|
||||
/obj/item/material/Initialize(var/newloc, var/material_key)
|
||||
. = ..()
|
||||
if(!material_key)
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
force_divisor = 0.3 // 18 with hardness 60 (steel)
|
||||
thrown_force_divisor = 0.85
|
||||
attack_verb = list("jabbed","stabbed","ripped")
|
||||
worth_multiplier = 15
|
||||
|
||||
/obj/item/material/harpoon/proc/prime()
|
||||
return
|
||||
@@ -45,6 +46,7 @@
|
||||
drop_sound = 'sound/items/drop/axe.ogg'
|
||||
pickup_sound = 'sound/items/pickup/axe.ogg'
|
||||
surgerysound = 'sound/items/surgery/hatchet.ogg'
|
||||
worth_multiplier = 6
|
||||
|
||||
/obj/item/material/hatchet/can_woodcut()
|
||||
return TRUE
|
||||
@@ -150,6 +152,7 @@
|
||||
thrown_force_divisor = 0.25 // as above
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
attack_verb = list("slashed", "sliced", "cut", "clawed")
|
||||
worth_multiplier = 6
|
||||
|
||||
/obj/item/material/scythe
|
||||
name = "scythe"
|
||||
@@ -169,6 +172,7 @@
|
||||
slot_flags = SLOT_BACK
|
||||
origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2)
|
||||
attack_verb = list("chopped", "sliced", "cut", "reaped")
|
||||
worth_multiplier = 20
|
||||
|
||||
/obj/item/material/scythe/sickle
|
||||
name = "sickle"
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
drop_sound = 'sound/items/drop/sword.ogg'
|
||||
pickup_sound = /singleton/sound_category/sword_pickup_sound
|
||||
equip_sound = /singleton/sound_category/sword_equip_sound
|
||||
worth_multiplier = 30
|
||||
|
||||
/obj/item/material/sword/handle_shield(mob/user, var/on_back, var/damage, atom/damage_source = null, mob/attacker = null, var/def_zone = null, var/attack_text = "the attack")
|
||||
var/parry_bonus = 1
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
sharp = 1
|
||||
edge = TRUE
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
worth_multiplier = 25
|
||||
|
||||
/obj/item/material/star/Initialize(newloc, material_key)
|
||||
. = ..()
|
||||
|
||||
@@ -215,6 +215,7 @@
|
||||
use_material_sound = FALSE
|
||||
drop_sound = 'sound/items/drop/axe.ogg'
|
||||
pickup_sound = 'sound/items/pickup/axe.ogg'
|
||||
worth_multiplier = 31
|
||||
|
||||
/obj/item/material/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity)
|
||||
if(!proximity) return
|
||||
@@ -257,6 +258,7 @@
|
||||
default_material = "glass"
|
||||
var/obj/item/grenade/explosive = null
|
||||
use_material_sound = FALSE
|
||||
worth_multiplier = 7 //blade + stuff
|
||||
|
||||
/obj/item/material/twohanded/spear/Destroy()
|
||||
if(explosive)
|
||||
@@ -552,6 +554,7 @@
|
||||
use_material_sound = FALSE
|
||||
drop_sound = 'sound/items/drop/woodweapon.ogg'
|
||||
pickup_sound = 'sound/items/pickup/woodweapon.ogg'
|
||||
worth_multiplier = 20
|
||||
|
||||
/obj/item/material/twohanded/pike/halberd
|
||||
icon_state = "halberd0"
|
||||
@@ -563,6 +566,7 @@
|
||||
force_divisor = 0.6
|
||||
sharp = 1
|
||||
attack_verb = list("attacked", "poked", "jabbed","gored", "chopped", "cleaved", "torn", "cut", "stabbed")
|
||||
worth_multiplier = 30
|
||||
|
||||
/obj/item/material/twohanded/pike/halberd/can_woodcut()
|
||||
if(wielded)
|
||||
@@ -575,6 +579,7 @@
|
||||
base_icon = "pitchfork"
|
||||
name = "pitchfork"
|
||||
desc = "An old farming tool, not something you would find at hydroponics."
|
||||
worth_multiplier = 10
|
||||
|
||||
/obj/item/material/twohanded/pike/flag
|
||||
name = "republic of biesel flag"
|
||||
@@ -651,6 +656,7 @@
|
||||
default_material = "steel"
|
||||
parry_chance = 60
|
||||
can_embed = 0
|
||||
worth_multiplier = 35
|
||||
var/wielded_ap = 40
|
||||
var/unwielded_ap = 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user