Fishin' and the killin' power of rock also trash is permanent

code/controllers/subsystem/item_cleanup.dm

@@ -3,7 +3,7 @@ var/global/list/item_cleanup_list = list()
 SUBSYSTEM_DEF(item_cleanup)
 	name = "Item Cleanup"
 	wait = 10 MINUTES //should be adjusted for WO
-	var/start_processing_time = 35 MINUTES //should be adjusted for WO
+	var/start_processing_time = INFINITY //should be adjusted for WO
 	var/percentage_of_garbage_to_delete = 0.5 //should be adjusted for WO
 	//We keep a separate, private list
 	//So we don't get instant deletions of items

code/datums/diseases/black_goo.dm

@@ -194,7 +194,6 @@
 	desc = "A strange bottle of unknown origin."
 	icon = 'icons/obj/items/black_goo_stuff.dmi'
 	icon_state = "blackgoo"
-	garbage = FALSE
 
 /obj/item/reagent_container/food/drinks/bottle/black_goo/Initialize()
 	. = ..()

code/game/objects/effects/decals/cleanable/blood/blood.dm

@@ -17,7 +17,7 @@
 	var/amount = 3
 	var/drying_time = 30 SECONDS
 	var/dry_start_time // If this dries, track the dry start time for footstep drying
-	garbage = FALSE // Keep for atmosphere
+	garbage = TRUE // Keep for atmosphere
 
 /obj/effect/decal/cleanable/blood/Destroy()
 	for(var/datum/disease/D in viruses)

code/game/objects/effects/decals/cleanable/misc.dm

@@ -97,7 +97,7 @@
 /obj/effect/decal/cleanable/cobweb2/dynamic
 	alpha = 80
 	appearance_flags = RESET_ALPHA | TILE_BOUND | PIXEL_SCALE
-	garbage = FALSE
+	garbage = TRUE
 /obj/effect/decal/cleanable/cobweb2/dynamic/Initialize(mapload, targetdir, webscale = 1.0)
 	alpha += round(webscale * 120)
 	var/angle = dir2angle(targetdir)

code/game/objects/items/props/helmetgarb.dm

@@ -4,7 +4,6 @@
 	icon = 'icons/obj/items/helmet_garb.dmi'
 	icon_state = null
 	w_class = SIZE_TINY
-	garbage = TRUE
 
 /obj/item/prop/helmetgarb/Initialize(mapload, ...)
 	. = ..()
@@ -102,7 +101,6 @@
 	desc = "USCM standard M2 Night vision goggles for military operations. Requires a battery in order to work"
 	icon_state = "nvg"
 	gender = PLURAL
-	garbage = FALSE
 	w_class = SIZE_MEDIUM
 
 	var/nvg_maxhealth = 125
@@ -457,7 +455,6 @@
 	name = "old M2 night vision goggles"
 	desc = "This pair has been gutted of all electronics and therefore not working. But hey, they make you feel tacticool, and that's all that matters, right?"
 	shape = NVG_SHAPE_COSMETIC
-	garbage = TRUE
 
 /obj/item/prop/helmetgarb/helmet_nvg/marsoc //for Marine Raiders
 	name = "\improper Tactical M3 night vision goggles"

code/game/objects/prop.dm

@@ -9,7 +9,6 @@
 	item_state = ""
 	desc = "A Rexim RXF-M5 EVA pistol compressed down into a laptop! Also known as the Laz-top. Part of a line of discreet assassination weapons developed for Greater Argentina and the United States covert programs respectively."
 	w_class = SIZE_SMALL
-	garbage = TRUE
 
 /obj/item/prop/geiger_counter
 	name = "geiger counter"
@@ -291,3 +290,22 @@
 /obj/item/prop/magazine/boots/n055
 	name = "Boots!: Issue No.55"
 	desc = "The only official USCM magazine, the headline reads 'TEN tips to keep your UD4 cockpit both safer and more relaxing.'"
+
+/obj/item/prop/scrap
+	name = "scrap metal"
+	icon = 'icons/obj/items/fishing_atoms.dmi'
+	icon_state = "sheet-scrap"
+	item_state = ""
+	desc = "A rusty piece of scrap metal."
+	w_class = SIZE_MEDIUM
+
+/obj/item/prop/rock
+	name = "rock"
+	icon = 'icons/obj/items/plush.dmi'
+	icon_state = "rock"
+	item_state = ""
+	force = 30
+	throwforce = 25
+	desc = "The most ancient of tools."
+	w_class = SIZE_TINY
+	hitsound = 'sound/weapons/genhit3.ogg'

code/modules/clothing/glasses/glasses.dm

@@ -389,7 +389,6 @@
 
 	var/datum/action/item_action/activation
 	var/obj/item/attached_item
-	garbage = FALSE
 
 /obj/item/clothing/glasses/mgoggles/prescription
 	name = "prescription marine ballistic goggles"

code/modules/fishing/bait/generic.dm

@@ -1,5 +1,7 @@
 /obj/item/fish_bait
 	name = "fish bait"
+	icon = 'icons/obj/items/fishing_atoms.dmi'
+	icon_state = "other_meat"
 	desc = "A tasty piece of... meat? Whatever it is, fish love this."
 
 	var/common_mod = -10

code/modules/fishing/datums/generic.dm

@@ -2,20 +2,21 @@ GLOBAL_LIST_EMPTY(fishing_loot_tables)
 
 /datum/fish_loot_table
 	var/list/common_fishable_atoms = list(
-		/obj/item/clothing/shoes/leather,
-		/obj/item/clothing/shoes/marine,
+		/obj/item/prop/scrap,
+		/obj/item/trash/crushed_cup,
+		/obj/item/trash/c_tube,
+		/obj/item/trash/cigbutt/bcigbutt,
+		/obj/item/trash/cigbutt/cigarbutt
 	)
 	var/list/uncommon_fishable_atoms = list(
-		/obj/item/cell/high,
-		/obj/item/device/multitool
+		/obj/item/reagent_container/food/snacks/fishable/squid/whorl,
+		/obj/item/reagent_container/food/snacks/fishable/crab
 	)
 	var/list/rare_fishable_atoms = list(
-		/obj/item/reagent_container/food/snacks/packaged_burrito
+		/obj/item/coin/silver
 	)
 	var/list/ultra_rare_fishable_atoms = list(
-		/obj/item/card/data/clown,
-		/obj/item/reagent_container/food/snacks/clownburger,
-		/obj/item/reagent_container/pill/ultrazine/unmarked
+		/obj/item/reagent_container/food/snacks/fishable/quadtopus
 	)
 
 /datum/fish_loot_table/proc/return_caught_fish(common_weight, uncommon_weight, rare_weight, ultra_rare_weight)

code/modules/fishing/props/fishing_pole.dm

@@ -9,7 +9,7 @@
 
 /obj/structure/prop/fishing/pole_interactive
 	var/time_to_fish = 30 SECONDS
-	var/fishing_success = 'sound/items/bikehorn.ogg'//to-do get a sound effect(s)
+	var/fishing_success = 'sound/items/fulton.ogg'//to-do get a sound effect(s)
 	var/fishing_start = 'sound/items/fulton.ogg'
 	var/fishing_failure = 'sound/items/jetpack_beep.ogg'
 	var/fishing_event = 'sound/items/component_pickup.ogg'

code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm

@@ -296,7 +296,6 @@
 	icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi'
 	icon_state = "m83a2_folded"
 	w_class = SIZE_MEDIUM
-	garbage = FALSE
 
 /obj/item/prop/folded_anti_tank_sadar/attack_self(mob/user)
 	user.visible_message(SPAN_NOTICE("[user] begins to unfold \the [src]."), SPAN_NOTICE("You start to unfold and expand \the [src]."))