From 00fd121d2eb78fdaf28b73d0f8e3268bbd4824fb Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Sun, 1 Sep 2024 19:55:36 -0400 Subject: [PATCH] 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() . = ..()