Resets some tg icon files that had drifted astray (#24893)
* Fixing merge skew * Icon reset * Fixes nonmodular skyrat edits * Update prim_fun.dmi * Update mineral.dm * These were updated within the lifetime of this pr
@@ -119,7 +119,7 @@
|
||||
/obj/item/stack/sheet/sinew = GLOB.sinew_recipes,
|
||||
/obj/item/stack/sheet/animalhide/carp = GLOB.carp_recipes,
|
||||
/obj/item/stack/sheet/mineral/sandstone = GLOB.sandstone_recipes,
|
||||
/obj/item/stack/sheet/mineral/clay = GLOB.clay_recipes,
|
||||
/obj/item/stack/sheet/mineral/clay = GLOB.clay_recipes, // SKYRAT EDIT ADDITION
|
||||
/obj/item/stack/sheet/mineral/sandbags = GLOB.sandbag_recipes,
|
||||
/obj/item/stack/sheet/mineral/diamond = GLOB.diamond_recipes,
|
||||
/obj/item/stack/sheet/mineral/uranium = GLOB.uranium_recipes,
|
||||
|
||||
@@ -49,29 +49,6 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \
|
||||
/obj/item/stack/sheet/mineral/sandstone/thirty
|
||||
amount = 30
|
||||
|
||||
/*
|
||||
* Clay Bricks
|
||||
*/
|
||||
|
||||
GLOBAL_LIST_INIT(clay_recipes, list ( \
|
||||
new/datum/stack_recipe("clay stove", /obj/machinery/primitive_stove, 10, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_MISC), \
|
||||
new/datum/stack_recipe("clay oven", /obj/machinery/oven/stone, 10, time = 5 SECONDS, one_per_turf = FALSE, on_solid_ground = TRUE, category = CAT_MISC) \
|
||||
))
|
||||
|
||||
/obj/item/stack/sheet/mineral/clay
|
||||
name = "clay brick"
|
||||
desc = "A heavy clay brick."
|
||||
singular_name = "clay brick"
|
||||
icon_state = "sheet-clay"
|
||||
inhand_icon_state = null
|
||||
throw_speed = 3
|
||||
throw_range = 5
|
||||
merge_type = /obj/item/stack/sheet/mineral/clay
|
||||
|
||||
/obj/item/stack/sheet/mineral/clay/get_main_recipes()
|
||||
. = ..()
|
||||
. += GLOB.clay_recipes
|
||||
|
||||
/*
|
||||
* Sandbags
|
||||
*/
|
||||
|
||||
|
Before Width: | Height: | Size: 49 KiB After Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 199 KiB After Width: | Height: | Size: 205 KiB |
|
Before Width: | Height: | Size: 80 KiB After Width: | Height: | Size: 80 KiB |
|
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 56 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 29 KiB |
@@ -1,7 +1,7 @@
|
||||
// Add modular crafting recipes here, NOT IN BASE /tg/ CRAFTING LISTS
|
||||
|
||||
/**
|
||||
* Add a list of receipes to an existing recipe sublist.
|
||||
* Add a list of recipes to an existing recipe sublist.
|
||||
*
|
||||
* Arguments:
|
||||
* * stack_recipes - the existing list of stack recipes.
|
||||
|
||||
@@ -1,5 +1,29 @@
|
||||
#define DEFAULT_SPIN (4 SECONDS)
|
||||
|
||||
/*
|
||||
* Clay Bricks
|
||||
*/
|
||||
|
||||
/obj/item/stack/sheet/mineral/clay
|
||||
name = "clay brick"
|
||||
desc = "A heavy clay brick."
|
||||
singular_name = "clay brick"
|
||||
icon = 'modular_skyrat/modules/primitive_production/icons/prim_fun.dmi'
|
||||
icon_state = "sheet-clay"
|
||||
inhand_icon_state = null
|
||||
throw_speed = 3
|
||||
throw_range = 5
|
||||
merge_type = /obj/item/stack/sheet/mineral/clay
|
||||
|
||||
GLOBAL_LIST_INIT(clay_recipes, list ( \
|
||||
new/datum/stack_recipe("clay range", /obj/machinery/primitive_stove, 10, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_MISC), \
|
||||
new/datum/stack_recipe("clay oven", /obj/machinery/oven/stone, 10, time = 5 SECONDS, one_per_turf = FALSE, on_solid_ground = TRUE, category = CAT_MISC) \
|
||||
))
|
||||
|
||||
/obj/item/stack/sheet/mineral/clay/get_main_recipes()
|
||||
. = ..()
|
||||
. += GLOB.clay_recipes
|
||||
|
||||
/obj/structure/water_source/puddle/attackby(obj/item/O, mob/user, params)
|
||||
if(istype(O, /obj/item/stack/ore/glass))
|
||||
var/obj/item/stack/ore/glass/glass_item = O
|
||||
@@ -131,7 +155,7 @@
|
||||
name = "ceramic brick"
|
||||
desc = "A dense block of clay, ready to be fired into a brick!"
|
||||
icon = 'modular_skyrat/modules/primitive_production/icons/prim_fun.dmi'
|
||||
icon_state = "clay_brick"
|
||||
icon_state = "sheet-clay"
|
||||
forge_item = /obj/item/stack/sheet/mineral/clay
|
||||
|
||||
/obj/structure/throwing_wheel
|
||||
|
||||
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 4.1 KiB |