From 49e74b604f2dae9ad3de297dcf63ecabd44f81da Mon Sep 17 00:00:00 2001 From: Geeves Date: Wed, 10 Feb 2021 16:36:44 +0200 Subject: [PATCH 1/9] Chem Dispenser Table Tweak (#11136) --- code/modules/reagents/dispenser/dispenser_presets.dm | 4 ++++ html/changelogs/geeves-chem_dispenser_table.yml | 6 ++++++ 2 files changed, 10 insertions(+) create mode 100644 html/changelogs/geeves-chem_dispenser_table.yml diff --git a/code/modules/reagents/dispenser/dispenser_presets.dm b/code/modules/reagents/dispenser/dispenser_presets.dm index 34066f04bcb..008380da7e1 100644 --- a/code/modules/reagents/dispenser/dispenser_presets.dm +++ b/code/modules/reagents/dispenser/dispenser_presets.dm @@ -72,6 +72,7 @@ ui_title = "Soda Dispenser" accept_drinking = 1 density = 0//It's a half-height machine that sits on a table, this allows small things to walk under that table + pass_flags = PASSTABLE // put it back on the table /obj/machinery/chemical_dispenser/bar_soft/full spawn_cartridges = list( @@ -108,6 +109,7 @@ ui_title = "Booze Dispenser" accept_drinking = 1 density = 0//It's a half-height machine that sits on a table, this allows small things to walk under that table + pass_flags = PASSTABLE // put it back on the table /obj/machinery/chemical_dispenser/bar_alc/full spawn_cartridges = list( @@ -140,6 +142,7 @@ ui_title = "Coffee Master 3000" accept_drinking = 1 density = 0 + pass_flags = PASSTABLE // put it back on the table /obj/machinery/chemical_dispenser/coffeemaster/full spawn_cartridges = list( @@ -164,6 +167,7 @@ ui_title = "Morning Glory Coffee Mate" icon_state_active = null accept_drinking = 1 + pass_flags = PASSTABLE // put it back on the table /obj/machinery/chemical_dispenser/coffee/full spawn_cartridges = list( diff --git a/html/changelogs/geeves-chem_dispenser_table.yml b/html/changelogs/geeves-chem_dispenser_table.yml new file mode 100644 index 00000000000..a053f68b5c1 --- /dev/null +++ b/html/changelogs/geeves-chem_dispenser_table.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - tweak: "You can now put drink dispensers back onto table by dragging them onto it." \ No newline at end of file From d2865c4963ebd7dcec8135b5383d93ba9f4604d8 Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Wed, 10 Feb 2021 14:37:53 +0000 Subject: [PATCH 2/9] "[ci skip] Automatic Build - 2021.02.10.14.37.53" --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/geeves-chem_dispenser_table.yml | 6 ------ 3 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 html/changelogs/geeves-chem_dispenser_table.yml diff --git a/html/changelog.html b/html/changelog.html index 87dfb8eda9f..c2b039afc4b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,12 @@ -->
+

10 February 2021

+

Geeves updated:

+
    +
  • You can now put drink dispensers back onto table by dragging them onto it.
  • +
+

09 February 2021

Geeves updated:

09 February 2021

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 22ab85923f6..a7e338d97e2 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -18230,3 +18230,9 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: Cutting up bedsheets now gives cloth instead of going directly to rags. - rscadd: Mapped in four engineering maglocks in the engineering sub-level storage. - rscadd: Mapped in a chem heater for the kitchen. + - tweak: Ported Bay blob to replace our own. Notably, this changes how it spreads + and also its description. + - tweak: Blobs can no longer penetrate walls reinforced with tough materials. + - rscadd: Attacking blobs with wirecutters will now produce samples, which can be + used for offense or for research. + - rscdel: Attacking blobs no longer suck the weapons out of your hand. Happy killing. diff --git a/html/changelogs/geeves-blob_tweaks.yml b/html/changelogs/geeves-blob_tweaks.yml deleted file mode 100644 index a4cd6087ec6..00000000000 --- a/html/changelogs/geeves-blob_tweaks.yml +++ /dev/null @@ -1,9 +0,0 @@ -author: Geeves - -delete-after: True - -changes: - - tweak: "Ported Bay blob to replace our own. Notably, this changes how it spreads and also its description." - - tweak: "Blobs can no longer penetrate walls reinforced with tough materials." - - rscadd: "Attacking blobs with wirecutters will now produce samples, which can be used for offense or for research." - - rscdel: "Attacking blobs no longer suck the weapons out of your hand. Happy killing." \ No newline at end of file