Skip to content

Commit

Permalink
Fix wooden seed and ration shelves (#2452)
Browse files Browse the repository at this point in the history
* fix some funny pathing

* these probably shouldn't be welded
  • Loading branch information
FlufflesTheDog authored and StealsThePRs committed May 13, 2024
1 parent 70799df commit 5e1f922
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,7 @@
/area/ruin/unpowered/ash_walkers)
"ul" = (
/obj/structure/stone_tile/surrounding_tile,
/obj/machinery/smartfridge/wooden/ration_shelf/wooden,
/obj/machinery/smartfridge/wooden/ration_shelf,
/turf/open/floor/bamboo/lavaland,
/area/ruin/unpowered/ash_walkers)
"um" = (
Expand Down Expand Up @@ -2924,7 +2924,7 @@
/turf/open/lava/smooth/lava_land_surface,
/area/lavaland/surface/outdoors)
"XU" = (
/obj/machinery/smartfridge/wooden/seed_shelf/wooden,
/obj/machinery/smartfridge/wooden/seed_shelf,
/turf/open/misc/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers)
"Yb" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@

/obj/machinery/smartfridge/wooden/Initialize(mapload)
. = ..()
welded_down = FALSE
if(type == /obj/machinery/smartfridge/wooden) // don't even let these prototypes exist
return INITIALIZE_HINT_QDEL

Expand Down Expand Up @@ -113,7 +114,7 @@
base_build_path = /obj/machinery/smartfridge/wooden/seed_shelf
base_icon_state = "seed"

/obj/machinery/smartfridge/wooden/seed_shelf/wooden/accept_check(obj/item/item_to_check)
/obj/machinery/smartfridge/wooden/seed_shelf/accept_check(obj/item/item_to_check)
return istype(item_to_check, /obj/item/seeds)

/obj/machinery/smartfridge/wooden/ration_shelf
Expand All @@ -123,7 +124,7 @@
base_build_path = /obj/machinery/smartfridge/wooden/ration_shelf
base_icon_state = "ration"

/obj/machinery/smartfridge/wooden/ration_shelf/wooden/accept_check(obj/item/item_to_check)
/obj/machinery/smartfridge/wooden/ration_shelf/accept_check(obj/item/item_to_check)
return (IS_EDIBLE(item_to_check) || (istype(item_to_check,/obj/item/reagent_containers/cup/bowl) && length(item_to_check.reagents?.reagent_list)))

/obj/machinery/smartfridge/wooden/produce_display
Expand Down

0 comments on commit 5e1f922

Please sign in to comment.