From fac92f66cac2277b5fe44a8aa8105d8d1c776f95 Mon Sep 17 00:00:00 2001 From: SandPoot <43283559+SandPoot@users.noreply.github.com> Date: Mon, 23 May 2022 23:04:24 -0300 Subject: [PATCH 1/3] You can now make shuttle seats with titanium (#255) * Update mineral.dm * consistency --- code/game/objects/items/stacks/sheets/mineral.dm | 1 + code/game/objects/structures/beds_chairs/chair.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index eaf576510e..7c55f0c4f6 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -295,6 +295,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \ GLOBAL_LIST_INIT(titanium_recipes, list ( \ new/datum/stack_recipe("titanium tile", /obj/item/stack/tile/mineral/titanium, 1, 4, 20), \ new/datum/stack_recipe("titanic ingot", /obj/item/ingot/titanium, 6, time = 100), \ + new/datum/stack_recipe("shuttle seat", /obj/structure/chair/comfy/shuttle, 2, one_per_turf = TRUE, on_floor = TRUE), \ )) /obj/item/stack/sheet/mineral/titanium/get_main_recipes() diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 9d14757897..d5b1e7a244 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -252,6 +252,7 @@ name = "shuttle seat" desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights." icon_state = "shuttle_chair" + buildstacktype = /obj/item/stack/sheet/mineral/titanium /obj/structure/chair/comfy/shuttle/GetArmrest() return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest") From d4d24451bbb87bc59526cfa3cb8f7bd84b0c965a Mon Sep 17 00:00:00 2001 From: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com> Date: Tue, 24 May 2022 02:05:28 +0000 Subject: [PATCH 2/3] Automatic changelog generation for PR #255 [ci skip] --- html/changelogs/AutoChangeLog-pr-255.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-255.yml diff --git a/html/changelogs/AutoChangeLog-pr-255.yml b/html/changelogs/AutoChangeLog-pr-255.yml new file mode 100644 index 0000000000..599109dca9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-255.yml @@ -0,0 +1,4 @@ +author: SandPoot +delete-after: true +changes: + - rscadd: You can now make shuttle seats with titanium. From a29e23065e528debce43aca1d61b17520d2b1602 Mon Sep 17 00:00:00 2001 From: Sandstorm Bot <85452301+Sandstorm-Bot@users.noreply.github.com> Date: Tue, 24 May 2022 02:06:29 +0000 Subject: [PATCH 3/3] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-255.yml | 4 ---- html/changelogs/archive/2022-05.yml | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-255.yml diff --git a/html/changelogs/AutoChangeLog-pr-255.yml b/html/changelogs/AutoChangeLog-pr-255.yml deleted file mode 100644 index 599109dca9..0000000000 --- a/html/changelogs/AutoChangeLog-pr-255.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: SandPoot -delete-after: true -changes: - - rscadd: You can now make shuttle seats with titanium. diff --git a/html/changelogs/archive/2022-05.yml b/html/changelogs/archive/2022-05.yml index 41fe8e685f..70e4ec56b4 100644 --- a/html/changelogs/archive/2022-05.yml +++ b/html/changelogs/archive/2022-05.yml @@ -69,3 +69,6 @@ BongaTheProto: - bugfix: fixes the bug where reagents won't add through view variables if you enter their full path +2022-05-24: + SandPoot: + - rscadd: You can now make shuttle seats with titanium.