Skip to content

Commit

Permalink
crafting gutlunch trough and mining bag feeding (#25192) (#788)
Browse files Browse the repository at this point in the history
* crafting gutlunch trough and mining bag feeding

* Update modular_skyrat/modules/ashwalkers/code/buildings/gutluncher_foodtrough.dm



* fix

---------

Co-authored-by: jjpark-kb <[email protected]>
Co-authored-by: Bloop <[email protected]>
  • Loading branch information
3 people authored Nov 23, 2023
1 parent 8542ffb commit 23f7141
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ GLOBAL_LIST_INIT(skyrat_wood_recipes, list(
new/datum/stack_recipe("produce bin", /obj/machinery/smartfridge/producebin, 10, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_STRUCTURE),
new/datum/stack_recipe("storage barrel", /obj/structure/closet/crate/wooden/storage_barrel, 4, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = FALSE, category = CAT_STRUCTURE),
new/datum/stack_recipe("worm barrel", /obj/structure/wormfarm, 5, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_TOOLS),
new/datum/stack_recipe("gutlunch trough", /obj/structure/ore_container/gutlunch_trough, 5, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_STRUCTURE),
new/datum/stack_recipe("sturdy wooden fence", /obj/structure/railing/wooden_fencing, 5, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_TOOLS),
new/datum/stack_recipe("sturdy wooden fence gate", /obj/structure/railing/wooden_fencing/gate, 5, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_TOOLS),
))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/obj/structure/ore_container/gutlunch_trough/attackby(obj/item/attacking_item, mob/living/carbon/human/user, list/modifiers)
if(!istype(attacking_item, /obj/item/storage/bag/ore))
return ..()

for(var/obj/item/stack/ore/stored_ore in attacking_item.contents)
attacking_item.atom_storage?.attempt_remove(stored_ore, src)
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6490,6 +6490,7 @@
#include "modular_skyrat\modules\ashwalkers\code\buildings\ash_farming.dm"
#include "modular_skyrat\modules\ashwalkers\code\buildings\ash_tendril.dm"
#include "modular_skyrat\modules\ashwalkers\code\buildings\fuelwell.dm"
#include "modular_skyrat\modules\ashwalkers\code\buildings\gutluncher_foodtrough.dm"
#include "modular_skyrat\modules\ashwalkers\code\buildings\railroad.dm"
#include "modular_skyrat\modules\ashwalkers\code\buildings\tendril_cursing.dm"
#include "modular_skyrat\modules\ashwalkers\code\buildings\wormfarm.dm"
Expand Down

0 comments on commit 23f7141

Please sign in to comment.