From f3e91beba677507481ef4602c33ad2a363e8f381 Mon Sep 17 00:00:00 2001 From: Cheridan Date: Mon, 11 May 2015 15:58:18 -0500 Subject: [PATCH] KEEP YOUR HOES IN LINE --- .../MetaStation/MetaStation.v41A.II.dmm | 16 ++++++++-------- _maps/map_files/MetaStation/z3.dmm | 2 +- _maps/map_files/MiniStation/MiniStation.dmm | 2 +- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 8 ++++---- code/datums/supplypacks.dm | 2 +- .../closets/secure/hydroponics.dm | 2 +- .../structures/crates_lockers/crates.dm | 10 +++++----- code/modules/clothing/suits/jobs.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 2 +- code/modules/hydroponics/hydroitemdefines.dm | 8 ++++---- code/modules/hydroponics/hydroponics.dm | 2 +- code/modules/surgery/xenomorph_removal.dm | 2 +- icons/mob/inhands/items_lefthand.dmi | Bin 97105 -> 97109 bytes icons/mob/inhands/items_righthand.dmi | Bin 95785 -> 95789 bytes icons/obj/weapons.dmi | Bin 32399 -> 32403 bytes 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm index 3f9a6d35579..1a0fdb0478d 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm @@ -49,7 +49,7 @@ "aaW" = (/turf/simulated/floor/plating,/obj/structure/shuttle/engine/propulsion/burst,/turf/simulated/shuttle/wall{tag = "icon-swall_f9"; icon_state = "swall_f9"; dir = 2},/area/space) "aaX" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/tracker,/turf/simulated/floor/plating/airless,/area/solar/auxstarboard) "aaY" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxport) -"aaZ" = (/obj/machinery/hydroponics/constructable,/obj/item/weapon/minihoe,/obj/item/seeds/carrotseed,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) +"aaZ" = (/obj/machinery/hydroponics/constructable,/obj/item/weapon/cultivator,/obj/item/seeds/carrotseed,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aba" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "abb" = (/turf/simulated/floor/plasteel,/area/security/prison) "abc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) @@ -1965,7 +1965,7 @@ "aLO" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock{name = "Dormitories"; req_access_txt = "0"},/turf/simulated/floor/plasteel{dir = 4; icon_state = "neutralcorner"},/area/crew_quarters/sleep) "aLP" = (/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/weapon/reagent_containers/spray/pestspray{pixel_x = 3; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez,/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh{pixel_x = 2; pixel_y = 1},/obj/structure/table,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aLQ" = (/obj/machinery/biogenerator,/obj/machinery/firealarm{pixel_y = 27},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) -"aLR" = (/obj/structure/table,/obj/item/weapon/minihoe,/obj/item/weapon/hatchet,/obj/item/weapon/crowbar,/obj/machinery/light{dir = 1},/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) +"aLR" = (/obj/structure/table,/obj/item/weapon/cultivator,/obj/item/weapon/hatchet,/obj/item/weapon/crowbar,/obj/machinery/light{dir = 1},/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aLS" = (/obj/machinery/seed_extractor,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aLT" = (/obj/item/seeds/appleseed,/obj/item/seeds/bananaseed,/obj/item/seeds/cocoapodseed,/obj/item/seeds/grapeseed,/obj/item/seeds/orangeseed,/obj/item/seeds/sugarcaneseed,/obj/item/seeds/wheatseed,/obj/item/seeds/watermelonseed,/obj/structure/table,/obj/item/seeds/towermycelium,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aLU" = (/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/fancy/grass,/area/hallway/secondary/construction{name = "\improper Garden"}) @@ -2390,8 +2390,8 @@ "aTX" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/crew_quarters/locker) "aTY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/crew_quarters/locker) "aTZ" = (/obj/structure/rack,/obj/item/weapon/storage/briefcase,/obj/item/weapon/storage/briefcase{pixel_x = 4; pixel_y = -2},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralcorner"},/area/crew_quarters/locker) -"aUa" = (/obj/structure/table,/obj/item/weapon/minihoe,/obj/item/weapon/hatchet,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/item/weapon/paper/hydroponics,/obj/item/weapon/coin/silver,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) -"aUb" = (/obj/structure/table,/obj/item/weapon/hatchet,/obj/item/weapon/minihoe,/obj/item/weapon/crowbar,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) +"aUa" = (/obj/structure/table,/obj/item/weapon/cultivator,/obj/item/weapon/hatchet,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/item/weapon/paper/hydroponics,/obj/item/weapon/coin/silver,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) +"aUb" = (/obj/structure/table,/obj/item/weapon/hatchet,/obj/item/weapon/cultivator,/obj/item/weapon/crowbar,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aUc" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/snacks/grown/wheat,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange,/obj/item/weapon/reagent_containers/food/snacks/grown/grapes,/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod,/obj/item/weapon/reagent_containers/food/snacks/grown/apple,/obj/item/weapon/reagent_containers/food/snacks/grown/chili,/obj/item/weapon/reagent_containers/food/snacks/grown/cherries,/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans,/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aUd" = (/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) "aUe" = (/obj/item/weapon/storage/bag/plants/portaseeder,/obj/structure/table,/obj/machinery/light,/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/hallway/secondary/construction{name = "\improper Garden"}) @@ -4101,7 +4101,7 @@ "bAS" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/medical/medbay{name = "Medbay Central"}) "bAT" = (/obj/structure/grille,/obj/structure/window/fulltile,/turf/simulated/floor/plating,/area/medical/research{name = "Research Division"}) "bAU" = (/obj/item/weapon/reagent_containers/food/snacks/grown/wheat,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange,/obj/item/weapon/reagent_containers/food/snacks/grown/grapes,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/structure/table/glass,/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hallway/primary/central) -"bAV" = (/obj/item/weapon/minihoe,/obj/item/weapon/crowbar,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/table/glass,/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hallway/primary/central) +"bAV" = (/obj/item/weapon/cultivator,/obj/item/weapon/crowbar,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/table/glass,/turf/simulated/floor/plasteel{icon_state = "hydrofloor"},/area/hallway/primary/central) "bAW" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/stool{pixel_y = 8},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bAX" = (/obj/structure/table/wood/poker,/obj/item/toy/cards/deck{pixel_y = 4},/turf/simulated/floor/wood,/area/crew_quarters/bar) "bAY" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor/wood,/area/crew_quarters/bar) @@ -5280,7 +5280,7 @@ "bXB" = (/obj/machinery/chem_master/condimaster{name = "BrewMaster 4000"; pixel_x = -4},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hydroponics) "bXC" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/window/reinforced{dir = 8},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = 29},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hydroponics) "bXD" = (/obj/structure/reagent_dispensers/watertank,/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/window/reinforced{dir = 4; pixel_x = 0},/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hydroponics) -"bXE" = (/obj/structure/closet/crate/hydroponics,/obj/item/weapon/shovel/spade,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/minihoe,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hydroponics) +"bXE" = (/obj/structure/closet/crate/hydroponics,/obj/item/weapon/shovel/spade,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/cultivator,/turf/simulated/floor/plasteel{icon_state = "warning"},/area/hydroponics) "bXF" = (/obj/structure/closet{name = "spare parts locker"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/item/weapon/rack_parts,/obj/item/weapon/rack_parts,/obj/item/weapon/wrench,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/kitchen) "bXG" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/window/eastright{dir = 1; name = "Kitchen Delivery"; req_access_txt = "28"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/crew_quarters/kitchen) "bXH" = (/obj/machinery/atmospherics/unary/cold_sink/freezer{dir = 8; tag = ""},/turf/simulated/floor/plasteel,/area/atmos) @@ -7577,7 +7577,7 @@ "cPK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/machinery/chem_heater{pixel_x = -4; pixel_y = 4},/turf/simulated/floor/plasteel{dir = 9; icon_state = "whitepurple"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cPL" = (/obj/machinery/biogenerator,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cPM" = (/obj/item/weapon/reagent_containers/food/snacks/grown/banana,/obj/item/weapon/reagent_containers/food/snacks/grown/banana,/obj/item/weapon/reagent_containers/food/snacks/grown/wheat,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon,/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange,/obj/item/weapon/reagent_containers/food/snacks/grown/grapes,/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod,/obj/structure/rack{layer = 2.8},/obj/item/seeds/wheatseed,/obj/item/seeds/watermelonseed,/obj/item/seeds/watermelonseed,/obj/item/seeds/grapeseed,/obj/item/seeds/glowshroom,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) -"cPN" = (/obj/item/weapon/storage/bag/plants/portaseeder,/obj/item/weapon/storage/bag/plants/portaseeder,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/minihoe,/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/rack{layer = 2.8},/obj/item/seeds/cornseed,/obj/item/seeds/cabbageseed,/obj/item/seeds/ambrosiavulgarisseed,/obj/item/seeds/grassseed,/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) +"cPN" = (/obj/item/weapon/storage/bag/plants/portaseeder,/obj/item/weapon/storage/bag/plants/portaseeder,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/glass/bucket,/obj/structure/rack{layer = 2.8},/obj/item/seeds/cornseed,/obj/item/seeds/cabbageseed,/obj/item/seeds/ambrosiavulgarisseed,/obj/item/seeds/grassseed,/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cPO" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/carrotseed,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cPP" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/glowshroom,/obj/item/seeds/cornseed,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) "cPQ" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/device/analyzer/plant_analyzer,/turf/simulated/floor/plating{icon_state = "warnplate"},/area/maintenance/aft{name = "Aft Maintenance"}) @@ -7682,7 +7682,7 @@ "cRL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cRM" = (/obj/machinery/hologram/holopad,/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology{name = "\improper Secure Lab"}) "cRN" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/glowshroom,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) -"cRO" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/weapon/minihoe,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) +"cRO" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/weapon/cultivator,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "cRP" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/ambrosiavulgarisseed,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "cRQ" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/watermelonseed,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) "cRR" = (/obj/machinery/hydroponics/soil{pixel_y = 8},/obj/item/seeds/berryseed,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/maintenance/aft{name = "Aft Maintenance"}) diff --git a/_maps/map_files/MetaStation/z3.dmm b/_maps/map_files/MetaStation/z3.dmm index 0ed21f65a37..6f44dd624dd 100644 --- a/_maps/map_files/MetaStation/z3.dmm +++ b/_maps/map_files/MetaStation/z3.dmm @@ -384,7 +384,7 @@ "ht" = (/obj/machinery/sleeper{dir = 4; use_power = 0},/obj/effect/decal/cleanable/dirt{desc = "A thin layer of dust coating the floor."; name = "dust"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) "hu" = (/obj/structure/closet/crate/freezer,/obj/item/weapon/reagent_containers/blood/empty{pixel_x = -3; pixel_y = -3},/obj/item/weapon/reagent_containers/blood/OMinus,/obj/item/weapon/reagent_containers/blood/random,/obj/effect/decal/cleanable/dirt{desc = "A thin layer of dust coating the floor."; name = "dust"},/obj/effect/decal/cleanable/xenoblood,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) "hv" = (/obj/structure/optable,/obj/item/weapon/surgical_drapes,/obj/item/weapon/storage/firstaid/regular,/obj/effect/decal/cleanable/dirt{desc = "A thin layer of dust coating the floor."; name = "dust"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) -"hw" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/item/clothing/suit/apron,/obj/item/weapon/shovel/spade,/obj/item/weapon/screwdriver,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/minihoe,/obj/item/weapon/reagent_containers/glass/bucket,/obj/effect/decal/cleanable/dirt{desc = "A thin layer of dust coating the floor."; name = "dust"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) +"hw" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/weapon/crowbar,/obj/item/clothing/suit/apron,/obj/item/weapon/shovel/spade,/obj/item/weapon/screwdriver,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/glass/bucket,/obj/effect/decal/cleanable/dirt{desc = "A thin layer of dust coating the floor."; name = "dust"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) "hx" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/effect/decal/cleanable/dirt{desc = "A thin layer of dust coating the floor."; name = "dust"},/turf/simulated/shuttle/floor,/area/space) "hy" = (/obj/machinery/smartfridge{use_power = 0},/turf/simulated/shuttle/wall{tag = "icon-swall3"; icon_state = "swall3"; dir = 2},/area/space) "hz" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/effect/decal/cleanable/dirt{desc = "A thin layer of dust coating the floor."; name = "dust"},/turf/simulated/shuttle/floor,/area/space) diff --git a/_maps/map_files/MiniStation/MiniStation.dmm b/_maps/map_files/MiniStation/MiniStation.dmm index e7b4f4c8121..2e79fed7dde 100644 --- a/_maps/map_files/MiniStation/MiniStation.dmm +++ b/_maps/map_files/MiniStation/MiniStation.dmm @@ -1065,7 +1065,7 @@ "uy" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor/fancy/carpet,/area/crew_quarters/bar) "uz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/bar) "uA" = (/obj/machinery/requests_console{department = "Bar"; departmentType = 2; pixel_x = 30; pixel_y = 0},/mob/living/carbon/monkey{name = "Pun Pun"},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 5},/area/crew_quarters/bar) -"uB" = (/obj/machinery/hydroponics/soil,/obj/item/weapon/minihoe,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 1},/area/hallway/primary/central) +"uB" = (/obj/machinery/hydroponics/soil,/obj/item/weapon/cultivator,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 1},/area/hallway/primary/central) "uC" = (/obj/machinery/hydroponics/soil,/obj/item/weapon/hatchet,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 1},/area/hallway/primary/central) "uD" = (/obj/machinery/hydroponics/soil,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 1},/area/hallway/primary/central) "uE" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index ecafd2380a7..e56688538f7 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -28,8 +28,8 @@ "aaB" = (/obj/structure/window/reinforced,/obj/machinery/hydroponics/soil,/obj/item/seeds/potatoseed,/turf/simulated/floor/plasteel{dir = 10; icon_state = "green"},/area/security/prison) "aaC" = (/obj/structure/window/reinforced,/obj/machinery/hydroponics/soil,/obj/item/seeds/grassseed,/turf/simulated/floor/plasteel{dir = 2; icon_state = "green"},/area/security/prison) "aaD" = (/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/prison) -"aaE" = (/obj/structure/window/reinforced,/obj/machinery/hydroponics/soil,/obj/item/weapon/minihoe,/turf/simulated/floor/plasteel{dir = 2; icon_state = "green"},/area/security/prison) -"aaF" = (/obj/structure/window/reinforced,/obj/machinery/hydroponics/soil,/obj/item/weapon/minihoe,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 6},/area/security/prison) +"aaE" = (/obj/structure/window/reinforced,/obj/machinery/hydroponics/soil,/obj/item/weapon/cultivator,/turf/simulated/floor/plasteel{dir = 2; icon_state = "green"},/area/security/prison) +"aaF" = (/obj/structure/window/reinforced,/obj/machinery/hydroponics/soil,/obj/item/weapon/cultivator,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 6},/area/security/prison) "aaG" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison) "aaH" = (/turf/simulated/wall,/area/security/transfer) "aaI" = (/turf/simulated/floor/plating/airless,/area/space) @@ -1581,7 +1581,7 @@ "aEu" = (/obj/item/weapon/paper,/obj/structure/table/reinforced,/obj/machinery/door/window/brigdoor{dir = 2; name = "Arrivals Security Checkpoint"; pixel_y = -8; req_access_txt = "1"},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/checkpoint2) "aEv" = (/obj/machinery/recharger{pixel_y = 4},/obj/structure/table/reinforced,/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/checkpoint2) "aEw" = (/obj/item/device/radio/off,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/checkpoint2) -"aEx" = (/obj/structure/table/glass,/obj/item/weapon/minihoe,/obj/item/weapon/hatchet,/obj/item/weapon/crowbar,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hallway/secondary/construction{name = "\improper Garden"}) +"aEx" = (/obj/structure/table/glass,/obj/item/weapon/cultivator,/obj/item/weapon/hatchet,/obj/item/weapon/crowbar,/obj/item/device/analyzer/plant_analyzer,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hallway/secondary/construction{name = "\improper Garden"}) "aEy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "\improper Garden"}) "aEz" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "\improper Garden"}) "aEA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/hallway/secondary/construction{name = "\improper Garden"}) @@ -1739,7 +1739,7 @@ "aHw" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) "aHx" = (/obj/structure/sign/map/left{pixel_y = 32},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) "aHy" = (/obj/structure/sign/map/right{pixel_y = 32},/turf/simulated/floor/plasteel,/area/hallway/secondary/entry) -"aHz" = (/obj/structure/table/glass,/obj/item/weapon/hatchet,/obj/item/weapon/minihoe,/obj/item/weapon/crowbar,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/device/analyzer/plant_analyzer,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hallway/secondary/construction{name = "\improper Garden"}) +"aHz" = (/obj/structure/table/glass,/obj/item/weapon/hatchet,/obj/item/weapon/cultivator,/obj/item/weapon/crowbar,/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/device/analyzer/plant_analyzer,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 4},/area/hallway/secondary/construction{name = "\improper Garden"}) "aHA" = (/obj/item/weapon/storage/bag/plants/portaseeder,/obj/structure/table/glass,/obj/item/device/analyzer/plant_analyzer,/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/obj/machinery/light_switch{pixel_x = -6; pixel_y = -25},/turf/simulated/floor/plasteel{icon_state = "green"; dir = 8},/area/hallway/secondary/construction{name = "\improper Garden"}) "aHB" = (/obj/structure/table,/obj/item/weapon/wrench,/obj/item/device/analyzer,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/storage/primary) "aHC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0},/turf/simulated/floor/plasteel,/area/storage/primary) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 69dfe876213..21bf92f6b4d 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -842,7 +842,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/weapon/reagent_containers/glass/bottle/ammonia, /obj/item/weapon/reagent_containers/glass/bottle/ammonia, /obj/item/weapon/hatchet, - /obj/item/weapon/minihoe, + /obj/item/weapon/cultivator, /obj/item/device/analyzer/plant_analyzer, /obj/item/clothing/gloves/botanic_leather, /obj/item/clothing/suit/apron) // Updated with new things 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 8dccb1c86e2..0a137e0497e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -16,7 +16,7 @@ new /obj/item/device/analyzer/plant_analyzer(src) new /obj/item/device/radio/headset/headset_srv(src) new /obj/item/clothing/mask/bandana(src) - new /obj/item/weapon/minihoe(src) + new /obj/item/weapon/cultivator(src) new /obj/item/weapon/hatchet(src) new /obj/item/weapon/storage/backpack/botany(src) new /obj/item/weapon/storage/backpack/botany(src) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 040ce4dcf7e..abbf7e51461 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -11,11 +11,11 @@ var/sound_effect_open = 'sound/machines/click.ogg' var/sound_effect_close = 'sound/machines/click.ogg' var/obj/item/weapon/paper/manifest/manifest - + /obj/structure/closet/crate/New() ..() update_icon() - + /obj/structure/closet/crate/update_icon() overlays.Cut() @@ -111,7 +111,7 @@ ..() new /obj/item/weapon/reagent_containers/spray/plantbgone(src) new /obj/item/weapon/reagent_containers/spray/plantbgone(src) - new /obj/item/weapon/minihoe(src) + new /obj/item/weapon/cultivator(src) /obj/structure/closet/crate/secure desc = "A secure crate." @@ -148,7 +148,7 @@ name = "secure hydroponics crate" icon_crate = "hydrosecurecrate" icon_state = "hydrosecurecrate" - + /obj/structure/closet/crate/secure/update_icon() ..() if(locked) @@ -202,7 +202,7 @@ user.put_in_hands(manifest) manifest = null overlays-="manifest" - + /obj/structure/closet/crate/attack_hand(mob/user as mob) if(manifest) tear_manifest(user) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 512d464f7cb..dbb82e319f8 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -10,7 +10,7 @@ item_state = "apron" blood_overlay_type = "armor" body_parts_covered = CHEST|GROIN - allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/minihoe,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants) + allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants) //Captain /obj/item/clothing/suit/captunic diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 6a2aaec47fd..91098d07f84 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -305,7 +305,7 @@ /obj/item/clothing/suit/hooded/wintercoat/hydro name = "hydroponics winter coat" icon_state = "coathydro" - allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/minihoe,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants) + allowed = list(/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/analyzer/plant_analyzer,/obj/item/seeds,/obj/item/weapon/reagent_containers/glass/bottle,/obj/item/weapon/cultivator,/obj/item/weapon/reagent_containers/spray/pestspray,/obj/item/weapon/hatchet,/obj/item/weapon/storage/bag/plants) /obj/item/clothing/suit/hooded/wintercoat/cargo name = "cargo winter coat" diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 9d31d3f7b00..97fa93b3980 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -58,12 +58,12 @@ viewers(user) << "[user] is huffing the [src.name]! It looks like \he's trying to commit suicide." return (TOXLOSS) -/obj/item/weapon/minihoe // -- Numbers - name = "mini hoe" +/obj/item/weapon/cultivator + name = "cultivator" desc = "It's used for removing weeds or scratching your back." icon = 'icons/obj/weapons.dmi' - icon_state = "hoe" - item_state = "hoe" + icon_state = "cultivator" + item_state = "cultivator" flags = CONDUCT force = 5.0 throwforce = 7.0 diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index b349464845a..fa9772f3517 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -692,7 +692,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p user << "-Nutrition level: [nutrilevel] / [maxnutri]" user << "" - else if(istype(O, /obj/item/weapon/minihoe)) + else if(istype(O, /obj/item/weapon/cultivator)) if(weedlevel > 0) user.visible_message("[user] uproots the weeds.", "You remove the weeds from [src].") weedlevel = 0 diff --git a/code/modules/surgery/xenomorph_removal.dm b/code/modules/surgery/xenomorph_removal.dm index 15f83e82622..9650e824122 100644 --- a/code/modules/surgery/xenomorph_removal.dm +++ b/code/modules/surgery/xenomorph_removal.dm @@ -9,7 +9,7 @@ //remove xeno from premises /datum/surgery_step/xenomorph_removal - implements = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/shovel/spade = 65, /obj/item/weapon/minihoe = 50, /obj/item/weapon/crowbar = 35) + implements = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/shovel/spade = 65, /obj/item/weapon/cultivator = 50, /obj/item/weapon/crowbar = 35) time = 64 /datum/surgery_step/xenomorph_removal/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 0131ba2583d708d22e997d9dc9131e823dd9a5d4..99a8f944cbf932ad0be1ff63d0e2ad3784403c6a 100644 GIT binary patch delta 1856 zcmV-G2fz5y_661U1&}0vTzXVkbVOxyV{&P5bZKvH004NLrCZBxTR9S4+g~AcZ>=D9 zC$sZrkW3?sZVcuJE{bGb-m*v*hYvmc^|O$a$U!6?V;~rYj6?FWSdVjx*T1j+`Ss6l zf3Lp$_3eJkrHZE2^Xk)wkN0;wacx;Wul{(tzgt-R(vDwhqsFU$=hbh&-QPJWb@jaZ zbbmJ&id?V^PFK?L37*uq_ zX#%mmF|@RuS~ugZSSoHUZiv%D$uokq9KskBBpamyOs5j2!XVIu4(z$N#-$E%u4vA{ zp>SZ^ibBUSOW}!s_f3-TQWs$MSxRjL82$`gtE3h=HGD+Vy`*<6@PuPc=|DVl%;PBo z)upM9y=x9s7emQo$RK_h8!Hg-jDceIg?VgDFY|cKg_5&83iaBQGsOp=m!kepkM@@0}k3(v16|()=`Y(Vq>}l zmn9=|5hOf+h8l9xN5Y@Pj`yMtC>D(Xj%SK$9M84W;(%iL8S?P>aGBsaIHV46a9rM*V7&%60V%Ue*m6OTrU=gvHMf-9 zxCLSt$zxx&I?oKWNMys)qGcRRrjVqupsbccW`OxZ3Xp^}1WA6%fao>7c%&|A7}IU1 zskd>7cba+wBsO`kfXLS}7G;|xGr-uh0@<;$T|;j9D*5_^|M(F{j}PBJKMj*+11*2C z#E`OcOl<+NH5WP{3flJ2WJ?G^t@&#Dzsv#xL{HI3X{w8G7-wWY;>OkY1RSRV+gqSo z$1|RQ?<`6=P;FxOW4{lbbCGntQE<0tt6AIXdG+}5;py>m85?w$pyp5(yP-YeH6XB~ zz>ESt3Uu&h7Tp4s?S<@Sp%{T`6sUjk-cSfY`YF6M6atdj3vZ`|$)WgqNHBJm!jQH- z0mrd()+P0joM435E(B157qT0p3N+0)dBLu0u)N+1)y2?QXPVxCPKE8E-Jr@BS>sLV zHB5Ff1hgSfJ>m6M5$3DFb&z3K7X~Wzd1(_M^V>q%r~*t$3s9^!k~}D%s}+AvO@sO| zMVGeFfBTqdMh*>Vl_j=ClSZ*XfZ9NZs0B!8Y38JB$pd+!(LC#H7pRTmWo}5kR&}(a2Bh`|wH=P4c|v$qTckARGzHxNggTSuDQZuR zBuzU>V>feU@?s2P+Om;4j_rS%$@01bgqfqJb&!Zq+g-ic2EHUXPY;iu-ZUx}=C-!T zeKuMTPq;P5+{R9vdI&|wt1r~-g6N!XH^}WplqCQ9IwlU?7%r~c4bX-tx-$eQ?jsJm z6S%l)!rGLV1Hd-yn>C8=0D5#W0&C!2j<5$HxGx8Q_2~3=1Pb3!qcnf6NR|qsg$>mW zx9i;E^DnvrmyHwW86qZ?07Kj$gHOMBj<=tSr|J|c87^aP`yJ{Fb9(O;&UtX*Yszvs z)P(--o1^pCW1PHm^s%8#lFU_KyR`L(&kr9ze13R*cs%|-{rvQ|U)kii#5L9M|E#eU z4S;H>_RtnU-<${rC5e9o-8;n>4Iv5OUT5T3J1qyGxmM^EXvSouF4fF*yjcef^c_3i zhtW9Z9Z@R6yb9N*b~E(^Tx(m3Txc>K;C{ygUzmabuPp5dpj=eqbVJ!)ApaE8G)dzX z!tD!JO;8W+KmY#v1r}*h60-HhT2$crjcpL%CAEJa)E}Aj2zCnCDoFBZ zkFjy!BHG4raz>7$B(f8vQ|x#a1G&HBSxhG90s|3!i5@>~(%09(*wM~`0IzOZfNn|C zVwW}2$_i8%0op##({4e0&ueg;CJTrj*XJ2&()W1|ysn4jgd;$rPXkVh9iE@ZYV`zV zAO)NsA|M3&1b%O#UCb+|7L;im)QF?B52tA^=;Pl78?->TqSU_Kqd6@ z3K(do$#KET|4y1+Od!V-@5g5HT^b+}k8eT7(?1JLhQoO3w_}Fzo+UZ(y@3ntl`Qwi uPqO0T5cl9BXCS)5@2jtWe_4I`>)ZYR09#9e!@3=q7yyHY2e*a?0n2lAsEINF delta 1884 zcmV-i2c!7a_65=Q1&}0vSb9`gbVOxyV{&P5bZKvH004NLrCUvJ8#xj^+rL7XxmrQ& zN%rQ;BH2L>Gg#~&XcWn6cDYFwmmikoU%v-Qi5x`cGZunj$aqCIi>#{mitXPw|NQ#r zx4$=E{`z+N%%zH^&Ew|NhmW^6J8^B3e{L+qJYNN(~o5#&>zun$ADRuL> z`E+|T7m8drkDL1+fW|QgYCHr|ni{2bjH{KS35PMT>0Xl2*1~vpLw3z%$I~0;G6of0 zIZYt8H-@IRQ|o5D6idZz#SL*@xDp&UFrgiK1->M0LPz!Tb0xzr-oZJ-Aj7M1P?gYln%r*$2=Y~ zP+gkp_;k&I>S8E)3>m~PV`l{do-t6&zA%rS>17_zxlnSp&+{0_O#eBeV{si(z-CWcVQzp8vFE! zE#Sc769r^tha$=I^btnh!^qG0nD3Y#A9a;+>^1?8N>dF+_Ye;_V-FmH?uPJPp*&&H zxhtIPg4C3g9|8t{Z0jrdcyDRX<1uN^S4Micy>T4quzB1(++9#}mq^kR+ooebSWT^J zK)9f$_Doqjz-*aTU=M6yN&qhExLBKRSDP>W}lmn9=|5hOf+h8nWdN5Y@Pj@P0NC>D(X zj%SK$9FMir;(%O3>hB9WD+MawvtOd&~Q zL0K(@%mDL36(9*|2$KAi0nuxE@km|LFs9p1Q*YxE?=Teln9~11*2B#E`OcOl<+NH5WP{3VKmwu&a6hGW-Py zo1&4@R2ShePQ`r0jmz!{IL-mKw?MUyM?3-FS&ed_+Qjb12R?MpMbh;S!OfzrW^J3t z&Hcx_hx^NEY|veTxA%F`!kzI`{&@JQS1-qxg z5_&6C7eix#X?g=%6t;)<21mZg8n0@uVX})Mp#OMk25+Agp}Y#*0~vO8VW32xr#1m{ zzb%xFDnOC6099(0QcR)CM|4EkHVB z+l#aVc0WnEkzmCkvJ*=I!gA!|IoYvKzauA39>^1o=2>UEK>ZUhb3@{_s-qn>AhkEB z-*8mR6GEukBBe2>Dd-9?=}eZVs6923H0>mfkC`iz7h@3DmR0IFwreKK+YWy)WsaJ* zK_bFwclFKw?C6ZF>&a|aBwlW&JZBAk2vTu;Np%6>rY-9fc@83a}?bH^ytC@>)c*i*aHyU zmj+-xI=vQw!dGgP#udp@K}3JBp}KOr&MiLwq8)JAF>#(DVp0ik#2aMr;TO;G`g8GA zokAtUWz22ALw#XR@4dS@8yCK&EQh8h^mktwoo$bC@=ohxCz&Lft7q-f*B?ILef;qG z?*8un`1|zp)8BsOlj9WERKx!>$FpbvR716gwgCF(L@+2xBVSj3W5??-8ppgNN=2Ag;o8)$Q%}Hswx!60Ces1#ciixW zDG2bc(vASiMI}yeD7y>fpJJLOX}m$Wec`H!klW$^{QK({SfoWs$kLA+^+ah*(~nSU zQGt6mwn2cm(|%BYWYB*j*eT$vAjzXW#>Rn*XdB1L899!U$WD+JvEx|`bo?F9Vlp`w z7>MXg^!RC$zPtp+wssB#oa&|p=$14scG)7WtU!ekpzZTK?H1(hc@2)!WC79R`aC1u z`99BqxAl;ma0E#7$>5~e;qiH_R!>j{Qo#8k0z$A);CC$U=na49wF6FE{9yw5Zx-lc ziM`(IzTN&0;h=u9 WcOM46001BWNkoH>2e*$00mgG&XsROs diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 1073f29431ae96b7f2293ba5a2ce548897d4f2fe..f2ea4cd515dcb70984f68699f5181377e7a5d269 100644 GIT binary patch delta 1962 zcmV;b2UYl~>;961hsw!fk=^Xd*_ zPqJ@*StL8i!weSt0|iQAspwLPT3!0$uiuC6PTIj#>v$GM5I8ubB#M_qs`BgRpI?9f z_UGoyAK&hGoQr7OJa0aI_;`P}7gwjv^X9jw`@4z7PxbUmsZ@D?^St>bYMmtdU+(Xm z_I| zQ_Bem4)%VFaSrx=dm{1>6pWxtz(MEAw(m9BI$D;0ez7r4f=iN+b`c~zhAMK?C&C}a z_RpdYC>E6fj%Tv!($}@u?0{^(*X-7BY%NWcy=J$Xg>OpTaM7D`x1wN8&;)WTBA?!f zJUl*JCwLAHsRJAw=XWMpufYvK$}AFgoDrnS!Xre@Ek)NKf!Ik>-&d`UBLgE6nR%Er z_k+oQWRlo#D2t_#7+}5vBq0q!q8}2_^qQ7EQkOLJ>9*6@YQMxgjjaMLHhHf=ldrko zl+95_fUze9vSVSph1~L0(z?Qb{D`B+hwnc>2_u;m=-RFLL=YD+Vt|Tl1C=6nz^cij zt#Hi*Ocx}TDnO5Y0V>o`28z{qjs1f~hB`Zc$5bZ}TT-SY(m~r6s_Y0Ms3onY|LZIu zK=fo?C=O*34*iVGCtSb!o`L;TU|S7TN?+p{_|Bq~0+lNE(D(b$IAw|JgMzzBYe`x+ z&zr}O4^NNR%h;g%2n~ml*qIK1*G#$tia|m3H58aophtlY1-_7-Ct4Pu8U?C+FcboR zkbW}n426JX_RPCsVsa?H93zY!B{S69o`LKX0jV zdGKP)-`YW?JWE+k9o^k;+bTuBB^!9rxDB$by2~x;$oq10JbiQ96LZ~KRh>?S%AS&CbZH$|6zz^|eoEnlYSRvvdC_SI<@0sPkF?9Ob@QBkLZZ zSXUC*5cpcc9)VhREdbWE^A{F>Fg)wt5HMsp;h<-rnJUG8rL>fh9^Fuxxvq1b&wnwk zxE|;@&k$iM1X$|^Nqzc@eZ2j-+Et@a$Z+m+?(a~and5t(mM+4X*E-&=s0r=eFIpGb zQ|!G{`ZVY!iDuP*uWkL|^TWpvpC29{9#4Ot|NQiCe`S-?5^LSe|Fgz_PBZ}BOtHs0 z0e#n*_)wIEp!cxlMMH=JxYq^Q@9Cx^F!amx3Ji%7QkP0%I=%P<2KtWepTp>~%3-dG zSV0(J=2F$pLyN$3yQPIQ4W@jb7>aUAS=Yjjof#u0fuXyX`oTaM8QF96ejI}4mA39x?dKi;3A z45Wa|CIUj*&)|0)?qm(ted^x-eyg2vCECF_(#f;z|jJg z(90`epuI-N87u#Lsdh4f91ncxo5?q+Kp%7ZI&(SyCx*dr=&OD!(}lMr(ShGHTwzzT w+;2a%6<3#d02jF!0MQkG-F*G?%jU};-|qhhxvi{HE9MR(gQ*9%sRsdoZt04|tpET3 delta 1958 zcmV;X2U+;7>;+h5U`xw?bc zlkClxMKXgNX0X^FC{PkhMVBOMB$d0{U%!X$cG^Lz^*jqB2pl|85+#z4WaZb*zrX(R z?XS(3Kfm2RbE%?f^SJr+;p6SiPF$NdkDK2fZf_ZYo6eJs^0;p37LtzkT!UCLmX^l(m z;#|?3flJ}QwiShcu4Ri9;qU^yJ&8F`YL;sM3ZJ+^9uSw%1iD7}9qaz!0h1qpVME`VXJFqznItt!{k1b8 zkt74B$O6RI9H>U>!V1}W$W&TC7#4D(eH1?}&tMj%`pN zg^k>(Z_^{TfQrQ@3dqS0MUv;?BaFOk56tZQe1pB;LL8O7 z-{z%cz&Y6aEyg+6`|Xj)Lr~Cz&JG8itJwalDb`VcjQwO|76~p(M#@Ey@EB^yO&ogH40yqy7EM?%3bqNqmcB9WPg zNlV{ChbSUtN>^xD7KpG0vcyA~KAnp`@ zel`>W64DDl4-=C^@%4~k>?nnyqV@#r`_8!_sfXkQW5RYKfD1g4osBBcE#u?`o6}$c zy%nmHp?-mBmIkya>=N1)j(ia{-sD`vWG6#F|MAoe-aacrc@>xg8FqDIAVr^-HUTof zEtHKaK#{ZnS!$N#!MeFx;nXy!?{jm1X%qdu^ciO4(10FUVp}w66bm@04RnZFfY{7- zDbfzue3Eh_!IDE{Czb+)<;cZzvVEJrA_q<$h!c&*QAayL{Sz-^L;SU>qa8IMw6|;h zhRY=UaCiUdO|D-`4m@1pSl6W6B&9K@A?Uoyx34LvnJf=cm()nou#>dBPHwwJ&{j+Y@u!T4cbE=IIk|%Q3gU zbEPGOqW#q;YIZ^juf@*DI3-Gw-@o<=&0-7}x7fLVl#4kP*5kYs0DHJ^)+o9IDAt7p z*8RPdum>QQT?&9X?eu8{3@^HWGX!*3jyP!kGgG6~&y0^hRB$?Isdui(rpYJ|?_bR6{q271Nz&tWvKa+r%GRuM*6 zxHh%(uq0s4ZYgr1!7KnLJzn_46p)WLceKvvUO`miaHZnBK>i`7X_Cepq~<7GH4!qk z{_lUjeu0a}C?Xe2=LY1_mTurdIUQKY!xJVwD;LKa1m{N zKRF}&UJ}^}(z^hE#u1qsEaMn>TMx+zM}X;_1WuiQ1Xw@!r}if(10mqN ziGYyy6Zjp6J6Z$!9D)-Ue;7din*|zpvG-eqb+h-|>#XT5HeRWUzlSUdoGg$Dy}SSh z+G%oJu=Kx^W+xNK@xc4OnfxLRsAGsZoD75CIA2c diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 9b5be0100e8b7c91f171028715a53629fe2f744e..bd9e5cc7e605bea74dcd5cd6f7c5636bb68c6725 100644 GIT binary patch delta 746 zcmVv zAPB)K(jWu&K29jp$l2Yl1{2S_og!qV&k-1~e(dHBw1W~Uu6cr%x(g|X{Bq)d63Sbt z6(O2i$%mFWlkHjrs(ATw#>Sm4AXHgn!NJH9w6=^!Cpzu_lX_!SOYt-l8ivMFT&=~n zMRF~{5U=}AYff*i!HXK>jm(L`*NjpqJMp10-Wkx<3N>R6I0EBg{s0dK;v3N@E3Bbu z7*>iJR6HM=KUQm_LPb3~Zdc2HEI&X0Dg<`PQ0Nt*WF4lxB}t%6Y5M?pe3U+HvgN}j z%d`COef(VfcdhjtmI%e|J8O__z!ZnPUXQ_#|53;3oLOG^#Yn5YkL!hSMbwjO8#SNQBjfY8pHeUH>Y`mR# z)JV#DK9X^&<4%>GQSp$SkUv_GQe!+6XNIVOD$JLR(cyygw3$uW%wJ_SXBFlZVdO8{ zWAIv+FE6I_>2pmF8>lMAHF2G-FX+d}F&%V7Gn42`yAalDY5VwfG-zM`9SvcdmeYd9 z;CU(iMVgZcr-it=@H3i|_5v6*$@a=r&I4nTGf34?FvqV}i4V@W*()#VQiH?-_p|UJ c?0x$3{+vF)y(WJF7yfWc0r&_{vqA$+d!M0eRsaA1 delta 746 zcmVP_`#7t5&NX+P@G@>>=^iv7@omkbl32kzXKx zE`5AhC5ui;U!}WrvrZNjs{(p{P*i#*b|7p}c`r5~8_**R<5=nPwK?ZD6gj4}5D1@YdwU3es%ygk+tkR@*>XgN1ICjL4wzjBZ6>l~ zVN%vdg=_Q>_e5LjzE&o_v(4B5Z|eYK1TyG-C^<(kiQp?Hwz6@IXuSsK;+{VO1Ktmo zj|Leq;&DQmhRp8w6_|L!?G+&_Z;rr#^<)3GpdA!Qam^F7&}~RLQ@I0EBg{s0dK;v3N@ORS)-8CHr4 zR6HN*KUQm_LPb3~XV{oRWwy+Q z@8jpf&A53+@ILOG^#W0hlcL!dh6bwjO8$qk!Fjl&2VulzHAHr`G=Y9wVn zAIUh?aj%NjsCdXu$R7^tq;oHIyaeez;j~F6hU|F&%V7Gn42`I~Ue!X}kD6G-zM;9SvdYhSP$^;CU(i zMVgZcr-it=@H3hVUy`?z{sI&<$acz<&I4nTGe~8hGsmw+i4V@W*(oooLW9H{53}$g c?0x$3{+vF)y(WJFpF