From a5cb617465cc109e99033ffd4de399b3394e266c Mon Sep 17 00:00:00 2001 From: Cannibal Hunter <135169022+CannibalHunter@users.noreply.github.com> Date: Tue, 4 Jun 2024 19:44:12 -0500 Subject: [PATCH] adds three new sandstone structures for you to build! (egyptian themed) (#2101) * curse of rah be upon you * removes a single . how did that get there --- code/__DEFINES/icon_smoothing.dm | 1 + .../objects/items/stacks/sheets/mineral.dm | 6 +++++- .../objects/structures/beds_chairs/chair.dm | 18 ++++++++++++++++++ .../structures/crates_lockers/crates.dm | 14 ++++++++++++++ .../game/objects/structures/tables_racks.dm | 12 ++++++++++++ .../icons/obj/sandstone_structures.dmi | Bin 0 -> 893 bytes .../obj/smooth_structures/sandstone_table.dmi | Bin 0 -> 7182 bytes tgstation.dme | 3 +++ 8 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 monkestation/code/game/objects/structures/beds_chairs/chair.dm create mode 100644 monkestation/code/game/objects/structures/crates_lockers/crates.dm create mode 100644 monkestation/code/game/objects/structures/tables_racks.dm create mode 100644 monkestation/icons/obj/sandstone_structures.dmi create mode 100644 monkestation/icons/obj/smooth_structures/sandstone_table.dmi 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 0000000000000000000000000000000000000000..547624b7ba41ffc95ac29e07a611e5bab59fef4b GIT binary patch literal 893 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