From bfbfcee4ddc5c4aec4cb019c70c59a79cb71772d Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Fri, 16 Aug 2024 10:02:09 +1000 Subject: [PATCH 1/4] Fixes guns being unpickupable. --- code/modules/projectiles/guns/projectile.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 0491fe0633a..8484b46f898 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -281,10 +281,11 @@ return ..() /obj/item/gun/projectile/attack_hand(mob/user) - if(manual_unload && unload_ammo(user, allow_dump = FALSE)) - return TRUE - if(try_remove_silencer(user)) - return TRUE + if(src in user.get_inactive_held_items()) + if(manual_unload && unload_ammo(user, allow_dump = FALSE)) + return TRUE + if(try_remove_silencer(user)) + return TRUE return ..() /obj/item/gun/projectile/afterattack(atom/A, mob/living/user) From 7e08f9d316e8b8954192c8b107e4a9299fecf9b9 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Fri, 16 Aug 2024 20:36:48 +1000 Subject: [PATCH 2/4] Cherrypicking prosthetic faults codex fix from dev. --- code/modules/organs/ailments/ailment_codex.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/organs/ailments/ailment_codex.dm b/code/modules/organs/ailments/ailment_codex.dm index df9b3039b3a..ed1ea3d55eb 100644 --- a/code/modules/organs/ailments/ailment_codex.dm +++ b/code/modules/organs/ailments/ailment_codex.dm @@ -43,8 +43,8 @@ continue ailment_table += "[ailment.name]" var/list/ailment_cures = list() - if(ailment.treated_by_item_type) - var/obj/item/thing = ailment.treated_by_item_type + var/list/treated_by_types = islist(ailment.treated_by_item_type) ? ailment.treated_by_item_type : list(ailment.treated_by_item_type) + for(var/obj/item/thing as anything in treated_by_types) // if you put a non-item in here you deserve to have your face eaten by runtime errors ailment_cures += "[ailment.treated_by_item_cost] x [initial(thing.name)]" if(ailment.treated_by_reagent_type) var/decl/material/mat = GET_DECL(ailment.treated_by_reagent_type) From 1b31cfe7cbfd3e079b736a742c43414fcb29d801 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Fri, 16 Aug 2024 20:40:59 +1000 Subject: [PATCH 3/4] Fixes missing path in safety toggle interaction. --- code/modules/projectiles/gun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 119f09dbc18..06e70a803ad 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -754,7 +754,7 @@ /decl/interaction_handler/gun/toggle_safety name = "Toggle Safety" -/decl/interaction_handler/toggle_safety/invoked(atom/target, mob/user, obj/item/prop) +/decl/interaction_handler/gun/toggle_safety/invoked(atom/target, mob/user, obj/item/prop) var/obj/item/gun/gun = target gun.toggle_safety(user) From 2c0bf5f7474b925fd3e88b0a2a2010303b0e6390 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Fri, 16 Aug 2024 20:47:50 +1000 Subject: [PATCH 4/4] Lowered glass return on dismantle to 1, since it's 1 pane of glass. --- code/game/objects/structures/window.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index ff5aa756212..98ef552bfb1 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -138,7 +138,7 @@ else if(isobj(AM)) var/obj/item/I = AM tforce = I.throwforce * (TT.speed/THROWFORCE_SPEED_DIVISOR) - if(reinf_material) + if(reinf_material) tforce *= 0.25 if(current_health - tforce <= 7 && !reinf_material) set_anchored(FALSE) @@ -265,7 +265,7 @@ // TODO: generalize to matter list and parts_type. /obj/structure/window/create_dismantled_products(turf/T) SHOULD_CALL_PARENT(FALSE) - var/list/products = material.create_object(loc, is_fulltile() ? 4 : 2) + var/list/products = material.create_object(loc, 1) if(reinf_material) for(var/obj/item/stack/material/S in products) S.reinf_material = reinf_material