Skip to content

Commit

Permalink
Implementing skeletal versions of grindstone and bellows.
Browse files Browse the repository at this point in the history
  • Loading branch information
MistakeNot4892 committed Jan 1, 2025
1 parent 496142b commit d1ccca6
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 11 deletions.
13 changes: 13 additions & 0 deletions code/modules/crafting/forging/bellows.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/obj/structure/working/bellows
name = "bellows"
desc = "An air pump used to improve the heat of a furnace."
icon = 'icons/obj/structures/forging/bellows.dmi'
var/decl/material/bellows_material = /decl/material/solid/organic/leather

/obj/structure/working/bellows/Initialize()
bellows_material = GET_DECL(bellows_material)
. = ..()

/obj/structure/working/bellows/on_update_icon()
. = ..()
underlays = list(overlay_image(icon, "[icon_state]-bellows", bellows_material.color, RESET_COLOR))
16 changes: 16 additions & 0 deletions code/modules/crafting/forging/grindstone.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/obj/structure/working/grindstone
name = "grindstone"
desc = "A rotating section of coarse stone used to polish and sharpen metalwork like blades."
icon = 'icons/obj/structures/forging/grindstone.dmi'
var/decl/material/stone_material = /decl/material/solid/stone/granite

/obj/structure/working/grindstone/Initialize()
stone_material = GET_DECL(stone_material)
. = ..()

/obj/structure/working/grindstone/on_update_icon()
. = ..()
underlays = list(
overlay_image(icon, "[icon_state]-grindstone", stone_material.color, RESET_COLOR),
overlay_image(icon, "[initial(icon_state)]-backdrop")
)
23 changes: 12 additions & 11 deletions code/modules/materials/material_stack_nail.dm
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
/obj/item/stack/material/nail
name = "nails"
singular_name = "nail"
plural_name = "nails"
icon_state = "nail"
plural_icon_state = "nail-mult"
max_icon_state = "nail-max"
stack_merge_type = /obj/item/stack/material/nail
name = "nails"
singular_name = "nail"
plural_name = "nails"
icon_state = "nail"
plural_icon_state = "nail-mult"
max_icon_state = "nail-max"
stack_merge_type = /obj/item/stack/material/nail
crafting_stack_type = /obj/item/stack/material/nail
icon = 'icons/obj/items/stacks/nails.dmi'
is_spawnable_type = TRUE
matter_multiplier = 0.05 // 20 per standard sheet
icon = 'icons/obj/items/stacks/nails.dmi'
is_spawnable_type = TRUE
matter_multiplier = 0.05 // 20 per standard sheet
material = /decl/material/solid/metal/iron

/obj/item/stack/material/nail/twelve
amount = 12
amount = 12
Binary file modified icons/obj/structures/forging/bellows.dmi
Binary file not shown.
Binary file modified icons/obj/structures/forging/grindstone.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions nebula.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2216,13 +2216,15 @@
#include "code\modules\codex\entries\weapons.dm"
#include "code\modules\crafting\handmade_fancy.dm"
#include "code\modules\crafting\handmade_items.dm"
#include "code\modules\crafting\forging\bellows.dm"
#include "code\modules\crafting\forging\forge_anvil.dm"
#include "code\modules\crafting\forging\forge_bars.dm"
#include "code\modules\crafting\forging\forge_billet.dm"
#include "code\modules\crafting\forging\forge_fire.dm"
#include "code\modules\crafting\forging\forge_tools.dm"
#include "code\modules\crafting\forging\forging_action.dm"
#include "code\modules\crafting\forging\forging_step.dm"
#include "code\modules\crafting\forging\grindstone.dm"
#include "code\modules\crafting\metalwork\metalwork_items.dm"
#include "code\modules\crafting\pottery\pottery_moulds.dm"
#include "code\modules\crafting\pottery\pottery_structures.dm"
Expand Down

0 comments on commit d1ccca6

Please sign in to comment.