Skip to content

Commit

Permalink
cruft removal
Browse files Browse the repository at this point in the history
  • Loading branch information
Imaginos16 committed May 5, 2024
1 parent 010d118 commit 9a050fa
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 37 deletions.
10 changes: 1 addition & 9 deletions _maps/RandomRuins/BeachRuins/beach_float_resort.dmm
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" = (
/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
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
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"
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

0 comments on commit 9a050fa

Please sign in to comment.