Skip to content

Commit

Permalink
adds three new sandstone structures for you to build! (egyptian theme…
Browse files Browse the repository at this point in the history
…d) (#2101)

* curse of rah be upon you

* removes a single .

how did that get there
  • Loading branch information
CannibalHunter authored Jun 5, 2024
1 parent 7e43514 commit a5cb617
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 1 deletion.
1 change: 1 addition & 0 deletions code/__DEFINES/icon_smoothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion code/game/objects/items/stacks/sheets/mineral.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions monkestation/code/game/objects/structures/beds_chairs/chair.dm
Original file line number Diff line number Diff line change
@@ -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
14 changes: 14 additions & 0 deletions monkestation/code/game/objects/structures/crates_lockers/crates.dm
Original file line number Diff line number Diff line change
@@ -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
12 changes: 12 additions & 0 deletions monkestation/code/game/objects/structures/tables_racks.dm
Original file line number Diff line number Diff line change
@@ -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
Binary file added monkestation/icons/obj/sandstone_structures.dmi
Binary file not shown.
Binary file not shown.
3 changes: 3 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit a5cb617

Please sign in to comment.