Merge remote-tracking branch 'upstream/master' into fix-time-display

ss220club · Jan 31, 2025 · 612d56e · 612d56e
2 parents 5ae534c + 6a4e6f1
commit 612d56e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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))

diff --git a/html/changelogs/bandastation/AutoChangeLog-pr-1113.yml b/html/changelogs/bandastation/AutoChangeLog-pr-1113.yml
@@ -0,0 +1,4 @@
+author: "AyIong"
+delete-after: True
+changes:
+  - rscdel: "Вырезаны максимально абсурдные места для рыбалки: Рифты еретика, трупы и гидропоники"