From e9c151ee16f96ed023d6e8b50faa2762023c9a83 Mon Sep 17 00:00:00 2001 From: Gaxeer <44334376+Gaxeer@users.noreply.github.com> Date: Fri, 31 Jan 2025 22:27:54 +0200 Subject: [PATCH 1/3] fix compilation error (#1112) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Исправляет ошибку компиляции ## Summary by Sourcery Bug Fixes: - Fix compilation error in rock_color macro. --- modular_bandastation/aesthetics/walls/code/rocks.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_bandastation/aesthetics/walls/code/rocks.dm b/modular_bandastation/aesthetics/walls/code/rocks.dm index e88121bc75875..64164cd330644 100644 --- a/modular_bandastation/aesthetics/walls/code/rocks.dm +++ b/modular_bandastation/aesthetics/walls/code/rocks.dm @@ -3,8 +3,8 @@ #define DEFAULT_ROCKS 'modular_bandastation/aesthetics/walls/icons/rocks/default_rocks.dmi' #define MAPPING_ROCKS 'modular_bandastation/aesthetics/walls/icons/rocks/mapping_rocks.dmi' -#define rock_color(color) MAP_SWITCH(color,"") -#define rock_icon_state(state) MAP_SWITCH("smoothrocks-0",state) +#define rock_color(color) MAP_SWITCH(color, null) +#define rock_icon_state(state) MAP_SWITCH("smoothrocks-0", state) #define ROCK_COLOR "#464646" #define ROCK_COLOR_RED "#861313" #define ROCK_COLOR_ICE "#cde2e4" From 71b8091b21ea111d7b7dc56ef9c666308ae8642e Mon Sep 17 00:00:00 2001 From: Aylong <69762909+AyIong@users.noreply.github.com> Date: Fri, 31 Jan 2025 23:36:09 +0200 Subject: [PATCH 2/3] Remove some absurd fishing spotes (#1113) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Что этот PR делает Вырезаем рыбалку в: 1. Рифтах еретика 2. Трупах 3. Гидропониках ## Почему это хорошо для игры Если это не сделать сейчас, Гахер вырежет гораздо больше ## Тестирование Нет ## Changelog :cl: del: Вырезаны максимально абсурдные места для рыбалки: Рифты еретика, трупы и гидропоники /:cl: --- code/modules/antagonists/heretic/influences.dm | 2 +- code/modules/hydroponics/hydroponics.dm | 2 +- code/modules/surgery/organ_manipulation.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/heretic/influences.dm b/code/modules/antagonists/heretic/influences.dm index f5552a1dd9d68..0553c6c4ed67a 100644 --- a/code/modules/antagonists/heretic/influences.dm +++ b/code/modules/antagonists/heretic/influences.dm @@ -85,7 +85,7 @@ /obj/effect/visible_heretic_influence/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(show_presence)), 15 SECONDS) - AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[/datum/fish_source/dimensional_rift]) + // AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[/datum/fish_source/dimensional_rift]) // BANDASTATION REMOVAL var/image/silicon_image = image('icons/effects/eldritch.dmi', src, null, OBJ_LAYER) silicon_image.override = TRUE diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 4fb07c686bb98..13afec2628f82 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -170,7 +170,7 @@ AddComponent(/datum/component/simple_rotation) AddComponent(/datum/component/plumbing/hydroponics) AddComponent(/datum/component/usb_port, list(/obj/item/circuit_component/hydroponics)) - AddComponent(/datum/component/fishing_spot, /datum/fish_source/hydro_tray) + // AddComponent(/datum/component/fishing_spot, /datum/fish_source/hydro_tray) // BANDASTATION REMOVAL /obj/machinery/hydroponics/constructable/RefreshParts() . = ..() diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index 09147c9cc6085..21e56eba67dd9 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -32,7 +32,7 @@ if(HAS_TRAIT(target, TRAIT_FISHING_SPOT)) return - target.AddComponent(/datum/component/fishing_spot, /datum/fish_source/surgery) + // target.AddComponent(/datum/component/fishing_spot, /datum/fish_source/surgery) // BANDASTATION REMOVAL /datum/surgery/organ_manipulation/Destroy() if(QDELETED(target) || !HAS_TRAIT(target, TRAIT_FISHING_SPOT)) From 6a4e6f16a9f40b0655d31dd25c8b37e42e20168e Mon Sep 17 00:00:00 2001 From: "ss220app[bot]" <167440448+ss220app[bot]@users.noreply.github.com> Date: Fri, 31 Jan 2025 21:36:40 +0000 Subject: [PATCH 3/3] Automatic changelog for PR #1113 [ci skip] --- html/changelogs/bandastation/AutoChangeLog-pr-1113.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/bandastation/AutoChangeLog-pr-1113.yml diff --git a/html/changelogs/bandastation/AutoChangeLog-pr-1113.yml b/html/changelogs/bandastation/AutoChangeLog-pr-1113.yml new file mode 100644 index 0000000000000..28edc8ef739e0 --- /dev/null +++ b/html/changelogs/bandastation/AutoChangeLog-pr-1113.yml @@ -0,0 +1,4 @@ +author: "AyIong" +delete-after: True +changes: + - rscdel: "Вырезаны максимально абсурдные места для рыбалки: Рифты еретика, трупы и гидропоники" \ No newline at end of file