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]."))