kitchen not kitcken

shiptest-ss13 · Sep 13, 2024 · efa1cba · efa1cba
1 parent 3a561a9
commit efa1cba
Show file tree

Hide file tree

Showing 27 changed files with 71 additions and 71 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
@@ -1032,7 +1032,7 @@
 "Os" = (
 /obj/structure/table/wood/reinforced,
 /obj/effect/turf_decal/corner/opaque/pink/diagonal,
-/obj/item/melee/knife/kitcken{
+/obj/item/melee/knife/kitchen{
 	pixel_y = 12;
 	pixel_x = 9
 	},

diff --git a/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm b/_maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
@@ -16,7 +16,7 @@
 /area/ruin/beach/piratecrash/storage)
 "af" = (
 /obj/structure/table/wood,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/effect/turf_decal/corner/opaque/black/diagonal,
 /obj/effect/turf_decal/siding/wood{
 	dir = 1

diff --git a/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm b/_maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
@@ -887,7 +887,7 @@
 /area/ruin/unpowered/crashed_holemaker)
 "oC" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /turf/open/floor/wood{
 	icon_state = "wood-broken7"
 	},

diff --git a/_maps/RandomRuins/SpaceRuins/spacemall.dmm b/_maps/RandomRuins/SpaceRuins/spacemall.dmm
@@ -1106,7 +1106,7 @@
 "el" = (
 /obj/structure/table/glass,
 /obj/item/toy/plush/lizardplushie,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /turf/open/floor/light,
 /area/ruin/space/has_grav/spacemall/shop2)
 "eo" = (
@@ -2138,7 +2138,7 @@
 /area/ruin/space/has_grav/spacemall)
 "ip" = (
 /obj/effect/turf_decal/corner/transparent/black/diagonal,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/structure/table,
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav/spacemall/dorms)

diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
@@ -2467,7 +2467,7 @@
 /turf/open/floor/plasteel,
 /area/wizard_station)
 "azO" = (
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /turf/open/floor/plasteel,
 /area/wizard_station)
 "azP" = (
@@ -10963,7 +10963,7 @@
 /obj/item/reagent_containers/food/condiment/peppermill{
 	pixel_x = -8
 	},
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1
 	},
@@ -15491,7 +15491,7 @@
 	pixel_x = 7;
 	pixel_y = -2
 	},
-/obj/item/melee/knife/kitcken{
+/obj/item/melee/knife/kitchen{
 	pixel_y = -5;
 	pixel_x = -5
 	},

diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm
@@ -1774,7 +1774,7 @@
 /area/outpost/crew/cryo)
 "gF" = (
 /obj/structure/table/reinforced,
-/obj/item/melee/knife/kitcken{
+/obj/item/melee/knife/kitchen{
 	pixel_y = 6;
 	pixel_x = 9
 	},
@@ -11369,7 +11369,7 @@
 "NP" = (
 /obj/effect/turf_decal/siding/wood,
 /obj/structure/table/reinforced,
-/obj/item/melee/knife/kitcken{
+/obj/item/melee/knife/kitchen{
 	pixel_x = -6;
 	pixel_y = 2
 	},
@@ -13063,7 +13063,7 @@
 	pixel_x = -4;
 	pixel_y = 6
 	},
-/obj/item/melee/knife/kitcken{
+/obj/item/melee/knife/kitchen{
 	pixel_y = 6;
 	pixel_x = 9
 	},

diff --git a/_maps/shuttles/independent/independent_beluga.dmm b/_maps/shuttles/independent/independent_beluga.dmm
@@ -2742,7 +2742,7 @@
 	pixel_y = 1
 	},
 /obj/structure/table,
-/obj/item/melee/knife/kitcken{
+/obj/item/melee/knife/kitchen{
 	pixel_x = 11;
 	pixel_y = 7
 	},

diff --git a/_maps/shuttles/independent/independent_junker.dmm b/_maps/shuttles/independent/independent_junker.dmm
@@ -91,7 +91,7 @@
 	pixel_x = 4;
 	pixel_y = 9
 	},
-/obj/item/melee/knife/kitcken{
+/obj/item/melee/knife/kitchen{
 	pixel_y = -3;
 	pixel_x = 10
 	},
@@ -1790,7 +1790,7 @@
 /obj/structure/cable{
 	icon_state = "5-10"
 	},
-/obj/item/melee/knife/kitcken{
+/obj/item/melee/knife/kitchen{
 	pixel_y = 1;
 	pixel_x = 8
 	},

diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm
@@ -1361,7 +1361,7 @@
 "iR" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/bag/tray,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/structure/cable{
 	icon_state = "2-4"
 	},

diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
@@ -1179,7 +1179,7 @@
 "pv" = (
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
 /obj/structure/table,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "pD" = (

diff --git a/_maps/shuttles/independent/independent_schmiedeberg.dmm b/_maps/shuttles/independent/independent_schmiedeberg.dmm
@@ -69,7 +69,7 @@
 /obj/structure/table,
 /obj/item/storage/bag/tray,
 /obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/item/reagent_containers/food/condiment/saltshaker{
 	pixel_x = -5;
 	pixel_y = 10

diff --git a/_maps/shuttles/independent/independent_shetland.dmm b/_maps/shuttles/independent/independent_shetland.dmm
@@ -84,7 +84,7 @@
 "aR" = (
 /obj/effect/turf_decal/corner/opaque/neutral/half,
 /obj/item/cutting_board,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/structure/table/reinforced,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm
@@ -13021,7 +13021,7 @@
 /obj/item/melee/knife/butcher{
 	pixel_x = 13
 	},
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm
@@ -2379,7 +2379,7 @@
 /obj/structure/table,
 /obj/item/cutting_board,
 /obj/item/kitchen/rollingpin,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/effect/turf_decal/corner/opaque/white/diagonal,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm b/_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
@@ -7644,7 +7644,7 @@
 /area/ship/engineering)
 "XE" = (
 /obj/structure/table/reinforced,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/item/kitchen/rollingpin,
 /obj/item/reagent_containers/food/condiment/sugar,
 /obj/item/reagent_containers/food/condiment/rice,

diff --git a/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm b/_maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
@@ -2607,7 +2607,7 @@
 	dir = 10
 	},
 /obj/structure/table/reinforced,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/item/cutting_board,
 /obj/effect/turf_decal/corner/opaque/green/mono,
 /turf/open/floor/plasteel,

diff --git a/_maps/shuttles/solgov/solgov_chronicle.dmm b/_maps/shuttles/solgov/solgov_chronicle.dmm
@@ -4433,7 +4433,7 @@
 "RX" = (
 /obj/structure/table/wood,
 /obj/item/cutting_board,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/machinery/newscaster/directional/north,
 /obj/structure/sink{
 	layer = 2.79;

diff --git a/_maps/shuttles/solgov/solgov_inkwell.dmm b/_maps/shuttles/solgov/solgov_inkwell.dmm
@@ -3297,7 +3297,7 @@
 "uS" = (
 /obj/structure/table/wood,
 /obj/item/cutting_board,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/item/reagent_containers/food/condiment/saltshaker{
 	pixel_x = -17
 	},

diff --git a/_maps/shuttles/solgov/solgov_paracelsus.dmm b/_maps/shuttles/solgov/solgov_paracelsus.dmm
@@ -4715,7 +4715,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table/wood,
 /obj/item/cutting_board,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/item/kitchen/rollingpin,
 /turf/open/floor/wood/ebony,
 /area/ship/crew/canteen)

diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -120,7 +120,7 @@
 /area/ship/security/armory)
 "aG" = (
 /obj/structure/closet/secure_closet/wall/directional/east,
-/obj/item/melee/knife/kitcken,
+/obj/item/melee/knife/kitchen,
 /obj/item/cutting_board,
 /obj/item/clothing/under/suit/waiter/syndicate,
 /obj/item/clothing/suit/hazardvest/donk,

diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
@@ -107,7 +107,7 @@
 				/obj/item/flashlight/seclite = 1,
 				/obj/item/melee/knife/shiv = 4,
 				/obj/item/melee/knife/shiv/carrot = 1,
-				/obj/item/melee/knife/kitcken = 1,
+				/obj/item/melee/knife/kitchen = 1,
 				/obj/item/storage/wallet/random = 1,
 				/obj/item/pda = 1
 				)

diff --git a/code/game/objects/items/melee/knife.dm b/code/game/objects/items/melee/knife.dm
@@ -28,7 +28,7 @@
 /obj/item/melee/knife/proc/set_butchering()
 	AddComponent(/datum/component/butchering, 80 - force, 100, force - 10) //bonus chance increases depending on force
 
-/obj/item/melee/knife/kitcken
+/obj/item/melee/knife/kitchen
 	name = "kitchen knife"
 	desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
 
@@ -153,3 +153,41 @@
 	icon = 'icons/obj/kitchen.dmi'
 	desc = "Unlike other carrots, you should probably keep this far away from your eyes."
 	custom_materials = null
+
+/obj/item/melee/knife/switchblade
+	name = "switchblade"
+	icon_state = "switchblade"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	desc = "A sharp, concealable, spring-loaded knife."
+	flags_1 = CONDUCT_1
+	force = 3
+	w_class = WEIGHT_CLASS_SMALL
+	throwforce = 5
+	throw_speed = 3
+	throw_range = 6
+	custom_materials = list(/datum/material/iron=12000)
+	hitsound = 'sound/weapons/genhit.ogg'
+	attack_verb = list("stubbed", "poked")
+	resistance_flags = FIRE_PROOF
+	var/extended = 0
+
+/obj/item/melee/knife/switchblade/attack_self(mob/user)
+	extended = !extended
+	playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
+	if(extended)
+		force = 20
+		w_class = WEIGHT_CLASS_NORMAL
+		throwforce = 23
+		icon_state = "switchblade_ext"
+		attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+		hitsound = 'sound/weapons/bladeslice.ogg'
+		sharpness = IS_SHARP
+	else
+		force = 3
+		w_class = WEIGHT_CLASS_SMALL
+		throwforce = 5
+		icon_state = "switchblade"
+		attack_verb = list("stubbed", "poked")
+		hitsound = 'sound/weapons/genhit.ogg'
+		sharpness = IS_BLUNT
diff --git a/code/game/objects/items/melee/weaponry.dm b/code/game/objects/items/melee/weaponry.dm
@@ -83,44 +83,6 @@
 	attack_verb = list("stabbed", "ripped", "gored", "impaled")
 	embedding = list("pain_mult" = 8, "embed_chance" = 100, "fall_chance" = 0, "impact_pain_mult" = 15) //55 damage+embed on hit
 
-/obj/item/switchblade
-	name = "switchblade"
-	icon_state = "switchblade"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	desc = "A sharp, concealable, spring-loaded knife."
-	flags_1 = CONDUCT_1
-	force = 3
-	w_class = WEIGHT_CLASS_SMALL
-	throwforce = 5
-	throw_speed = 3
-	throw_range = 6
-	custom_materials = list(/datum/material/iron=12000)
-	hitsound = 'sound/weapons/genhit.ogg'
-	attack_verb = list("stubbed", "poked")
-	resistance_flags = FIRE_PROOF
-	var/extended = 0
-
-/obj/item/switchblade/attack_self(mob/user)
-	extended = !extended
-	playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
-	if(extended)
-		force = 20
-		w_class = WEIGHT_CLASS_NORMAL
-		throwforce = 23
-		icon_state = "switchblade_ext"
-		attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-		hitsound = 'sound/weapons/bladeslice.ogg'
-		sharpness = IS_SHARP
-	else
-		force = 3
-		w_class = WEIGHT_CLASS_SMALL
-		throwforce = 5
-		icon_state = "switchblade"
-		attack_verb = list("stubbed", "poked")
-		hitsound = 'sound/weapons/genhit.ogg'
-		sharpness = IS_BLUNT
-
 /obj/item/mounted_chainsaw
 	name = "mounted chainsaw"
 	desc = "A chainsaw that has replaced your arm."

diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
@@ -367,7 +367,7 @@
 		/obj/item/storage/fancy/cigarettes,
 		/obj/item/reagent_containers/food/drinks/bottle,
 		/obj/item/stack/medical,
-		/obj/item/melee/knife/kitcken,
+		/obj/item/melee/knife/kitchen,
 		/obj/item/reagent_containers/hypospray,
 		/obj/item/gps,
 		/obj/item/storage/bag/ore,

diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
@@ -356,7 +356,7 @@
 	id = "kitchen_knife"
 	build_type = AUTOLATHE
 	materials = list(/datum/material/iron = 12000)
-	build_path = /obj/item/melee/knife/kitcken
+	build_path = /obj/item/melee/knife/kitchen
 	category = list("initial","Dinnerware")
 
 /datum/design/plastic_knife

diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm
@@ -4,7 +4,7 @@
 	implements = list(
 		TOOL_SCREWDRIVER		= 100,
 		TOOL_SCALPEL 			= 75, // med borgs could try to unscrew shell with scalpel
-		/obj/item/melee/knife/kitcken	= 50,
+		/obj/item/melee/knife/kitchen	= 50,
 		/obj/item				= 10)
 	time = 2.4 SECONDS
 	preop_sound = 'sound/items/screwdriver.ogg'
@@ -28,7 +28,7 @@
 	implements = list(
 		TOOL_SCREWDRIVER		= 100,
 		TOOL_SCALPEL 			= 75,
-		/obj/item/melee/knife/kitcken	= 50,
+		/obj/item/melee/knife/kitchen	= 50,
 		/obj/item				= 10)
 	time = 2.4 SECONDS
 	preop_sound = 'sound/items/screwdriver.ogg'

diff --git a/code/modules/vending/sustenance.dm b/code/modules/vending/sustenance.dm
@@ -11,7 +11,7 @@
 		/obj/item/reagent_containers/food/drinks/ice/prison = 12,
 		/obj/item/reagent_containers/food/snacks/candy_corn/prison = 6)
 	contraband = list(
-		/obj/item/melee/knife/kitcken = 6,
+		/obj/item/melee/knife/kitchen = 6,
 		/obj/item/reagent_containers/food/drinks/coffee = 12,
 		/obj/item/tank/internals/emergency_oxygen = 6,
 		/obj/item/clothing/mask/breath = 6)