From 48912932ca160a1ee9f8c437552e7313816b15f0 Mon Sep 17 00:00:00 2001 From: FalloutFalcon Date: Fri, 13 Sep 2024 14:19:16 -0500 Subject: [PATCH] yea! --- code/game/objects/items/melee/knife.dm | 13 +++++++++++++ code/game/objects/items/melee/misc.dm | 13 ------------- code/modules/mining/equipment/explorer_gear.dm | 1 - 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/melee/knife.dm b/code/game/objects/items/melee/knife.dm index 8819df82d3fb..83022e7125ff 100644 --- a/code/game/objects/items/melee/knife.dm +++ b/code/game/objects/items/melee/knife.dm @@ -193,3 +193,16 @@ attack_verb = list("stubbed", "poked") hitsound = 'sound/weapons/genhit.ogg' sharpness = IS_BLUNT + +/obj/item/melee/knife/letter_opener + name = "letter opener" + icon = 'icons/obj/items.dmi' + icon_state = "letter_opener" + desc = "A military combat utility survival knife." + embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE) + force = 15 + throwforce = 15 + unique_reskin = list("Traditional" = "letter_opener", + "Boxcutter" = "letter_opener_b", + "Corporate" = "letter_opener_a" + ) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 20b8934f0582..afb4bfe2ec33 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -90,19 +90,6 @@ overlay.appearance_flags = RESET_COLOR add_overlay(overlay) -/obj/item/melee/knife/letter_opener - name = "letter opener" - icon = 'icons/obj/items.dmi' - icon_state = "letter_opener" - desc = "A military combat utility survival knife." - embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE) - force = 15 - throwforce = 15 - unique_reskin = list("Traditional" = "letter_opener", - "Boxcutter" = "letter_opener_b", - "Corporate" = "letter_opener_a" - ) - /obj/item/melee/baseball_bat name = "baseball bat" desc = "There ain't a skull in the league that can withstand a swatter." diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index f5a3c1a870e9..b5e112713a82 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -218,7 +218,6 @@ flags_inv = HIDEHAIR|HIDEEARS armor = list("melee" = 15, "bullet" = 10, "laser" = 10, "energy" = 15, "bomb" = 20, "bio" = 100, "rad" = 20, "fire" = 50, "acid" = 30) - /obj/item/clothing/suit/armor/vest/scrap name = "scrap armor" desc = "An 'armor' vest consisting of sheet metal held together with cable. Who thought this was a good idea?"