diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 975a09bc533..e3673b17e34 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -8388,7 +8388,7 @@ /obj/item/radio/intercom/syndicate{ pixel_x = -28 }, -/obj/item/kitchen/knife/carrotshiv, +/obj/item/kitchen/knife/shiv/carrot, /turf/simulated/floor/wood, /area/wizard_station) "GI" = ( diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm index 1bdb298dcea..6b08bf0d9d0 100644 --- a/code/game/objects/items/weapons/kitchen.dm +++ b/code/game/objects/items/weapons/kitchen.dm @@ -147,6 +147,19 @@ item_state = "glass_shiv" icon_state = "glass_shiv" +/obj/item/kitchen/knife/shiv/carrot + name = "carrot shiv" + desc = "Unlike other carrots, you should probably keep this far away from your eyes." + icon = 'icons/obj/kitchen.dmi' + icon_state = "carrotshiv" + item_state = "carrotshiv" + force = 8 + throwforce = 12 //fuck git + materials = list() + origin_tech = "biotech=3;combat=2" + attack_verb = list("shanked", "shivved") + armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) + /obj/item/kitchen/knife/butcher name = "butcher's cleaver" icon_state = "butch" @@ -202,19 +215,6 @@ desc = "A cyborg-mounted plasteel knife. Extremely sharp and durable." origin_tech = null -/obj/item/kitchen/knife/carrotshiv - name = "carrot shiv" - icon_state = "carrotshiv" - item_state = "carrotshiv" - desc = "Unlike other carrots, you should probably keep this far away from your eyes." - force = 8 - throwforce = 12 //fuck git - materials = list() - origin_tech = "biotech=3;combat=2" - attack_verb = list("shanked", "shivved") - armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0) - - /* * Rolling Pins */ diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm index 56fee727a20..263f5256817 100644 --- a/code/modules/hydroponics/grown/root.dm +++ b/code/modules/hydroponics/grown/root.dm @@ -34,7 +34,7 @@ /obj/item/reagent_containers/food/snacks/grown/carrot/attackby(obj/item/I, mob/user, params) if(is_sharp(I)) to_chat(user, "You sharpen the carrot into a shiv with [I].") - var/obj/item/kitchen/knife/carrotshiv/Shiv = new /obj/item/kitchen/knife/carrotshiv + var/obj/item/kitchen/knife/shiv/carrot/Shiv = new () if(!remove_item_from_storage(user)) user.unEquip(src) user.put_in_hands(Shiv)