Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes the Arrhythmic Knife #2957

Merged
merged 1 commit into from
May 5, 2024
Merged

Removes the Arrhythmic Knife #2957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions _maps/RandomRuins/BeachRuins/beach_float_resort.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,14 +237,6 @@
light_range = 2
},
/area/ruin/beach/float_resort/villa)
"gr" = (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

map key issue?

/obj/structure/table/wood,
/obj/structure/curtain/cloth,
/obj/item/nullrod/tribal_knife,
/turf/open/floor/wood{
light_range = 2
},
/area/ruin/beach/float_resort/villa)
"gQ" = (
/obj/structure/flora/ausbushes/genericbush,
/turf/open/floor/plating/grass/beach,
Expand Down Expand Up @@ -2502,7 +2494,7 @@ kp
kp
kp
kp
gr
ar
OH
OH
OH
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
/area/ruin/wasteplanet)
"bL" = (
/obj/structure/fluff/divine/convertaltar,
/obj/item/nullrod/tribal_knife,
/obj/item/clothing/accessory/pandora_hope,
/turf/open/indestructible/hierophant/two/waste,
/area/ruin/wasteplanet)
Expand Down
27 changes: 0 additions & 27 deletions code/game/objects/items/holy_weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,33 +671,6 @@
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'

/obj/item/nullrod/tribal_knife
icon_state = "crysknife"
Copy link
Member

@thgvr thgvr May 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I never noticed this was a Dune reference, even the description too lol

item_state = "crysknife"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
name = "arrhythmic knife"
w_class = WEIGHT_CLASS_HUGE
desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
sharpness = IS_SHARP
slot_flags = null
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
item_flags = SLOWS_WHILE_IN_HAND

/obj/item/nullrod/tribal_knife/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
AddComponent(/datum/component/butchering, 50, 100)

/obj/item/nullrod/tribal_knife/Destroy()
STOP_PROCESSING(SSobj, src)
. = ..()

/obj/item/nullrod/tribal_knife/process()
slowdown = rand(-2, 2)


/obj/item/nullrod/pitchfork
icon_state = "pitchfork0"
lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
Expand Down
Loading