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

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

@@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(cleanable_decal_cache)
 	 */
 	var/cleaned_up = FALSE
 
-	garbage = TRUE
+	garbage = FALSE
 
 /obj/effect/decal/cleanable/Initialize(mapload, ...)
 	. = ..()

code/game/objects/effects/spawners/gibspawner.dm

@@ -21,7 +21,7 @@
 	var/bloodcolor //Used for gibbed humans.
 	icon = 'icons/landmarks.dmi'
 	icon_state = "landmark_gibs"
-	garbage = TRUE
+	garbage = FALSE
 	var/list/viruses
 	var/mob/living/ml
 

code/game/objects/items/misc.dm

@@ -8,7 +8,7 @@
 	throwforce = 0
 	throw_speed = SPEED_VERY_FAST
 	throw_range = 20
-	garbage = TRUE
+	garbage = FALSE
 
 /obj/item/bananapeel/Crossed(AM as mob|obj)
 	if (iscarbon(AM))

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

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/items/helmet_garb.dmi'
 	icon_state = null
 	w_class = SIZE_TINY
-	garbage = TRUE
+	garbage = FALSE
 
 /obj/item/prop/helmetgarb/Initialize(mapload, ...)
 	. = ..()
@@ -457,7 +457,7 @@
 	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
+	garbage = FALSE
 
 /obj/item/prop/helmetgarb/helmet_nvg/marsoc //for Marine Raiders
 	name = "\improper Tactical M3 night vision goggles"

code/game/objects/items/shards.dm

@@ -16,7 +16,7 @@
 	var/source_sheet_type = /obj/item/stack/sheet/glass
 	var/shardsize
 	var/count = 1
-	garbage = TRUE
+	garbage = FALSE
 
 /obj/item/shard/attack(mob/living/carbon/M, mob/living/carbon/user)
 	. = ..()

code/game/objects/items/stacks/cable_coil.dm

@@ -271,7 +271,7 @@
 
 /obj/item/stack/cable_coil/cut
 	item_state = "coil2"
-	garbage = TRUE
+	garbage = FALSE
 
 /obj/item/stack/cable_coil/cut/Initialize()
 	. = ..()

code/game/objects/items/stacks/rods.dm

@@ -13,7 +13,7 @@
 	max_amount = 60
 	attack_verb = list("hit", "bludgeoned", "whacked")
 	stack_id = "metal rod"
-	garbage = TRUE
+	garbage = FALSE
 	var/sheet_path = /obj/item/stack/sheet/metal
 	var/used_per_sheet = 4
 

code/game/objects/items/trash.dm

@@ -5,7 +5,7 @@
 	icon = 'icons/obj/items/trash.dmi'
 	w_class = SIZE_SMALL
 	desc = "This is rubbish."
-	garbage = TRUE
+	garbage = FALSE
 
 //////////////
 ///Wrappers///

code/game/objects/prop.dm

@@ -9,7 +9,7 @@
 	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
+	garbage = FALSE
 
 /obj/item/prop/geiger_counter
 	name = "geiger counter"
@@ -291,3 +291,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/cm_tech/implements/implants.dm

@@ -107,7 +107,7 @@
 	I.on_implanted(M)
 	uses = max(uses - 1, 0)
 	if(!uses)
-		garbage = TRUE
+		garbage = FALSE
 	update_icon()
 
 /obj/item/device/internal_implant

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/ammunition.dm

@@ -323,7 +323,7 @@ Turn() or Shift() as there is virtually no overhead. ~N
 	var/max_casings = 16
 	var/current_icon = 0
 	var/number_of_states = 10 //How many variations of this item there are.
-	garbage = TRUE
+	garbage = FALSE
 
 /obj/item/ammo_casing/Initialize()
 	. = ..()