Skip to content

Commit

Permalink
Garbage
Browse files Browse the repository at this point in the history
Garbage is TRUE again, but less stuff is marked as garbage and garbage is infinite now
  • Loading branch information
AmoryBlaine committed Sep 2, 2024
1 parent 00fd121 commit 89f7bf3
Show file tree
Hide file tree
Showing 17 changed files with 16 additions and 19 deletions.
2 changes: 1 addition & 1 deletion code/controllers/subsystem/item_cleanup.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion code/datums/diseases/black_goo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/cleanable/blood/blood.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/cleanable/cleanable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ GLOBAL_LIST_EMPTY(cleanable_decal_cache)
*/
var/cleaned_up = FALSE

garbage = FALSE
garbage = TRUE

/obj/effect/decal/cleanable/Initialize(mapload, ...)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/decals/cleanable/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/gibspawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/props/helmetgarb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, ...)
. = ..()
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/shards.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/cable_coil.dm
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@

/obj/item/stack/cable_coil/cut
item_state = "coil2"
garbage = FALSE
garbage = TRUE

/obj/item/stack/cable_coil/cut/Initialize()
. = ..()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/stacks/rods.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/trash.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
icon = 'icons/obj/items/trash.dmi'
w_class = SIZE_SMALL
desc = "This is rubbish."
garbage = FALSE
garbage = TRUE

//////////////
///Wrappers///
Expand Down
1 change: 0 additions & 1 deletion code/game/objects/prop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/glasses/glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_tech/implements/implants.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammunition.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
. = ..()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]."))
Expand Down

0 comments on commit 89f7bf3

Please sign in to comment.