diff --git a/code/game/objects/items/weapons/storage/belt_vr.dm b/code/game/objects/items/weapons/storage/belt_vr.dm index 58285af552..d968f0d17e 100644 --- a/code/game/objects/items/weapons/storage/belt_vr.dm +++ b/code/game/objects/items/weapons/storage/belt_vr.dm @@ -153,3 +153,29 @@ /obj/item/weapon/anobattery, /obj/item/weapon/pickaxe ) +<<<<<<< HEAD +======= + +/obj/item/weapon/storage/belt/hydro + name = "hydroponics belt" + desc = "A belt used to hold most hydroponics supplies. Suprisingly, not green." + icon = 'icons/inventory/belt/item_vr.dmi' + icon_state = "plantbelt" + item_state = "plantbelt" + storage_slots = 5 + max_w_class = ITEMSIZE_LARGE + max_storage_space = ITEMSIZE_COST_NORMAL * 5 + can_hold = list( + /obj/item/device/analyzer/plant_analyzer, + /obj/item/weapon/reagent_containers/glass/beaker, + /obj/item/weapon/reagent_containers/glass/bottle, + /obj/item/weapon/shovel/spade, + /obj/item/weapon/tool/wirecutters, + /obj/item/weapon/material/minihoe, + /obj/item/weapon/material/knife/machete/hatchet, + /obj/item/weapon/reagent_containers/spray/plantbgone, + /obj/item/weapon/plantspray, + /obj/item/weapon/gun/energy/floragun, + /obj/item/seeds + ) +>>>>>>> 935b5c939c... Merge pull request #14931 from Youtubeboy139/hydro_changes 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 af7092d9d6..5eec312418 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -10,13 +10,15 @@ /obj/item/device/analyzer/plant_analyzer, /obj/item/device/radio/headset/headset_service, /obj/item/clothing/head/greenbandana, + /obj/item/weapon/shovel/spade, /obj/item/weapon/material/minihoe, /obj/item/weapon/material/knife/machete/hatchet, /obj/item/weapon/reagent_containers/glass/beaker = 2, /obj/item/weapon/tool/wirecutters/clippers/trimmers, /obj/item/weapon/reagent_containers/spray/plantbgone, /obj/item/clothing/suit/storage/hooded/wintercoat/hydro, - /obj/item/clothing/shoes/boots/winter/hydro) + /obj/item/clothing/shoes/boots/winter/hydro, + /obj/item/weapon/storage/belt/hydro) /obj/structure/closet/secure_closet/hydroponics/Initialize() if(prob(50)) diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index cf8fd8d581..6d6693aca5 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -3,6 +3,8 @@ /obj/item/weapon/tool/wirecutters/clippers name = "plant clippers" desc = "A tool used to take samples from plants." + icon = 'icons/obj/weapons.dmi' + icon_state = "clippers" /obj/item/weapon/tool/wirecutters/clippers/trimmers name = "hedgetrimmers" diff --git a/icons/inventory/belt/item_vr.dmi b/icons/inventory/belt/item_vr.dmi index b11bbec306..679a4779fe 100644 Binary files a/icons/inventory/belt/item_vr.dmi and b/icons/inventory/belt/item_vr.dmi differ diff --git a/icons/inventory/belt/mob_vr.dmi b/icons/inventory/belt/mob_vr.dmi index 3a774c960b..715a8855fb 100644 Binary files a/icons/inventory/belt/mob_vr.dmi and b/icons/inventory/belt/mob_vr.dmi differ diff --git a/icons/obj/hydroponics_machines_vr.dmi b/icons/obj/hydroponics_machines_vr.dmi index 4a097b9c00..95989281f2 100644 Binary files a/icons/obj/hydroponics_machines_vr.dmi and b/icons/obj/hydroponics_machines_vr.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 88fe643156..866c4136c8 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 783441c51c..21ba4dd9a8 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 7d8547c2b0..19a6712288 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -3681,13 +3681,9 @@ lol bye /area/groundbase/medical/triage) "kp" = ( /obj/structure/closet/secure_closet/hydroponics, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/storage/belt/utility, /obj/item/stack/material/sandstone{ amount = 5 }, -/obj/item/device/retail_scanner/civilian, -/obj/item/device/multitool, /obj/machinery/light{ dir = 1 }, @@ -4912,6 +4908,12 @@ lol bye /obj/machinery/door/firedoor, /turf/simulated/floor, /area/groundbase/cargo/office) +"ob" = ( +/obj/structure/table/standard, +/obj/item/device/retail_scanner/civilian, +/obj/item/device/multitool, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/hydroponics) "od" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -17695,6 +17697,9 @@ lol bye /area/groundbase/science/xenobot) "Yo" = ( /obj/structure/closet/secure_closet/hydroponics, +/obj/item/stack/material/sandstone{ + amount = 5 + }, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) "Yp" = ( @@ -26122,7 +26127,7 @@ Yt Yt Yt Yt -Yt +ob In bY bY diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index eeb1237b78..fd6a33cfea 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -8786,8 +8786,6 @@ /area/crew_quarters/captain) "rO" = ( /obj/structure/closet/secure_closet/hydroponics, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/storage/belt/utility, /obj/item/stack/material/sandstone{ amount = 5 }, @@ -15068,7 +15066,7 @@ input_tag = "cooling_in"; name = "Engine Cooling Control"; output_tag = "cooling_out"; - sensors = list("burn_chamber" = "Burn Chamber"); + sensors = list("burn_chamber"="Burn Chamber"); throwpass = 1 }, /turf/simulated/floor, @@ -15607,7 +15605,7 @@ frequency = 1443; level = 3; name = "Distribution and Waste Monitor"; - sensors = list("dist_main_meter" = "Surface - Distribution Loop", "scrub_main_meter" = "Surface - Scrubbers Loop", "mair_main_meter" = "Surface - Mixed Air Tank", "dist_aux_meter" = "Station - Distribution Loop", "scrub_aux_meter" = "Station - Scrubbers Loop", "mair_aux_meter" = "Station - Mixed Air Tank", "mair_mining_meter" = "Mining Outpost - Mixed Air Tank") + sensors = list("dist_main_meter"="Surface - Distribution Loop","scrub_main_meter"="Surface - Scrubbers Loop","mair_main_meter"="Surface - Mixed Air Tank","dist_aux_meter"="Station - Distribution Loop","scrub_aux_meter"="Station - Scrubbers Loop","mair_aux_meter"="Station - Mixed Air Tank","mair_mining_meter"="Mining Outpost - Mixed Air Tank") }, /obj/machinery/power/apc/angled{ dir = 1 @@ -19479,7 +19477,7 @@ name = "box of measuring cups"; pixel_x = 2; pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup=7) }, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 9abaebbe01..77adde36bc 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -18894,8 +18894,6 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 5 }, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/storage/belt/utility, /obj/item/stack/material/sandstone{ amount = 5 }, @@ -19186,8 +19184,6 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 4 }, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/storage/belt/utility, /obj/item/stack/material/sandstone{ amount = 5 }, @@ -29406,6 +29402,13 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 10 }, +<<<<<<< HEAD +======= +/obj/structure/closet/secure_closet/hydroponics, +/obj/item/stack/material/sandstone{ + amount = 5 + }, +>>>>>>> 935b5c939c... Merge pull request #14931 from Youtubeboy139/hydro_changes /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aXj" = ( @@ -30323,6 +30326,13 @@ /obj/effect/floor_decal/corner/lime/border{ dir = 6 }, +<<<<<<< HEAD +======= +/obj/structure/closet/secure_closet/hydroponics, +/obj/item/stack/material/sandstone{ + amount = 5 + }, +>>>>>>> 935b5c939c... Merge pull request #14931 from Youtubeboy139/hydro_changes /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aYO" = ( @@ -34637,8 +34647,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 +======= +/obj/structure/table/standard, +/obj/item/weapon/storage/box/beakers{ + name = "box of measuring cups"; + pixel_x = 2; + pixel_y = 3; + starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup=7) +>>>>>>> 935b5c939c... Merge pull request #14931 from Youtubeboy139/hydro_changes }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen)