Skip to content

Commit

Permalink
Primitive stuffs (#701)
Browse files Browse the repository at this point in the history
* Update sheet_types.dm

* Update stone.dm

* Add files via upload

* Add files via upload

* Update storage_structures.dm

* Add files via upload

* Update tgstation.dme

* Update tgstation.dme

* Update stone_griddle.dm

* Update storage_structures.dm

Co-authored-by: xXPawnStarrXx <[email protected]>
  • Loading branch information
Steals-The-PRs and xXPawnStarrXx authored Nov 19, 2023
1 parent 1a34d0f commit b81ef97
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,12 @@ GLOBAL_LIST_INIT(skyrat_wood_recipes, list(
new/datum/stack_recipe("large wooden mortar", /obj/structure/large_mortar, 10, time = 3 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_TOOLS),
new/datum/stack_recipe("wooden cutting board", /obj/item/cutting_board, 5, time = 2 SECONDS, check_density = FALSE, category = CAT_TOOLS),
new/datum/stack_recipe("wooden shelf", /obj/structure/rack/wooden, 2, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = FALSE, category = CAT_STRUCTURE),
new/datum/stack_recipe("seed shelf", /obj/machinery/smartfridge/seedshelf, 10, time = 2 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_STRUCTURE),
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("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),
))

/obj/item/stack/sheet/mineral/wood/get_main_recipes()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/obj/machinery/griddle/stone
name = "stone griddle"
desc = "You could probably cook an egg on this... the griddle slab looks very unsanitary."
icon = 'modular_skyrat/modules/primitive_cooking_additions/icons/stone_kitchen_machines.dmi'
icon_state = "griddle1_off"
density = TRUE
pass_flags_self = PASSMACHINE | PASSTABLE| LETPASSTHROW // It's roughly the height of a table.
layer = BELOW_OBJ_LAYER
use_power = FALSE
circuit = null
resistance_flags = FIRE_PROOF
processing_flags = START_PROCESSING_MANUALLY
variant = 1

/obj/machinery/griddle/Initialize(mapload)
. = ..()
grill_loop = new(src, FALSE)
if(isnum(variant))
variant = 1

/obj/machinery/griddle/stone/examine(mob/user)
. = ..()

. += span_notice("It can be taken apart with a <b>crowbar</b>.")

/obj/machinery/griddle/stone/crowbar_act(mob/living/user, obj/item/tool)
user.balloon_alert_to_viewers("disassembling...")
if(!tool.use_tool(src, user, 2 SECONDS, volume = 100))
return
new /obj/item/stack/sheet/mineral/stone(drop_location(), 5)
deconstruct(TRUE)
return TOOL_ACT_TOOLTYPE_SUCCESS
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
user.balloon_alert_to_viewers("disassembling...")
if(!tool.use_tool(src, user, 2 SECONDS, volume = 100))
return
new /obj/item/stack/sheet/mineral/clay(drop_location(), 5)
new /obj/item/stack/sheet/mineral/stone(drop_location(), 5)
deconstruct(TRUE)
return TOOL_ACT_TOOLTYPE_SUCCESS

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
user.balloon_alert_to_viewers("disassembling...")
if(!tool.use_tool(src, user, 2 SECONDS, volume = 100))
return
new /obj/item/stack/sheet/mineral/clay(drop_location(), 5)
new /obj/item/stack/sheet/mineral/stone(drop_location(), 5)
deconstruct(TRUE)
return TOOL_ACT_TOOLTYPE_SUCCESS

Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -50,3 +50,64 @@
/obj/structure/closet/crate/wooden/storage_barrel/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/mineral/wood(drop_location(), 4)
return ..()

/obj/machinery/smartfridge/producebin
name = "Produce Bin"
desc = "A wooden hamper, used to hold plant products and try keep them safe from pests."
icon_state = "producebin"
icon = 'modular_skyrat/modules/primitive_structures/icons/storage.dmi'
resistance_flags = FLAMMABLE
visible_contents = FALSE
base_build_path = /obj/machinery/smartfridge/producebin
use_power = NO_POWER_USE
light_power = 0
idle_power_usage = 0
circuit = null
has_emissive = FALSE
can_atmos_pass = ATMOS_PASS_YES
visible_contents = FALSE

/obj/machinery/smartfridge/producebin/accept_check(obj/item/weapon)
return (istype(weapon, /obj/item/food/grown))

/obj/machinery/smartfridge/producebin/structure_examine()
. = span_info("The whole rack can be [EXAMINE_HINT("pried")] apart.")


/obj/machinery/smartfridge/producebin/crowbar_act(mob/living/user, obj/item/tool)
user.balloon_alert_to_viewers("disassembling...")
if(!tool.use_tool(src, user, 2 SECONDS, volume = 100))
return
new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
deconstruct(TRUE)
return TOOL_ACT_TOOLTYPE_SUCCESS

/obj/machinery/smartfridge/seedshelf
name = "Seedshelf"
desc = "A wooden shelf, used to hold seeds preventing them from germinating early."
icon_state = "seedshelf"
icon = 'modular_skyrat/modules/primitive_structures/icons/storage.dmi'
resistance_flags = FLAMMABLE
visible_contents = FALSE
base_build_path = /obj/machinery/smartfridge/seedshelf
use_power = NO_POWER_USE
light_power = 0
idle_power_usage = 0
circuit = null
has_emissive = FALSE
can_atmos_pass = ATMOS_PASS_YES
visible_contents = FALSE

/obj/machinery/smartfridge/seedshelf/accept_check(obj/item/weapon)
return istype(weapon, /obj/item/seeds)

/obj/machinery/smartfridge/seedshelf/structure_examine()
. = span_info("The whole rack can be [EXAMINE_HINT("pried")] apart.")

/obj/machinery/smartfridge/seedshelf/crowbar_act(mob/living/user, obj/item/tool)
user.balloon_alert_to_viewers("disassembling...")
if(!tool.use_tool(src, user, 2 SECONDS, volume = 100))
return
new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
deconstruct(TRUE)
return TOOL_ACT_TOOLTYPE_SUCCESS
Binary file modified modular_skyrat/modules/primitive_structures/icons/storage.dmi
Binary file not shown.
3 changes: 3 additions & 0 deletions modular_skyrat/modules/stone/code/stone.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ GLOBAL_LIST_INIT(stone_recipes, list ( \
new/datum/stack_recipe("stone brick wall", /turf/closed/wall/mineral/stone, 5, one_per_turf = 1, on_solid_ground = 1, applies_mats = TRUE, category = CAT_STRUCTURE), \
new/datum/stack_recipe("stone brick tile", /obj/item/stack/tile/mineral/stone, 1, 4, 20, check_density = FALSE, category = CAT_TILES),
new/datum/stack_recipe("millstone", /obj/structure/millstone, 6, one_per_turf = 1, on_solid_ground = 1, category = CAT_STRUCTURE),
new/datum/stack_recipe("stone stove", /obj/machinery/primitive_stove, 5, one_per_turf = 1, on_solid_ground = 1, category = CAT_STRUCTURE),
new/datum/stack_recipe("stone oven", /obj/machinery/oven/stone, 5, one_per_turf = 1, on_solid_ground = 1, category = CAT_STRUCTURE),
new/datum/stack_recipe("stone griddle", /obj/machinery/griddle/stone, 5, one_per_turf = 1, on_solid_ground = 1, category = CAT_STRUCTURE),
))

/obj/item/stack/sheet/mineral/stone/get_main_recipes()
Expand Down
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -7724,6 +7724,7 @@
#include "modular_skyrat\modules\primitive_cooking_additions\code\cookware.dm"
#include "modular_skyrat\modules\primitive_cooking_additions\code\cutting_board.dm"
#include "modular_skyrat\modules\primitive_cooking_additions\code\millstone.dm"
#include "modular_skyrat\modules\primitive_cooking_additions\code\stone_griddle.dm"
#include "modular_skyrat\modules\primitive_cooking_additions\code\stone_oven.dm"
#include "modular_skyrat\modules\primitive_cooking_additions\code\stone_stove.dm"
#include "modular_skyrat\modules\primitive_production\code\ceramics.dm"
Expand Down

0 comments on commit b81ef97

Please sign in to comment.