From b89d4dd88ac96bdb032b5c28ec72539c0cb36fa7 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Sat, 8 Sep 2012 06:21:38 +0000 Subject: [PATCH] Replaced the ritual knives on the wizard station. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4653 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/weapon.dm | 6 ++++++ maps/tgstation.2.0.9.dmm | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 0bee7951a9c..81a0c4a1737 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -1356,6 +1356,12 @@ origin_tech = "materials=1" attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") +/obj/item/weapon/kitchenknife/ritual + name = "ritual knife" + desc = "The unearthly energies that once powered this blade are now dormant." + icon = 'icons/obj/wizard.dmi' + icon_state = "render" + /obj/item/weapon/butch name = "butcher's Cleaver" icon = 'icons/obj/kitchen.dmi' diff --git a/maps/tgstation.2.0.9.dmm b/maps/tgstation.2.0.9.dmm index 6d517f4fc08..819ec7e1460 100644 --- a/maps/tgstation.2.0.9.dmm +++ b/maps/tgstation.2.0.9.dmm @@ -7171,9 +7171,9 @@ "cHU" = (/obj/effect/decal/cleanable/molten_item,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/wizard_station) "cHV" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/structure/window/reinforced,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) "cHW" = (/obj/item/trash/chips,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/wizard_station) -"cHX" = (/obj/structure/rack,/obj/item/weapon/kitchenknife{desc = "The unearthly energies that once powered this blade are now dormant"; icon_state = "render"; name = "Veil Render"},/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station) +"cHX" = (/obj/structure/rack,/obj/item/weapon/kitchenknife/ritual,/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station) "cHY" = (/obj/effect/decal/cleanable/blood,/turf/unsimulated/floor{dir = 8; icon_state = "chapel"},/area/wizard_station) -"cHZ" = (/obj/structure/rack,/obj/item/weapon/kitchenknife{desc = "An all purpose knife for ritualistic sacrifice."; name = "Ritual knife"},/turf/unsimulated/floor{icon_state = "chapel"},/area/wizard_station) +"cHZ" = (/obj/structure/rack,/obj/item/weapon/kitchenknife/ritual,/turf/unsimulated/floor{icon_state = "chapel"},/area/wizard_station) "cIa" = (/obj/item/weapon/reagent_containers/food/snacks/grown/banana,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) "cIb" = (/obj/structure/table/woodentable,/obj/item/weapon/stamp/clown,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) "cIc" = (/obj/structure/signpost,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown)