diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 57035a2fe17b..97a5c1188f03 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -157,6 +157,7 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_BRONZE_TABLES S_OBJ(54) ///obj/structure/table/bronze #define SMOOTH_GROUP_ABDUCTOR_TABLES S_OBJ(55) ///obj/structure/table/abductor #define SMOOTH_GROUP_GLASS_TABLES S_OBJ(56) ///obj/structure/table/glass +#define SMOOTH_GROUP_SANDSTONE_TABLES S_OBJ(57) ///obj/structure/table/sandstone //MONKESTATION EDIT #define SMOOTH_GROUP_ALIEN_NEST S_OBJ(60) ///obj/structure/bed/nest #define SMOOTH_GROUP_ALIEN_RESIN S_OBJ(61) ///obj/structure/alien/resin diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index f0a773f690d8..e994da442d5a 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -26,7 +26,11 @@ Mineral Sheets GLOBAL_LIST_INIT(sandstone_recipes, list ( \ new/datum/stack_recipe("pile of dirt", /obj/machinery/growing/soil, 3, time = 1 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, category = CAT_TOOLS), \ new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_DOORS), \ - new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = FALSE, on_solid_ground = TRUE, category = CAT_MISC) \ + new/datum/stack_recipe("Breakdown into sand", /obj/item/stack/ore/glass, 1, one_per_turf = FALSE, on_solid_ground = TRUE, category = CAT_MISC), \ + + new/datum/stack_recipe("sandstone stool", /obj/structure/chair/stool/sandstone, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE), \ + new/datum/stack_recipe("sandstone sarcophagus", /obj/structure/closet/crate/coffin/sandstonesarcophagus, 8, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE), \ + new/datum/stack_recipe("sandstone table", /obj/structure/table/sandstone, 6, time = 5 SECONDS, one_per_turf = TRUE, on_solid_ground = TRUE, applies_mats = TRUE, category = CAT_FURNITURE) \ )) /obj/item/stack/sheet/mineral/sandstone diff --git a/monkestation/code/game/objects/structures/beds_chairs/chair.dm b/monkestation/code/game/objects/structures/beds_chairs/chair.dm new file mode 100644 index 000000000000..83cc49eb7282 --- /dev/null +++ b/monkestation/code/game/objects/structures/beds_chairs/chair.dm @@ -0,0 +1,18 @@ +//sandstone chair start +/obj/structure/chair/stool/sandstone + name = "sandstone stool" + desc = "Apply dummy thick cheeks." + icon = 'monkestation/icons/obj/sandstone_structures.dmi' + icon_state = "stool" + resistance_flags = FIRE_PROOF + can_buckle = FALSE + buildstackamount = 1 + item_chair = /obj/item/chair/stool/sandstone + +/obj/item/chair/stool/sandstone + name = "sandstone stool" + icon = 'monkestation/icons/obj/sandstone_structures.dmi' + icon_state = "stool_toppled" + inhand_icon_state = null + origin_type = /obj/structure/chair/stool/sandstone +//sandstone chair end diff --git a/monkestation/code/game/objects/structures/crates_lockers/crates.dm b/monkestation/code/game/objects/structures/crates_lockers/crates.dm new file mode 100644 index 000000000000..ba065295e805 --- /dev/null +++ b/monkestation/code/game/objects/structures/crates_lockers/crates.dm @@ -0,0 +1,14 @@ +/obj/structure/closet/crate/coffin/sandstonesarcophagus + name = "sandstone sarcophagus" + desc = "It's a burial receptacle for the dearly departed. A sARcophaGUS, it usually contains a caDaVER." + icon = 'monkestation/icons/obj/sandstone_structures.dmi' + icon_state = "sarcophagus" + resistance_flags = FIRE_PROOF + max_integrity = 70 + material_drop = /obj/item/stack/sheet/mineral/sandstone + material_drop_amount = 8 + open_sound = 'sound/machines/wooden_closet_open.ogg' + close_sound = 'sound/machines/wooden_closet_close.ogg' + open_sound_volume = 25 + close_sound_volume = 50 + can_install_electronics = FALSE diff --git a/monkestation/code/game/objects/structures/tables_racks.dm b/monkestation/code/game/objects/structures/tables_racks.dm new file mode 100644 index 000000000000..20ac1c115258 --- /dev/null +++ b/monkestation/code/game/objects/structures/tables_racks.dm @@ -0,0 +1,12 @@ +/obj/structure/table/sandstone + name = "sandstone table" + desc = "Woah! A sandstone TABLE!!" + icon = 'monkestation/icons/obj/smooth_structures/sandstone_table.dmi' + icon_state = "brass_table-0" //brass table is my best friend + base_icon_state = "brass_table" //brass table is my best friend + resistance_flags = FIRE_PROOF + buildstack = /obj/item/stack/sheet/mineral/sandstone + buildstackamount = 6 + framestackamount = 0 + smoothing_groups = SMOOTH_GROUP_SANDSTONE_TABLES + canSmoothWith = SMOOTH_GROUP_SANDSTONE_TABLES diff --git a/monkestation/icons/obj/sandstone_structures.dmi b/monkestation/icons/obj/sandstone_structures.dmi new file mode 100644 index 000000000000..547624b7ba41 Binary files /dev/null and b/monkestation/icons/obj/sandstone_structures.dmi differ diff --git a/monkestation/icons/obj/smooth_structures/sandstone_table.dmi b/monkestation/icons/obj/smooth_structures/sandstone_table.dmi new file mode 100644 index 000000000000..9c354967472e Binary files /dev/null and b/monkestation/icons/obj/smooth_structures/sandstone_table.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 18d5da15f857..7245363a3038 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5823,6 +5823,9 @@ #include "monkestation\code\game\objects\items\storage\boxes.dm" #include "monkestation\code\game\objects\items\storage\crate.dm" #include "monkestation\code\game\objects\items\storage\uplink_kits.dm" +#include "monkestation\code\game\objects\structures\tables_racks.dm" +#include "monkestation\code\game\objects\structures\beds_chairs\chair.dm" +#include "monkestation\code\game\objects\structures\crates_lockers\crates.dm" #include "monkestation\code\game\turfs\open\water.dm" #include "monkestation\code\game\turfs\open\floor\misc_floor.dm" #include "monkestation\code\modules\_paperwork\paper_premade.dm"