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/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/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 514b6cb54ed..531fcbf1444 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -102,7 +102,7 @@ /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/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/knives.dm b/code/game/objects/items/weapons/material/knives.dm index cb7f1215044..1fee7b1b85d 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -87,12 +87,25 @@ /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/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." diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index dae15aee5da..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,18 +42,18 @@ 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) ..() 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 5bbf8535756..8957a5f7b54 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -990,7 +990,7 @@ /obj/item/weapon/wirecutters, /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/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/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index 49dd3893a20..150c84abcf4 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -98,9 +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,\ + hold.can_hold = list(/obj/item/weapon/material/knife/machete/hatchet/unathiknife,\ /obj/item/weapon/material/knife,\ /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 9df66ec11fd..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/knife)) + 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/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/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/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/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/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/submaps/surface_submaps/DJOutpost1.dmm b/maps/submaps/surface_submaps/DJOutpost1.dmm index 0813c7d9bb7..f60131e9744 100644 --- a/maps/submaps/surface_submaps/DJOutpost1.dmm +++ b/maps/submaps/surface_submaps/DJOutpost1.dmm @@ -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 abe6b246ea1..ae9e8eb4e22 100644 --- a/maps/submaps/surface_submaps/farm1.dmm +++ b/maps/submaps/surface_submaps/farm1.dmm @@ -19,7 +19,7 @@ "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)