Skip to content

Commit

Permalink
yea!
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Sep 13, 2024
1 parent 7ba778d commit 4891293
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
13 changes: 13 additions & 0 deletions code/game/objects/items/melee/knife.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
13 changes: 0 additions & 13 deletions code/game/objects/items/melee/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
1 change: 0 additions & 1 deletion code/modules/mining/equipment/explorer_gear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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?"
Expand Down

0 comments on commit 4891293

Please sign in to comment.