diff --git a/code/datums/autolathe/arms.dm b/code/datums/autolathe/arms.dm index 055ea397094..a7863b9bf7e 100644 --- a/code/datums/autolathe/arms.dm +++ b/code/datums/autolathe/arms.dm @@ -409,7 +409,7 @@ /datum/category_item/autolathe/arms/tacknife name = "tactical knife" - path =/obj/item/weapon/material/hatchet/tacknife + path =/obj/item/weapon/material/knife/tacknife hidden = 1 /datum/category_item/autolathe/arms/flamethrower diff --git a/code/datums/autolathe/tools.dm b/code/datums/autolathe/tools.dm index af904366020..70ea299ec84 100644 --- a/code/datums/autolathe/tools.dm +++ b/code/datums/autolathe/tools.dm @@ -33,7 +33,7 @@ /datum/category_item/autolathe/tools/hatchet name = "hatchet" - path =/obj/item/weapon/material/hatchet + path =/obj/item/weapon/material/knife/machete/hatchet /datum/category_item/autolathe/tools/minihoe name = "mini hoe" diff --git a/code/datums/outfits/horror_killers.dm b/code/datums/outfits/horror_killers.dm index 5958cf55869..59507d4f347 100644 --- a/code/datums/outfits/horror_killers.dm +++ b/code/datums/outfits/horror_killers.dm @@ -25,7 +25,7 @@ l_ear = /obj/item/device/radio/headset glasses = /obj/item/clothing/glasses/thermal/plain/monocle suit = /obj/item/clothing/suit/storage/apron - l_pocket = /obj/item/weapon/material/hatchet/tacknife + l_pocket = /obj/item/weapon/material/knife/tacknife r_pocket = /obj/item/weapon/surgical/scalpel r_hand = /obj/item/weapon/material/twohanded/fireaxe diff --git a/code/datums/outfits/tournament.dm b/code/datums/outfits/tournament.dm index c5db1d92881..a0c31f406bf 100644 --- a/code/datums/outfits/tournament.dm +++ b/code/datums/outfits/tournament.dm @@ -30,8 +30,8 @@ uniform = /obj/item/clothing/under/rank/chef suit = /obj/item/clothing/suit/chef r_hand = /obj/item/weapon/material/kitchen/rollingpin - l_pocket = /obj/item/weapon/material/hatchet/tacknife - r_pocket = /obj/item/weapon/material/hatchet/tacknife + l_pocket = /obj/item/weapon/material/knife/tacknife + r_pocket = /obj/item/weapon/material/knife/tacknife /decl/hierarchy/outfit/tournament_gear/janitor name = "Tournament gear - Janitor" diff --git a/code/datums/supplypacks/contraband.dm b/code/datums/supplypacks/contraband.dm index 4ca0ae51d51..8c8869f318f 100644 --- a/code/datums/supplypacks/contraband.dm +++ b/code/datums/supplypacks/contraband.dm @@ -96,7 +96,7 @@ /obj/item/clothing/glasses/thermal/syndi, /obj/item/weapon/card/emag, /obj/item/ammo_magazine/m45/ap, - /obj/item/weapon/material/hatchet/tacknife/combatknife, + /obj/item/weapon/material/knife/tacknife/combatknife, /obj/item/clothing/mask/balaclava ) ) diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm index e766129a18c..af9f513a95a 100644 --- a/code/datums/supplypacks/hydroponics.dm +++ b/code/datums/supplypacks/hydroponics.dm @@ -47,7 +47,7 @@ contains = list( /obj/item/weapon/reagent_containers/spray/plantbgone = 4, /obj/item/weapon/reagent_containers/glass/bottle/ammonia = 2, - /obj/item/weapon/material/hatchet, + /obj/item/weapon/material/knife/machete/hatchet, /obj/item/weapon/material/minihoe, /obj/item/device/analyzer/plant_analyzer, /obj/item/clothing/gloves/botanic_leather, @@ -110,7 +110,7 @@ /datum/supply_packs/hydro/weedcontrol name = "Weed control crate" contains = list( - /obj/item/weapon/material/hatchet = 2, + /obj/item/weapon/material/knife/machete/hatchet = 2, /obj/item/weapon/reagent_containers/spray/plantbgone = 4, /obj/item/clothing/mask/gas = 2, /obj/item/weapon/grenade/chem_grenade/antiweed = 2, diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index f6abc317570..2bb9bf36dcb 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -7,12 +7,12 @@ /datum/uplink_item/item/visible_weapons/tactknife name = "Tactical Knife" item_cost = 10 - path = /obj/item/weapon/material/hatchet/tacknife + path = /obj/item/weapon/material/knife/tacknife /datum/uplink_item/item/visible_weapons/combatknife name = "Combat Knife" item_cost = 20 - path = /obj/item/weapon/material/hatchet/tacknife/combatknife + path = /obj/item/weapon/material/knife/tacknife/combatknife /datum/uplink_item/item/visible_weapons/energy_sword name = "Energy Sword, Random" diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 7717b6d0abf..03510c015f9 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -986,7 +986,7 @@ products = list( /obj/item/weapon/tray = 8, /obj/item/weapon/material/kitchen/utensil/fork = 6, - /obj/item/weapon/material/kitchen/utensil/knife = 6, + /obj/item/weapon/material/knife = 6, /obj/item/weapon/material/kitchen/utensil/spoon = 6, /obj/item/weapon/material/knife = 3, /obj/item/weapon/material/kitchen/rollingpin = 2, diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 8ece302f139..531fcbf1444 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -101,9 +101,8 @@ //Step one - dehairing. /obj/item/stack/material/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob) if( istype(W, /obj/item/weapon/material/knife) || \ - istype(W, /obj/item/weapon/material/kitchen/utensil/knife) || \ istype(W, /obj/item/weapon/material/twohanded/fireaxe) || \ - istype(W, /obj/item/weapon/material/hatchet) ) + istype(W, /obj/item/weapon/material/knife/machete/hatchet) ) //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message) usr.visible_message("\The [usr] starts cutting hair off \the [src]", "You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") diff --git a/code/game/objects/items/weapons/material/kitchen.dm b/code/game/objects/items/weapons/material/kitchen.dm index 87b635ce50e..2e67445fc3c 100644 --- a/code/game/objects/items/weapons/material/kitchen.dm +++ b/code/game/objects/items/weapons/material/kitchen.dm @@ -78,16 +78,10 @@ /* * Knives */ -/obj/item/weapon/material/kitchen/utensil/knife - name = "knife" - desc = "A knife for eating with. Can cut through any food." - icon_state = "knife" - force_divisor = 0.1 // 6 when wielded with hardness 60 (steel) - scoop_food = 0 // Identical to the tactical knife but nowhere near as stabby. // Kind of like the toy esword compared to the real thing. -/obj/item/weapon/material/kitchen/utensil/knife/boot +/obj/item/weapon/material/knife/boot name = "boot knife" desc = "A small fixed-blade knife for putting inside a boot." icon = 'icons/obj/weapons.dmi' @@ -95,14 +89,15 @@ item_state = "knife" applies_material_colour = 0 -/obj/item/weapon/material/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) +/* From the time of Clowns. Commented out for posterity, and sanity. +/obj/item/weapon/material/knife/attack(target as mob, mob/living/user as mob) if ((CLUMSY in user.mutations) && prob(50)) user << "You accidentally cut yourself with \the [src]." user.take_organ_damage(20) return return ..() - -/obj/item/weapon/material/kitchen/utensil/knife/plastic +*/ +/obj/item/weapon/material/knife/plastic default_material = "plastic" /* diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 375c6eee680..1fee7b1b85d 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -87,17 +87,29 @@ /obj/item/weapon/material/knife/butch name = "butcher's cleaver" - icon = 'icons/obj/kitchen.dmi' icon_state = "butch" desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products." force_divisor = 0.25 // 15 when wielded with hardness 60 (steel) attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") -/obj/item/weapon/material/hatchet/tacknife/survival +/obj/item/weapon/material/knife/machete + name = "machete" + desc = "A sharp machete often found in survival kits." + icon_state = "machete" + force_divisor = 0.3 // 20 when hardness 60 (steel) + attack_verb = list("slashed", "chopped", "gouged", "ripped", "cut") + var/should_cleave = TRUE //Now hatchets inherit from the machete, and thus knives. Tables turned. + +// This cannot go into afterattack since some mobs delete themselves upon dying. +/obj/item/weapon/material/knife/machete/pre_attack(var/mob/living/target, var/mob/living/user) + if(should_cleave && istype(target)) + cleave(user, target) + ..() + +/obj/item/weapon/material/knife/tacknife/survival name = "survival knife" desc = "A hunting grade survival knife." icon = 'icons/obj/kitchen.dmi' icon_state = "survivalknife" item_state = "knife" applies_material_colour = FALSE - should_cleave = FALSE diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index d66cd3efab8..a5860465b97 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -19,7 +19,7 @@ attack_verb = list("punched", "beaten", "struck") applies_material_colour = 0 -/obj/item/weapon/material/hatchet +/obj/item/weapon/material/knife/machete/hatchet name = "hatchet" desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." icon = 'icons/obj/weapons.dmi' @@ -32,15 +32,8 @@ origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1) attack_verb = list("chopped", "torn", "cut") applies_material_colour = 0 - var/should_cleave = TRUE // Because knives inherit from hatchets. For some reason. -// This cannot go into afterattack since some mobs delete themselves upon dying. -/obj/item/weapon/material/hatchet/pre_attack(var/mob/living/target, var/mob/living/user) - if(should_cleave && istype(target)) - cleave(user, target) - ..() - -/obj/item/weapon/material/hatchet/unathiknife +/obj/item/weapon/material/knife/machete/hatchet/unathiknife name = "duelling knife" desc = "A length of leather-bound wood studded with razor-sharp teeth. How crude." icon = 'icons/obj/weapons.dmi' @@ -49,23 +42,23 @@ should_cleave = FALSE var hits = 0 -/obj/item/weapon/material/hatchet/unathiknife/attack(mob/M as mob, mob/user as mob) +/obj/item/weapon/material/knife/machete/hatchet/unathiknife/attack(mob/M as mob, mob/user as mob) if(hits > 0) return var/obj/item/I = user.get_inactive_hand() - if(istype(I, /obj/item/weapon/material/hatchet/unathiknife)) + if(istype(I, /obj/item/weapon/material/knife/machete/hatchet/unathiknife)) hits ++ var/obj/item/weapon/W = I W.attack(M, user) W.afterattack(M, user) ..() -/obj/item/weapon/material/hatchet/unathiknife/afterattack(mob/M as mob, mob/user as mob) +/obj/item/weapon/material/knife/machete/hatchet/unathiknife/afterattack(mob/M as mob, mob/user as mob) hits = initial(hits) ..() // These probably shouldn't inherit from hatchets. -/obj/item/weapon/material/hatchet/tacknife +/obj/item/weapon/material/knife/tacknife name = "tactical knife" desc = "You'd be killing loads of people if this was Medal of Valor: Heroes of Space." icon = 'icons/obj/weapons.dmi' @@ -73,9 +66,8 @@ item_state = "knife" attack_verb = list("stabbed", "chopped", "cut") applies_material_colour = 1 - should_cleave = FALSE -/obj/item/weapon/material/hatchet/tacknife/combatknife +/obj/item/weapon/material/knife/tacknife/combatknife name = "combat knife" desc = "If only you had a boot to put it in." icon = 'icons/obj/weapons.dmi' @@ -85,7 +77,6 @@ thrown_force_divisor = 1.75 // 20 with weight 20 (steel) attack_verb = list("sliced", "stabbed", "chopped", "cut") applies_material_colour = 1 - should_cleave = FALSE /obj/item/weapon/material/minihoe // -- Numbers name = "mini hoe" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 6d261a8b3f0..48d6296cc39 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -52,7 +52,7 @@ /obj/item/device/radio/headset, /obj/item/device/robotanalyzer, /obj/item/weapon/material/minihoe, - /obj/item/weapon/material/hatchet, + /obj/item/weapon/material/knife/machete/hatchet, /obj/item/device/analyzer/plant_analyzer, /obj/item/weapon/extinguisher/mini, /obj/item/weapon/tape_roll, diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index c27db4356d9..8957a5f7b54 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -988,9 +988,9 @@ /obj/item/weapon/screwdriver, /obj/item/weapon/wrench, /obj/item/weapon/wirecutters, - /obj/item/weapon/material/kitchen/utensil/knife, + /obj/item/weapon/material/knife, /obj/item/weapon/material/kitchen/utensil/fork, - /obj/item/weapon/material/hatchet + /obj/item/weapon/material/knife/machete/hatchet ) var/list/tools = list() var/current_tool = 1 diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index 60c55cfc71a..cde09b0783f 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -215,7 +215,7 @@ prob(6);/obj/item/weapon/material/wirerod, prob(2);/obj/item/weapon/material/butterfly/switchblade, prob(2);/obj/item/weapon/material/knuckledusters, - prob(1);/obj/item/weapon/material/hatchet/tacknife, + prob(1);/obj/item/weapon/material/knife/tacknife, prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc, prob(1);/obj/item/weapon/beartrap, prob(1);/obj/item/weapon/handcuffs, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 52c1624d4df..fc5a5367302 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -22,7 +22,7 @@ new /obj/item/device/radio/headset/headset_service(src) new /obj/item/clothing/head/greenbandana(src) new /obj/item/weapon/material/minihoe(src) - new /obj/item/weapon/material/hatchet(src) + new /obj/item/weapon/material/knife/machete/hatchet(src) new /obj/item/weapon/wirecutters/clippers(src) new /obj/item/weapon/reagent_containers/spray/plantbgone(src) new /obj/item/clothing/suit/storage/hooded/wintercoat/hydro(src) diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index 5f570daaefc..de9a8036242 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -204,7 +204,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/clothing/under/tactical, /obj/item/weapon/beartrap, /obj/item/clothing/suit/storage/vest/press, - /obj/item/weapon/material/hatchet/tacknife, + /obj/item/weapon/material/knife/tacknife, /obj/item/weapon/material/butterfly/switchblade ) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 5f2a72aeb81..1c2e30a9b75 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -496,7 +496,7 @@ if((can_hold_knife == 1) && (istype(I, /obj/item/weapon/material/shard) || \ istype(I, /obj/item/weapon/material/butterfly) || \ istype(I, /obj/item/weapon/material/kitchen/utensil) || \ - istype(I, /obj/item/weapon/material/hatchet/tacknife))) + istype(I, /obj/item/weapon/material/knife/tacknife))) if(holding) user << "\The [src] is already holding \a [holding]." return diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 373ca946d3d..032c133fd9f 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -55,7 +55,7 @@ "Vox" = 'icons/mob/species/vox/suit.dmi' ) supporting_limbs = list() - var/obj/item/weapon/material/hatchet/tacknife + var/obj/item/weapon/material/knife/tacknife /obj/item/clothing/suit/space/rig/attack_hand(var/mob/living/M) if(tacknife) @@ -69,7 +69,7 @@ ..() /obj/item/clothing/suit/space/rig/attackby(var/obj/item/I, var/mob/living/M) - if(istype(I, /obj/item/weapon/material/hatchet/tacknife)) + if(istype(I, /obj/item/weapon/material/knife/tacknife)) if(tacknife) return M.drop_item() diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 4cc9c03dd01..150c84abcf4 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -98,11 +98,9 @@ /obj/item/clothing/accessory/storage/knifeharness/New() ..() hold.max_storage_space = ITEMSIZE_COST_SMALL * 2 - hold.can_hold = list(/obj/item/weapon/material/hatchet/unathiknife,\ - /obj/item/weapon/material/kitchen/utensil/knife,\ - /obj/item/weapon/material/kitchen/utensil/knife/plastic,\ + hold.can_hold = list(/obj/item/weapon/material/knife/machete/hatchet/unathiknife,\ /obj/item/weapon/material/knife,\ - /obj/item/weapon/material/knife/ritual) + /obj/item/weapon/material/knife/plastic) - new /obj/item/weapon/material/hatchet/unathiknife(hold) - new /obj/item/weapon/material/hatchet/unathiknife(hold) + new /obj/item/weapon/material/knife/machete/hatchet/unathiknife(hold) + new /obj/item/weapon/material/knife/machete/hatchet/unathiknife(hold) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 6af18bfddbd..34b2a1e78fc 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -198,7 +198,7 @@ qdel(src) return else if(seed.chems) - if(istype(W,/obj/item/weapon/material/hatchet) && !isnull(seed.chems["woodpulp"])) + if(W.sharp && W.edge && !isnull(seed.chems["woodpulp"])) user.show_message("You make planks out of \the [src]!", 1) playsound(loc, 'sound/effects/woodcutting.ogg', 50, 1) var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR) diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index fffbbda7d5e..aa054cae29d 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -44,7 +44,7 @@ /obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() - if(istype(W, /obj/item/weapon/surgical/circular_saw) || istype(W, /obj/item/weapon/material/hatchet) || istype(W, /obj/item/weapon/material/kitchen/utensil/knife) || istype(W, /obj/item/weapon/material/knife) || istype(W, /obj/item/weapon/material/knife/ritual)) + if(istype(W, /obj/item/weapon/surgical/circular_saw) || istype(W, /obj/item/weapon/material/knife/machete/hatchet) || istype(W, /obj/item/weapon/material/knife)) user << "You use [W] to fashion a pipe out of the corn cob!" new /obj/item/clothing/mask/smokable/pipe/cobpipe (user.loc) qdel(src) diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index ad6301f9854..7b8a4d4647b 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -25,7 +25,7 @@ if(hardness>50) recipes += new/datum/stack_recipe("[display_name] fork", /obj/item/weapon/material/kitchen/utensil/fork/plastic, 1, on_floor = 1, supplied_material = "[name]") - recipes += new/datum/stack_recipe("[display_name] knife", /obj/item/weapon/material/kitchen/utensil/knife/plastic, 1, on_floor = 1, supplied_material = "[name]") + recipes += new/datum/stack_recipe("[display_name] knife", /obj/item/weapon/material/knife/plastic, 1, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("[display_name] blade", /obj/item/weapon/material/butterflyblade, 6, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]") /material/steel/generate_recipes() diff --git a/code/modules/mob/living/silicon/robot/robot_modules/event.dm b/code/modules/mob/living/silicon/robot/robot_modules/event.dm index 7e947cfc628..8b2e80c4480 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/event.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/event.dm @@ -61,7 +61,7 @@ // For growing flowers src.modules += new /obj/item/weapon/material/minihoe(src) - src.modules += new /obj/item/weapon/material/hatchet(src) + src.modules += new /obj/item/weapon/material/knife/machete/hatchet(src) src.modules += new /obj/item/device/analyzer/plant_analyzer(src) src.modules += new /obj/item/weapon/storage/bag/plants(src) src.modules += new /obj/item/weapon/robot_harvester(src) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 9098348e3ae..dacf13eefab 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -603,7 +603,7 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/weapon/gripper/service(src) src.modules += new /obj/item/weapon/reagent_containers/glass/bucket(src) src.modules += new /obj/item/weapon/material/minihoe(src) - src.modules += new /obj/item/weapon/material/hatchet(src) + src.modules += new /obj/item/weapon/material/knife/machete/hatchet(src) src.modules += new /obj/item/device/analyzer/plant_analyzer(src) src.modules += new /obj/item/weapon/storage/bag/plants(src) src.modules += new /obj/item/weapon/robot_harvester(src) diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm index f66198e0957..30b5f86027d 100644 --- a/code/modules/random_map/drop/drop_types.dm +++ b/code/modules/random_map/drop/drop_types.dm @@ -42,7 +42,7 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/weapon/gun/energy/xray, /obj/item/weapon/storage/box/emps, /obj/item/weapon/storage/box/flashbangs, - /obj/item/weapon/material/hatchet/tacknife/combatknife) + /obj/item/weapon/material/knife/tacknife/combatknife) /datum/supply_drop_loot/ballistics name = "Ballistic Warfare" @@ -66,7 +66,7 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/ammo_magazine/m762/ap, /obj/item/weapon/gun/projectile/colt, /obj/item/ammo_magazine/m45, - /obj/item/weapon/material/hatchet/tacknife/combatknife) + /obj/item/weapon/material/knife/tacknife/combatknife) /datum/supply_drop_loot/heavy_warfare name = "Heavy Warfare" @@ -94,7 +94,7 @@ var/global/list/datum/supply_drop_loot/supply_drop /obj/item/weapon/grenade/flashbang, /obj/item/weapon/grenade/empgrenade, /obj/item/weapon/grenade/empgrenade, - /obj/item/weapon/material/hatchet/tacknife/combatknife) + /obj/item/weapon/material/knife/tacknife/combatknife) datum/supply_drop_loot/riot name = "Riot Gear" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 2c2a3966a36..014fddbbfef 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3410,7 +3410,7 @@ // potato + knife = raw sticks /obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/material/kitchen/utensil/knife)) + if(istype(W,/obj/item/weapon/material/knife)) new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(src) user << "You cut the potato." qdel(src) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index dbc6f17a5d6..9c4ee4dc5d4 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -298,7 +298,7 @@ obj/item/weapon/reagent_containers/glass/bucket/wood if(isprox(D)) user << "This wooden bucket doesn't play well with electronics." return - else if(istype(D, /obj/item/weapon/material/hatchet)) + else if(istype(D, /obj/item/weapon/material/knife/machete/hatchet)) to_chat(user, "You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now.") user.put_in_hands(new /obj/item/clothing/head/helmet/bucket/wood) user.drop_from_inventory(src) diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm index d3013c4570e..2ab82cd2aea 100644 --- a/code/modules/surgery/encased.dm +++ b/code/modules/surgery/encased.dm @@ -21,7 +21,7 @@ /datum/surgery_step/open_encased/saw allowed_tools = list( /obj/item/weapon/surgical/circular_saw = 100, \ - /obj/item/weapon/material/hatchet = 75 + /obj/item/weapon/material/knife/machete/hatchet = 75 ) min_duration = 50 diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 4c10bb80354..f74c7dda641 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -303,7 +303,7 @@ /datum/surgery_step/generic/amputate allowed_tools = list( /obj/item/weapon/surgical/circular_saw = 100, \ - /obj/item/weapon/material/hatchet = 75 + /obj/item/weapon/material/knife/machete/hatchet = 75 ) req_open = 0 diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index 79609b0b7ba..3174bbf405b 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -30,7 +30,7 @@ allowed_tools = list( /obj/item/weapon/screwdriver = 100, /obj/item/weapon/coin = 50, - /obj/item/weapon/material/kitchen/utensil/knife = 50 + /obj/item/weapon/material/knife = 50 ) req_open = 0 diff --git a/code/modules/surgery/slimes.dm b/code/modules/surgery/slimes.dm index 7cb5e4acfce..05ceed18b16 100644 --- a/code/modules/surgery/slimes.dm +++ b/code/modules/surgery/slimes.dm @@ -70,7 +70,7 @@ /datum/surgery_step/slime/saw_core allowed_tools = list( /obj/item/weapon/surgical/circular_saw = 100, \ - /obj/item/weapon/material/hatchet = 75 + /obj/item/weapon/material/knife/machete/hatchet = 75 ) min_duration = 50 diff --git a/code/modules/xenoarcheaology/artifacts/replicator.dm b/code/modules/xenoarcheaology/artifacts/replicator.dm index 46e5ad70fb0..c14bbb12a3f 100644 --- a/code/modules/xenoarcheaology/artifacts/replicator.dm +++ b/code/modules/xenoarcheaology/artifacts/replicator.dm @@ -49,7 +49,7 @@ /obj/item/weapon/clipboard, /obj/item/weapon/cell, /obj/item/weapon/surgical/circular_saw, - /obj/item/weapon/material/hatchet, + /obj/item/weapon/material/knife/machete/hatchet, /obj/item/weapon/handcuffs, /obj/item/weapon/surgical/hemostat, /obj/item/weapon/material/knife, diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index 051a67c542e..42e8408c458 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -59,7 +59,7 @@ if(prob(25)) new_item = new /obj/item/weapon/material/kitchen/utensil/fork(src.loc) else if(prob(50)) - new_item = new /obj/item/weapon/material/kitchen/utensil/knife(src.loc) + new_item = new /obj/item/weapon/material/knife(src.loc) else new_item = new /obj/item/weapon/material/kitchen/utensil/spoon(src.loc) additional_desc = "[pick("It's like no [item_type] you've ever seen before",\ diff --git a/icons/mob/items/lefthand_material.dmi b/icons/mob/items/lefthand_material.dmi index b91fb8a545d..767b25c77a7 100644 Binary files a/icons/mob/items/lefthand_material.dmi and b/icons/mob/items/lefthand_material.dmi differ diff --git a/icons/mob/items/righthand_material.dmi b/icons/mob/items/righthand_material.dmi index e950740bb87..28da6c5e55a 100644 Binary files a/icons/mob/items/righthand_material.dmi and b/icons/mob/items/righthand_material.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 021d31d6e98..92ac55f9666 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm index 3b84b3988b4..16836b3912b 100644 --- a/maps/northern_star/polaris-1.dmm +++ b/maps/northern_star/polaris-1.dmm @@ -4698,7 +4698,7 @@ "bMr" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/bridge_hallway) "bMs" = (/obj/effect/floor_decal/corner/blue,/obj/structure/reagent_dispensers/water_cooler/full,/turf/simulated/floor/tiled,/area/bridge_hallway) "bMt" = (/turf/simulated/wall/r_wall,/area/crew_quarters/captain) -"bMu" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/effect/floor_decal/corner/lime/full,/obj/item/weapon/material/hatchet,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/hatchet,/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled,/area/hydroponics) +"bMu" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/effect/floor_decal/corner/lime/full,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/knife/machete/hatchet,/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor/tiled,/area/hydroponics) "bMv" = (/obj/structure/table/standard{name = "plastic table frame"},/obj/effect/floor_decal/corner/lime{dir = 10},/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/reagent_containers/glass/bucket,/obj/machinery/firealarm{dir = 1; pixel_x = 0; pixel_y = -26},/turf/simulated/floor/tiled,/area/hydroponics) "bMw" = (/obj/machinery/smartfridge/drying_rack,/obj/effect/floor_decal/corner/lime{dir = 10},/turf/simulated/floor/tiled,/area/hydroponics) "bMx" = (/obj/machinery/honey_extractor,/obj/effect/floor_decal/corner/lime{dir = 10},/obj/machinery/camera/network/civilian{c_tag = "CIV - Hydroponics"; dir = 1},/turf/simulated/floor/tiled,/area/hydroponics) diff --git a/maps/northern_star/polaris-2.dmm b/maps/northern_star/polaris-2.dmm index fecaffc3abe..d6c6417fea5 100644 --- a/maps/northern_star/polaris-2.dmm +++ b/maps/northern_star/polaris-2.dmm @@ -684,12 +684,12 @@ "nh" = (/obj/mecha/combat/gygax/dark,/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) "ni" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/flashshells,/obj/item/weapon/storage/box/flashshells,/obj/item/weapon/storage/box/stunshells,/obj/item/weapon/storage/box/stunshells,/obj/item/weapon/storage/box/beanbags,/obj/item/weapon/storage/box/beanbags,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nj" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/handcuffs{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"nk" = (/obj/structure/table/reinforced,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"nk" = (/obj/structure/table/reinforced,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nl" = (/obj/structure/table/reinforced,/obj/item/weapon/wrench,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nm" = (/obj/structure/table/rack,/obj/item/rig_module/device/drill,/obj/item/rig_module/device/drill,/obj/item/rig_module/maneuvering_jets,/obj/item/rig_module/maneuvering_jets,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nn" = (/obj/structure/table/rack,/obj/item/rig_module/mounted/taser,/obj/item/rig_module/mounted/taser,/obj/item/rig_module/mounted/taser,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "no" = (/obj/structure/table/rack,/obj/item/rig_module/grenade_launcher,/obj/item/rig_module/grenade_launcher,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"np" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/handcuffs,/obj/item/device/flash,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/weapon/material/hatchet/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) +"np" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/flashbangs,/obj/item/weapon/handcuffs,/obj/item/device/flash,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/weapon/material/knife/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nq" = (/obj/structure/table/rack,/obj/item/weapon/rig/ert,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "nr" = (/obj/structure/table/reinforced,/obj/item/weapon/gun/energy/gun/nuclear,/obj/item/weapon/hand_tele,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "ns" = (/obj/structure/table/rack,/obj/item/weapon/storage/backpack/security,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/shoes/galoshes,/obj/item/clothing/head/bio_hood/janitor,/obj/item/clothing/suit/bio_suit/janitor,/obj/item/clothing/gloves/purple,/obj/item/clothing/glasses/science,/obj/item/weapon/storage/backpack/security,/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/shoes/galoshes,/obj/item/clothing/head/bio_hood/janitor,/obj/item/clothing/suit/bio_suit/janitor,/obj/item/clothing/gloves/purple,/obj/item/clothing/glasses/science,/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 6; pixel_y = 3},/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) @@ -979,7 +979,7 @@ "sQ" = (/obj/machinery/recharger/wallcharger{pixel_x = -25},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "sR" = (/obj/structure/closet,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/item/weapon/reagent_containers/food/snacks/liquidfood,/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "sS" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/lattice,/turf/space,/area/space) -"sT" = (/obj/structure/table/rack,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) +"sT" = (/obj/structure/table/rack,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "sU" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/ionrifle,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "sV" = (/obj/structure/table/rack,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/obj/item/weapon/crowbar/red,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) "sW" = (/obj/structure/table/rack,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/obj/item/device/megaphone,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership) @@ -1089,7 +1089,7 @@ "uW" = (/obj/machinery/computer/communications,/turf/simulated/shuttle/floor/red,/area/shuttle/administration/centcom) "uX" = (/obj/effect/wingrille_spawn/reinforced/crescent,/turf/simulated/shuttle/plating,/area/shuttle/administration/centcom) "uY" = (/turf/unsimulated/wall,/area/centcom/suppy) -"uZ" = (/obj/structure/table/standard,/obj/item/weapon/material/kitchen/utensil/knife{pixel_x = -6},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = -1},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 4},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 9},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) +"uZ" = (/obj/structure/table/standard,/obj/item/weapon/material/knife{pixel_x = -6},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = -1},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 4},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 9},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "va" = (/obj/machinery/door/window{dir = 4; name = "Brig"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "vb" = (/obj/machinery/door/window{base_state = "right"; dir = 8; icon_state = "right"; name = "Preparation"; req_access = list(150)},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) "vc" = (/obj/structure/closet/syndicate/suit{name = "suit closet"},/obj/machinery/light{dir = 4},/turf/simulated/shuttle/floor/darkred,/area/syndicate_station/start) diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index 46e8617a5ab..c3731ba95bd 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -1919,7 +1919,7 @@ "aKU" = (/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/quartermaster/storage) "aKV" = (/obj/effect/floor_decal/borderfloorblack{dir = 6},/obj/effect/floor_decal/industrial/danger{dir = 6},/turf/simulated/floor/tiled/techfloor/grid,/area/quartermaster/storage) "aKW" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/engineering{name = "Cargo Substation"; req_one_access = list(11,24)},/turf/simulated/floor/plating,/area/maintenance/substation/firstdeck/cargo) -"aKX" = (/obj/structure/closet/crate/hydroponics,/obj/item/weapon/material/hatchet,/obj/item/weapon/material/minihoe,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftport) +"aKX" = (/obj/structure/closet/crate/hydroponics,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/material/minihoe,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftport) "aKY" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftport) "aKZ" = (/obj/structure/table/steel,/obj/item/weapon/reagent_containers/glass/bucket,/obj/random/maintenance/cargo,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftport) "aLa" = (/turf/simulated/wall/r_wall,/area/maintenance/firstdeck/aftport) @@ -8382,7 +8382,7 @@ "dfj" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/light,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lime/border,/turf/simulated/floor/tiled/hydro,/area/hydroponics) "dfk" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/structure/disposalpipe/sortjunction/flipped{dir = 2; name = "Hydroponics"; sortType = "Hydroponics"},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lime/border,/turf/simulated/floor/tiled/hydro,/area/hydroponics) "dfl" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lime/border,/turf/simulated/floor/tiled/hydro,/area/hydroponics) -"dfm" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 11; pixel_y = -24},/obj/structure/cable/green,/obj/structure/table/standard{name = "plastic table frame"},/obj/item/weapon/material/hatchet,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/hatchet,/obj/item/weapon/material/hatchet,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/minihoe,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lime/border,/turf/simulated/floor/tiled/hydro,/area/hydroponics) +"dfm" = (/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 11; pixel_y = -24},/obj/structure/cable/green,/obj/structure/table/standard{name = "plastic table frame"},/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/minihoe,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lime/border,/turf/simulated/floor/tiled/hydro,/area/hydroponics) "dfn" = (/obj/machinery/seed_storage/garden,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lime/border,/turf/simulated/floor/tiled/hydro,/area/hydroponics) "dfo" = (/obj/machinery/vending/hydronutrients,/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lime/border,/turf/simulated/floor/tiled/hydro,/area/hydroponics) "dfp" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/lime/border,/turf/simulated/floor/tiled/hydro,/area/hydroponics) diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index c664b133ee7..6e53d97ae58 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -1328,7 +1328,7 @@ "zB" = (/obj/machinery/portable_atmospherics/hydroponics{closed_system = 1; name = "isolation tray"},/obj/machinery/atmospherics/portables_connector,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 1},/turf/simulated/floor/tiled/hydro,/area/surface/outpost/research/xenoresearch/xenoflora) "zC" = (/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/tiled/hydro,/area/surface/outpost/research/xenoresearch/xenoflora) "zD" = (/obj/effect/floor_decal/corner/green,/turf/simulated/floor/tiled/white,/area/surface/outpost/research/xenoresearch/xenoflora) -"zE" = (/obj/structure/table/glass,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/hatchet,/obj/item/weapon/material/hatchet,/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/tiled/white,/area/surface/outpost/research/xenoresearch/xenoflora) +"zE" = (/obj/structure/table/glass,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/minihoe,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/material/knife/machete/hatchet,/obj/effect/floor_decal/corner/green{dir = 10},/turf/simulated/floor/tiled/white,/area/surface/outpost/research/xenoresearch/xenoflora) "zF" = (/obj/structure/table/glass,/obj/item/weapon/hand_labeler,/obj/effect/floor_decal/corner/green/full{dir = 4},/turf/simulated/floor/tiled/white,/area/surface/outpost/research/xenoresearch/xenoflora) "zG" = (/obj/structure/table/glass,/obj/item/weapon/folder/white,/obj/item/weapon/pen,/obj/effect/floor_decal/corner/green/full,/turf/simulated/floor/tiled/white,/area/surface/outpost/research/xenoresearch/xenoflora) "zH" = (/obj/structure/table/glass,/obj/effect/floor_decal/corner/green{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/yellow,/turf/simulated/floor/tiled/white,/area/surface/outpost/research/xenoresearch/xenoflora) diff --git a/maps/southern_cross/southern_cross-6.dmm b/maps/southern_cross/southern_cross-6.dmm index 602397ff317..165711d31ad 100644 --- a/maps/southern_cross/southern_cross-6.dmm +++ b/maps/southern_cross/southern_cross-6.dmm @@ -305,7 +305,7 @@ "fS" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/rubber,/obj/item/ammo_magazine/m45/flash,/obj/item/ammo_magazine/m45/flash,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/obj/item/ammo_magazine/m45,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fT" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/item/weapon/gun/projectile/sec,/obj/item/weapon/gun/projectile/sec,/obj/item/weapon/gun/projectile/sec,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fU" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/box/handcuffs{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/box/handcuffs,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) -"fV" = (/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"fV" = (/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/reagent_containers/spray/pepper,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fW" = (/obj/machinery/vending/security,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fX" = (/obj/structure/table/rack,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/taperoll/police,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/device/flash,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/melee/baton/loaded,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "fY" = (/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/rack,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/obj/item/weapon/storage/backpack/ert/security,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) @@ -454,7 +454,7 @@ "iL" = (/obj/structure/table/rack,/obj/item/rig_module/grenade_launcher,/obj/item/rig_module/grenade_launcher,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iM" = (/obj/structure/closet/crate,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) "iN" = (/obj/machinery/autolathe{desc = "Your typical Autolathe. It appears to have much more options than your regular one, however..."; hacked = 1; name = "Unlocked Autolathe"},/turf/unsimulated/floor{icon_state = "dark"},/area/centcom/specops) -"iO" = (/obj/structure/table/reinforced,/obj/item/weapon/handcuffs,/obj/item/device/flash,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) +"iO" = (/obj/structure/table/reinforced,/obj/item/weapon/handcuffs,/obj/item/device/flash,/obj/item/weapon/melee/baton/loaded,/obj/item/weapon/storage/belt/security/tactical,/obj/item/weapon/gun/energy/stunrevolver,/obj/item/clothing/glasses/sunglasses/sechud/tactical,/obj/item/weapon/material/knife/tacknife/combatknife,/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iP" = (/obj/structure/table/rack,/obj/item/weapon/rig/ert,/obj/item/clothing/accessory/storage/black_vest,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iQ" = (/obj/structure/table/reinforced,/obj/item/weapon/gun/energy/gun/nuclear,/obj/item/weapon/hand_tele,/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/specops) "iR" = (/obj/machinery/door/blast/regular{icon_state = "pdoor1"; id = "CREED"; name = "Ready Room"; p_open = 0},/turf/unsimulated/floor{icon_state = "plating"; name = "plating"},/area/centcom/specops) @@ -1737,7 +1737,7 @@ "HQ" = (/obj/structure/table/rack,/obj/item/weapon/storage/toolbox/emergency{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/emergency{pixel_x = -3; pixel_y = -3},/obj/item/weapon/storage/toolbox/emergency{pixel_x = 3; pixel_y = 3},/obj/item/weapon/storage/toolbox/emergency,/obj/item/weapon/storage/toolbox/emergency{pixel_x = -3; pixel_y = -3},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "HR" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/plasmastun,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "HS" = (/obj/structure/table/rack,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) -"HT" = (/obj/structure/table/rack,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/material/hatchet/tacknife/combatknife,/obj/item/weapon/material/hatchet/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) +"HT" = (/obj/structure/table/rack,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/material/knife/tacknife/combatknife,/obj/item/weapon/material/knife/tacknife/combatknife,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "HU" = (/obj/structure/table/rack,/obj/item/weapon/gun/energy/ionrifle,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 32},/obj/item/weapon/gun/energy/ionrifle,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_station) "HV" = (/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) "HW" = (/obj/mecha/combat/marauder/mauler,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/elite_squad) @@ -2186,7 +2186,7 @@ "Qz" = (/obj/structure/table/standard,/obj/item/weapon/surgical/cautery,/obj/item/weapon/surgical/retractor,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/shuttle/floor/white,/area/skipjack_station/start) "QA" = (/obj/structure/closet{name = "custodial"},/obj/item/weapon/mop,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) "QB" = (/obj/structure/mopbucket,/turf/simulated/shuttle/floor/voidcraft/dark,/area/syndicate_station/start) -"QC" = (/obj/structure/table/steel,/obj/item/weapon/material/kitchen/utensil/knife{pixel_x = -6},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 9},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 4},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = -1},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) +"QC" = (/obj/structure/table/steel,/obj/item/weapon/material/knife{pixel_x = -6},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 9},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = 4},/obj/item/weapon/reagent_containers/syringe/drugs{pixel_x = 3; pixel_y = -1},/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "QD" = (/obj/item/device/radio/electropack,/obj/structure/table/steel,/turf/simulated/shuttle/floor/voidcraft,/area/syndicate_station/start) "QE" = (/obj/machinery/button/remote/blast_door{id = "syndieshutters_infirmary"; name = "remote shutter control"; pixel_x = -25},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) "QF" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/steel,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/stack/nanopaste,/turf/simulated/shuttle/floor/voidcraft/light,/area/syndicate_station/start) diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index 9f442f7b469..30b8186f5dc 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -46,7 +46,7 @@ new /obj/item/device/radio/headset(src) new /obj/item/device/flashlight(src) new /obj/item/device/gps/explorer(src) - new /obj/item/weapon/material/hatchet/tacknife/survival(src) + new /obj/item/weapon/material/knife/tacknife/survival(src) new /obj/item/weapon/storage/box/flare(src) new /obj/item/device/geiger(src) new /obj/item/weapon/cell/device(src) diff --git a/maps/submaps/cave_submaps/lost_explorer.dmm b/maps/submaps/cave_submaps/lost_explorer.dmm index 4a067e40423..6ae89fea3ce 100644 --- a/maps/submaps/cave_submaps/lost_explorer.dmm +++ b/maps/submaps/cave_submaps/lost_explorer.dmm @@ -1,7 +1,7 @@ "a" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) "b" = (/obj/item/device/geiger,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) "c" = (/obj/item/clothing/mask/gas/explorer,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) -"d" = (/obj/item/weapon/material/hatchet/tacknife/survival,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) +"d" = (/obj/item/weapon/material/knife/tacknife/survival,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) "e" = (/obj/item/clothing/shoes/boots/winter/explorer,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) "f" = (/obj/item/clothing/under/explorer,/obj/effect/decal/remains,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) "g" = (/obj/item/clothing/suit/storage/hooded/explorer,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/lost_explorer) diff --git a/maps/submaps/cave_submaps/quarantineshuttle.dmm b/maps/submaps/cave_submaps/quarantineshuttle.dmm index e71c4f8c5d0..8c2f028faa9 100644 --- a/maps/submaps/cave_submaps/quarantineshuttle.dmm +++ b/maps/submaps/cave_submaps/quarantineshuttle.dmm @@ -26,7 +26,7 @@ "az" = (/obj/item/trash/syndi_cakes,/turf/simulated/shuttle/floor{tag = "icon-floor_yellow"; icon_state = "floor_yellow"},/area/submap/cave/qShuttle) "aA" = (/turf/simulated/shuttle/floor{tag = "icon-floor_yellow"; icon_state = "floor_yellow"},/area/submap/cave/qShuttle) "aB" = (/obj/item/weapon/cigbutt,/obj/item/weapon/tank/emergency/oxygen,/turf/simulated/shuttle/floor{tag = "icon-floor_yellow"; icon_state = "floor_yellow"},/area/submap/cave/qShuttle) -"aC" = (/obj/item/weapon/material/kitchen/utensil/knife/boot,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor{tag = "icon-floor_yellow"; icon_state = "floor_yellow"},/area/submap/cave/qShuttle) +"aC" = (/obj/item/weapon/material/knife/boot,/obj/item/clothing/mask/breath,/turf/simulated/shuttle/floor{tag = "icon-floor_yellow"; icon_state = "floor_yellow"},/area/submap/cave/qShuttle) "aD" = (/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor{tag = "icon-floor_white"; icon_state = "floor_white"},/area/submap/cave/qShuttle) "aE" = (/obj/item/trash/sosjerky,/obj/item/weapon/storage/box/donut/empty,/obj/item/weapon/reagent_containers/food/drinks/sillycup,/turf/simulated/shuttle/floor{tag = "icon-floor_white"; icon_state = "floor_white"},/area/submap/cave/qShuttle) "aF" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle) diff --git a/maps/submaps/surface_submaps/DJOutpost1.dmm b/maps/submaps/surface_submaps/DJOutpost1.dmm index 93570d4afa8..f60131e9744 100644 --- a/maps/submaps/surface_submaps/DJOutpost1.dmm +++ b/maps/submaps/surface_submaps/DJOutpost1.dmm @@ -7,7 +7,7 @@ "g" = (/obj/structure/loot_pile/maint/technical,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "h" = (/mob/living/simple_animal/hostile/giant_spider/frost{returns_home = 1},/turf/simulated/floor/wood,/area/submap/DJOutpost1) "i" = (/obj/structure/sign/goldenplaque{desc = "An award given to Sif Free Radio for media excellency. It looks fake."; name = "Best Radio Station 2558"; pixel_y = 30},/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"j" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/item/device/radio/headset/heads/captain/alt{desc = "A headset belonging to a Sif Free Radio DJ. SFR, best tunes in the wilderness."; name = "SFR headset"},/obj/item/weapon/material/hatchet/tacknife/combatknife,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"j" = (/obj/effect/decal/remains,/obj/effect/decal/cleanable/blood,/obj/item/clothing/under/frontier,/obj/item/device/radio/headset/heads/captain/alt{desc = "A headset belonging to a Sif Free Radio DJ. SFR, best tunes in the wilderness."; name = "SFR headset"},/obj/item/weapon/material/knife/tacknife/combatknife,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "k" = (/obj/machinery/door/airlock/glass,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "l" = (/obj/structure/table/steel_reinforced,/obj/item/device/radio/intercom{tag = "icon-intercom (WEST)"; icon_state = "intercom"; dir = 8},/turf/simulated/floor/wood,/area/submap/DJOutpost1) "m" = (/obj/machinery/computer/message_monitor,/obj/item/weapon/paper/monitorkey,/obj/structure/cable/yellow{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/wood,/area/submap/DJOutpost1) @@ -31,7 +31,7 @@ "E" = (/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/obj/machinery/seed_extractor,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "F" = (/obj/structure/bed/chair/wood{tag = "icon-wooden_chair (NORTH)"; icon_state = "wooden_chair"; dir = 1},/turf/simulated/floor/wood,/area/submap/DJOutpost1) "G" = (/obj/machinery/door/airlock/external,/turf/simulated/floor/wood,/area/submap/DJOutpost1) -"H" = (/obj/structure/table/woodentable,/obj/item/weapon/material/hatchet,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/material/minihoe,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/wood,/area/submap/DJOutpost1) +"H" = (/obj/structure/table/woodentable,/obj/item/weapon/material/knife/machete/hatchet,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/material/minihoe,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "I" = (/obj/structure/undies_wardrobe,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "J" = (/obj/structure/table/rack,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/turf/simulated/floor/wood,/area/submap/DJOutpost1) "K" = (/obj/machinery/light/flamp,/turf/simulated/floor/wood,/area/submap/DJOutpost1) diff --git a/maps/submaps/surface_submaps/farm1.dmm b/maps/submaps/surface_submaps/farm1.dmm index a89d481737f..ae9e8eb4e22 100644 --- a/maps/submaps/surface_submaps/farm1.dmm +++ b/maps/submaps/surface_submaps/farm1.dmm @@ -12,14 +12,14 @@ "l" = (/obj/structure/table/marble,/obj/item/weapon/material/kitchen/rollingpin,/turf/simulated/floor/wood,/area/submap/farm1) "m" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/item/seeds/cornseed,/turf/simulated/floor/outdoors/dirt,/area/submap/farm1) "n" = (/obj/item/weapon/material/minihoe,/turf/simulated/floor/outdoors/dirt,/area/submap/farm1) -"o" = (/obj/structure/table/marble,/obj/item/weapon/material/kitchen/utensil/knife,/turf/simulated/floor/wood,/area/submap/farm1) +"o" = (/obj/structure/table/marble,/obj/item/weapon/material/knife,/turf/simulated/floor/wood,/area/submap/farm1) "p" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/item/seeds/bluetomatoseed,/turf/simulated/floor/outdoors/dirt,/area/submap/farm1) "q" = (/turf/simulated/floor/outdoors/mud,/area/submap/farm1) "r" = (/obj/machinery/portable_atmospherics/hydroponics/soil,/obj/item/seeds/icepepperseed,/turf/simulated/floor/outdoors/dirt,/area/submap/farm1) "s" = (/obj/structure/simple_door/wood,/turf/simulated/floor/wood,/area/submap/farm1) "t" = (/mob/living/bot/farmbot,/turf/simulated/floor/outdoors/dirt,/area/submap/farm1) "u" = (/obj/structure/sink/puddle,/turf/simulated/floor/outdoors/mud,/area/submap/farm1) -"v" = (/obj/item/weapon/material/hatchet,/turf/simulated/floor/outdoors/mud,/area/submap/farm1) +"v" = (/obj/item/weapon/material/knife/machete/hatchet,/turf/simulated/floor/outdoors/mud,/area/submap/farm1) "w" = (/obj/structure/table/woodentable,/obj/item/weapon/storage/box/matches,/obj/item/weapon/flame/match,/turf/simulated/floor/wood,/area/submap/farm1) "x" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood,/area/submap/farm1) "y" = (/obj/item/clothing/shoes/boots/winter/hydro,/obj/item/clothing/suit/storage/hooded/wintercoat/hydro,/turf/simulated/floor/wood,/area/submap/farm1)