From 867d7950f138fc87ede669d423a1f632e5970c9b Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Sun, 1 Sep 2024 19:34:08 -0400 Subject: [PATCH 01/11] Fishin' --- code/game/objects/prop.dm | 9 +++++++++ code/modules/fishing/bait/generic.dm | 2 ++ code/modules/fishing/datums/generic.dm | 17 +++++++++-------- code/modules/fishing/props/fishing_pole.dm | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm index ac94e8ab03..7fba26d1b2 100644 --- a/code/game/objects/prop.dm +++ b/code/game/objects/prop.dm @@ -291,3 +291,12 @@ /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_MASSIVE + garbage = TRUE diff --git a/code/modules/fishing/bait/generic.dm b/code/modules/fishing/bait/generic.dm index 8a8c8698d7..21716406a2 100644 --- a/code/modules/fishing/bait/generic.dm +++ b/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 diff --git a/code/modules/fishing/datums/generic.dm b/code/modules/fishing/datums/generic.dm index 3d2766efba..94a1684513 100644 --- a/code/modules/fishing/datums/generic.dm +++ b/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) diff --git a/code/modules/fishing/props/fishing_pole.dm b/code/modules/fishing/props/fishing_pole.dm index 3d87a171e3..3782012514 100644 --- a/code/modules/fishing/props/fishing_pole.dm +++ b/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' From 00fd121d2eb78fdaf28b73d0f8e3268bbd4824fb Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Sun, 1 Sep 2024 19:55:36 -0400 Subject: [PATCH 02/11] trash - Trash no longer magically disappears - Rocks are now a prop that can be placed on maps and act as a type of basic weapon --- .../effects/decals/cleanable/cleanable.dm | 2 +- code/game/objects/effects/spawners/gibspawner.dm | 2 +- code/game/objects/items/misc.dm | 2 +- code/game/objects/items/props/helmetgarb.dm | 4 ++-- code/game/objects/items/shards.dm | 2 +- code/game/objects/items/stacks/cable_coil.dm | 2 +- code/game/objects/items/stacks/rods.dm | 2 +- code/game/objects/items/trash.dm | 2 +- code/game/objects/prop.dm | 16 +++++++++++++--- code/modules/cm_tech/implements/implants.dm | 2 +- code/modules/projectiles/ammunition.dm | 2 +- 11 files changed, 24 insertions(+), 14 deletions(-) diff --git a/code/game/objects/effects/decals/cleanable/cleanable.dm b/code/game/objects/effects/decals/cleanable/cleanable.dm index e0759c0518..05d207e97d 100644 --- a/code/game/objects/effects/decals/cleanable/cleanable.dm +++ b/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, ...) . = ..() diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index 382b92489b..120283b636 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/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 diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm index d4c9c13b58..a2d8b9d151 100644 --- a/code/game/objects/items/misc.dm +++ b/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)) diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index 558c8b235c..37ddd07bfd 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/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" diff --git a/code/game/objects/items/shards.dm b/code/game/objects/items/shards.dm index 84c3d5b834..aa46810512 100644 --- a/code/game/objects/items/shards.dm +++ b/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) . = ..() diff --git a/code/game/objects/items/stacks/cable_coil.dm b/code/game/objects/items/stacks/cable_coil.dm index e846979c00..4c734f6091 100644 --- a/code/game/objects/items/stacks/cable_coil.dm +++ b/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() . = ..() diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 18578295b0..88ac938cd3 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/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 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index d9d40e003c..73b6f16294 100644 --- a/code/game/objects/items/trash.dm +++ b/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/// diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm index 7fba26d1b2..7e52a617e4 100644 --- a/code/game/objects/prop.dm +++ b/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" @@ -298,5 +298,15 @@ icon_state = "sheet-scrap" item_state = "" desc = "A rusty piece of scrap metal." - w_class = SIZE_MASSIVE - garbage = TRUE + 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' diff --git a/code/modules/cm_tech/implements/implants.dm b/code/modules/cm_tech/implements/implants.dm index 8dbbe5d11c..5f522f47ae 100644 --- a/code/modules/cm_tech/implements/implants.dm +++ b/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 diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 594ad6b69d..8b5008a0c7 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/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() . = ..() From 89f7bf3e3bb6ce6302cac9fea634fad178dbcba2 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Mon, 2 Sep 2024 19:30:28 -0400 Subject: [PATCH 03/11] Garbage Garbage is TRUE again, but less stuff is marked as garbage and garbage is infinite now --- code/controllers/subsystem/item_cleanup.dm | 2 +- code/datums/diseases/black_goo.dm | 1 - code/game/objects/effects/decals/cleanable/blood/blood.dm | 2 +- code/game/objects/effects/decals/cleanable/cleanable.dm | 2 +- code/game/objects/effects/decals/cleanable/misc.dm | 2 +- code/game/objects/effects/spawners/gibspawner.dm | 2 +- code/game/objects/items/misc.dm | 2 +- code/game/objects/items/props/helmetgarb.dm | 6 +++--- code/game/objects/items/shards.dm | 2 +- code/game/objects/items/stacks/cable_coil.dm | 2 +- code/game/objects/items/stacks/rods.dm | 2 +- code/game/objects/items/trash.dm | 2 +- code/game/objects/prop.dm | 1 - code/modules/clothing/glasses/glasses.dm | 2 +- code/modules/cm_tech/implements/implants.dm | 2 +- code/modules/projectiles/ammunition.dm | 2 +- .../projectiles/guns/specialist/launcher/rocket_launcher.dm | 1 - 17 files changed, 16 insertions(+), 19 deletions(-) diff --git a/code/controllers/subsystem/item_cleanup.dm b/code/controllers/subsystem/item_cleanup.dm index 35d1fc2859..f23422329b 100644 --- a/code/controllers/subsystem/item_cleanup.dm +++ b/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 diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index d4d9b6f509..e0350db4a8 100644 --- a/code/datums/diseases/black_goo.dm +++ b/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() . = ..() diff --git a/code/game/objects/effects/decals/cleanable/blood/blood.dm b/code/game/objects/effects/decals/cleanable/blood/blood.dm index 918797608b..84b224f1ca 100644 --- a/code/game/objects/effects/decals/cleanable/blood/blood.dm +++ b/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) diff --git a/code/game/objects/effects/decals/cleanable/cleanable.dm b/code/game/objects/effects/decals/cleanable/cleanable.dm index 05d207e97d..e0759c0518 100644 --- a/code/game/objects/effects/decals/cleanable/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable/cleanable.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(cleanable_decal_cache) */ var/cleaned_up = FALSE - garbage = FALSE + garbage = TRUE /obj/effect/decal/cleanable/Initialize(mapload, ...) . = ..() diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 9cf2aa3d8e..c38e6eea81 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/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) diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index 120283b636..382b92489b 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/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 = FALSE + garbage = TRUE var/list/viruses var/mob/living/ml diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm index a2d8b9d151..d4c9c13b58 100644 --- a/code/game/objects/items/misc.dm +++ b/code/game/objects/items/misc.dm @@ -8,7 +8,7 @@ throwforce = 0 throw_speed = SPEED_VERY_FAST throw_range = 20 - garbage = FALSE + garbage = TRUE /obj/item/bananapeel/Crossed(AM as mob|obj) if (iscarbon(AM)) diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index 37ddd07bfd..fa494e42b7 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/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 = FALSE + garbage = TRUE /obj/item/prop/helmetgarb/Initialize(mapload, ...) . = ..() @@ -102,7 +102,7 @@ desc = "USCM standard M2 Night vision goggles for military operations. Requires a battery in order to work" icon_state = "nvg" gender = PLURAL - garbage = FALSE + garbage = TRUE w_class = SIZE_MEDIUM var/nvg_maxhealth = 125 @@ -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 = FALSE + garbage = TRUE /obj/item/prop/helmetgarb/helmet_nvg/marsoc //for Marine Raiders name = "\improper Tactical M3 night vision goggles" diff --git a/code/game/objects/items/shards.dm b/code/game/objects/items/shards.dm index aa46810512..84c3d5b834 100644 --- a/code/game/objects/items/shards.dm +++ b/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 = FALSE + garbage = TRUE /obj/item/shard/attack(mob/living/carbon/M, mob/living/carbon/user) . = ..() diff --git a/code/game/objects/items/stacks/cable_coil.dm b/code/game/objects/items/stacks/cable_coil.dm index 4c734f6091..e846979c00 100644 --- a/code/game/objects/items/stacks/cable_coil.dm +++ b/code/game/objects/items/stacks/cable_coil.dm @@ -271,7 +271,7 @@ /obj/item/stack/cable_coil/cut item_state = "coil2" - garbage = FALSE + garbage = TRUE /obj/item/stack/cable_coil/cut/Initialize() . = ..() diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 88ac938cd3..18578295b0 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/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 = FALSE + garbage = TRUE var/sheet_path = /obj/item/stack/sheet/metal var/used_per_sheet = 4 diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 73b6f16294..d9d40e003c 100644 --- a/code/game/objects/items/trash.dm +++ b/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 = FALSE + garbage = TRUE ////////////// ///Wrappers/// diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm index 7e52a617e4..aefbe4ab92 100644 --- a/code/game/objects/prop.dm +++ b/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 = FALSE /obj/item/prop/geiger_counter name = "geiger counter" diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 0fbca14801..b5c207edf9 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -389,7 +389,7 @@ var/datum/action/item_action/activation var/obj/item/attached_item - garbage = FALSE + garbage = TRUE /obj/item/clothing/glasses/mgoggles/prescription name = "prescription marine ballistic goggles" diff --git a/code/modules/cm_tech/implements/implants.dm b/code/modules/cm_tech/implements/implants.dm index 5f522f47ae..8dbbe5d11c 100644 --- a/code/modules/cm_tech/implements/implants.dm +++ b/code/modules/cm_tech/implements/implants.dm @@ -107,7 +107,7 @@ I.on_implanted(M) uses = max(uses - 1, 0) if(!uses) - garbage = FALSE + garbage = TRUE update_icon() /obj/item/device/internal_implant diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 8b5008a0c7..594ad6b69d 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/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 = FALSE + garbage = TRUE /obj/item/ammo_casing/Initialize() . = ..() diff --git a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm index 356d0e6c3b..b3d562c269 100644 --- a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm +++ b/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].")) From 463f99b4f934f318690ae4533d47ca13c48138a7 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Mon, 2 Sep 2024 20:15:12 -0400 Subject: [PATCH 04/11] Helmet garb and glasses are not garbage --- code/game/objects/items/props/helmetgarb.dm | 3 --- code/modules/clothing/glasses/glasses.dm | 1 - 2 files changed, 4 deletions(-) diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index fa494e42b7..eb6fc2d8c7 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/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 = TRUE 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" diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index b5c207edf9..2a6d8ba066 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -389,7 +389,6 @@ var/datum/action/item_action/activation var/obj/item/attached_item - garbage = TRUE /obj/item/clothing/glasses/mgoggles/prescription name = "prescription marine ballistic goggles" From 0770d571815697c4b11b906c9940dc31d2f38a9a Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Tue, 3 Sep 2024 22:23:01 -0400 Subject: [PATCH 05/11] Re-adds garbage instances --- code/game/objects/items/misc.dm | 2 +- .../projectiles/guns/specialist/launcher/rocket_launcher.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm index d4c9c13b58..a2d8b9d151 100644 --- a/code/game/objects/items/misc.dm +++ b/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)) diff --git a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm index b3d562c269..566309c1aa 100644 --- a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm +++ b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm @@ -296,7 +296,7 @@ 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].")) playsound(src, 'sound/items/component_pickup.ogg', 20, TRUE, 5) From 82a48a1e1fb874bed60393b4aec2ab5d211a64d0 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Tue, 3 Sep 2024 22:24:37 -0400 Subject: [PATCH 06/11] More garbage --- code/datums/diseases/black_goo.dm | 2 +- code/game/objects/effects/decals/cleanable/blood/blood.dm | 2 +- code/game/objects/items/props/helmetgarb.dm | 4 +++- code/game/objects/prop.dm | 2 +- code/modules/clothing/glasses/glasses.dm | 1 + .../projectiles/guns/specialist/launcher/rocket_launcher.dm | 1 + 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index e0350db4a8..8dbe7efbc1 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -194,7 +194,7 @@ 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() . = ..() reagents.add_reagent("blackgoo", 30) diff --git a/code/game/objects/effects/decals/cleanable/blood/blood.dm b/code/game/objects/effects/decals/cleanable/blood/blood.dm index 84b224f1ca..918797608b 100644 --- a/code/game/objects/effects/decals/cleanable/blood/blood.dm +++ b/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 = TRUE // Keep for atmosphere + garbage = FALSE // Keep for atmosphere /obj/effect/decal/cleanable/blood/Destroy() for(var/datum/disease/D in viruses) diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index eb6fc2d8c7..5f7128b2b1 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/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 /obj/item/prop/helmetgarb/Initialize(mapload, ...) . = ..() if(garbage) @@ -101,6 +101,7 @@ 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 @@ -455,6 +456,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 /obj/item/prop/helmetgarb/helmet_nvg/marsoc //for Marine Raiders name = "\improper Tactical M3 night vision goggles" diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm index aefbe4ab92..3fd8b2e134 100644 --- a/code/game/objects/prop.dm +++ b/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 /obj/item/prop/geiger_counter name = "geiger counter" desc = "A geiger counter measures the radiation it receives. This type automatically records and transfers any information it reads, provided it has a battery, with no user input required beyond being enabled." diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 2a6d8ba066..b5c207edf9 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -389,6 +389,7 @@ var/datum/action/item_action/activation var/obj/item/attached_item + garbage = TRUE /obj/item/clothing/glasses/mgoggles/prescription name = "prescription marine ballistic goggles" diff --git a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm index 566309c1aa..356d0e6c3b 100644 --- a/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm +++ b/code/modules/projectiles/guns/specialist/launcher/rocket_launcher.dm @@ -297,6 +297,7 @@ 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].")) playsound(src, 'sound/items/component_pickup.ogg', 20, TRUE, 5) From a7ba4de274ad17a494179f82040f83113bf6ba95 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Tue, 3 Sep 2024 22:27:37 -0400 Subject: [PATCH 07/11] More garbage --- code/game/objects/items/misc.dm | 2 +- code/modules/clothing/glasses/glasses.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm index a2d8b9d151..d4c9c13b58 100644 --- a/code/game/objects/items/misc.dm +++ b/code/game/objects/items/misc.dm @@ -8,7 +8,7 @@ throwforce = 0 throw_speed = SPEED_VERY_FAST throw_range = 20 - garbage = FALSE + garbage = TRUE /obj/item/bananapeel/Crossed(AM as mob|obj) if (iscarbon(AM)) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index b5c207edf9..0fbca14801 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -389,7 +389,7 @@ var/datum/action/item_action/activation var/obj/item/attached_item - garbage = TRUE + garbage = FALSE /obj/item/clothing/glasses/mgoggles/prescription name = "prescription marine ballistic goggles" From b85e92893778f006a73b550d7ca417cd660374fe Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:38:18 -0400 Subject: [PATCH 08/11] Update code/game/objects/effects/decals/cleanable/misc.dm Co-authored-by: Doubleumc --- code/game/objects/effects/decals/cleanable/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index c38e6eea81..9cf2aa3d8e 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/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 = TRUE + garbage = FALSE /obj/effect/decal/cleanable/cobweb2/dynamic/Initialize(mapload, targetdir, webscale = 1.0) alpha += round(webscale * 120) var/angle = dir2angle(targetdir) From 62822d75874f23ad044c5ee7b28e899f9b8eebfa Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:38:24 -0400 Subject: [PATCH 09/11] Update code/datums/diseases/black_goo.dm Co-authored-by: Doubleumc --- code/datums/diseases/black_goo.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/diseases/black_goo.dm b/code/datums/diseases/black_goo.dm index 8dbe7efbc1..d4d9b6f509 100644 --- a/code/datums/diseases/black_goo.dm +++ b/code/datums/diseases/black_goo.dm @@ -195,6 +195,7 @@ icon = 'icons/obj/items/black_goo_stuff.dmi' icon_state = "blackgoo" garbage = FALSE + /obj/item/reagent_container/food/drinks/bottle/black_goo/Initialize() . = ..() reagents.add_reagent("blackgoo", 30) From bac2b685a038ebce2e8c0a4304bac9e0358ddb8c Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:38:29 -0400 Subject: [PATCH 10/11] Update code/game/objects/prop.dm Co-authored-by: Doubleumc --- code/game/objects/prop.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm index 3fd8b2e134..f24fec66a6 100644 --- a/code/game/objects/prop.dm +++ b/code/game/objects/prop.dm @@ -10,6 +10,7 @@ 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" desc = "A geiger counter measures the radiation it receives. This type automatically records and transfers any information it reads, provided it has a battery, with no user input required beyond being enabled." From a3775ff3ff4b88ae41089ddcb8748caa2be259ac Mon Sep 17 00:00:00 2001 From: AmoryBlaine <32080743+AmoryBlaine@users.noreply.github.com> Date: Tue, 3 Sep 2024 22:38:34 -0400 Subject: [PATCH 11/11] Update code/game/objects/items/props/helmetgarb.dm Co-authored-by: Doubleumc --- code/game/objects/items/props/helmetgarb.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm index 5f7128b2b1..558c8b235c 100644 --- a/code/game/objects/items/props/helmetgarb.dm +++ b/code/game/objects/items/props/helmetgarb.dm @@ -5,6 +5,7 @@ icon_state = null w_class = SIZE_TINY garbage = TRUE + /obj/item/prop/helmetgarb/Initialize(mapload, ...) . = ..() if(garbage)