From 47b77f664e871b307ce24ae59a95cbcb3afb08d9 Mon Sep 17 00:00:00 2001 From: chuga-git <98280110+chuga-git@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:54:32 -0500 Subject: [PATCH] duplicate var definitions begone (#26612) --- code/modules/awaymissions/mission_code/ruins/deepstorage.dm | 5 ++--- code/modules/mod/mod_actions.dm | 2 +- code/modules/vehicle/tg_vehicles/tg_vehicles.dm | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/awaymissions/mission_code/ruins/deepstorage.dm b/code/modules/awaymissions/mission_code/ruins/deepstorage.dm index 8dc9de2314b..17494928b3f 100644 --- a/code/modules/awaymissions/mission_code/ruins/deepstorage.dm +++ b/code/modules/awaymissions/mission_code/ruins/deepstorage.dm @@ -7,12 +7,13 @@ icon = 'icons/mob/fleshling.dmi' icon_state = "fleshling" icon_living = "fleshling" + attack_sound = 'sound/misc/demon_attack1.ogg' + death_sound = 'sound/misc/demon_dies.ogg' icon_dead = "" speed = 5 move_to_delay = 4 ranged = TRUE pixel_x = -16 - attack_sound = 'sound/misc/demon_attack1.ogg' melee_damage_lower = 20 melee_damage_upper = 20 wander = TRUE @@ -23,8 +24,6 @@ a_intent = INTENT_HARM deathmessage = "collapses into a pile of gibs. From the looks of it this is the deadest it can get... " del_on_death = TRUE - death_sound = 'sound/misc/demon_dies.ogg' - attack_sound = 'sound/misc/demon_attack1.ogg' /// Is the boss charging right now? var/charging = FALSE diff --git a/code/modules/mod/mod_actions.dm b/code/modules/mod/mod_actions.dm index 6bb3be9009d..fc10b7448e0 100644 --- a/code/modules/mod/mod_actions.dm +++ b/code/modules/mod/mod_actions.dm @@ -89,7 +89,7 @@ /datum/action/item_action/mod/pinned_module desc = "Activate the module." button_overlay_icon = 'icons/obj/clothing/modsuit/mod_modules.dmi' - button_overlay_icon = 'icons/mob/actions/actions_mod.dmi' + button_background_icon = 'icons/mob/actions/actions_mod.dmi' button_overlay_icon_state = "module" /// Module we are linked to. var/obj/item/mod/module/module diff --git a/code/modules/vehicle/tg_vehicles/tg_vehicles.dm b/code/modules/vehicle/tg_vehicles/tg_vehicles.dm index 7687e66c8c6..5018f41e603 100644 --- a/code/modules/vehicle/tg_vehicles/tg_vehicles.dm +++ b/code/modules/vehicle/tg_vehicles/tg_vehicles.dm @@ -10,7 +10,6 @@ blocks_emissive = EMISSIVE_BLOCK_GENERIC buckle_lying = FALSE can_buckle = TRUE - buckle_lying = 0 pass_flags = PASSTABLE COOLDOWN_DECLARE(message_cooldown) COOLDOWN_DECLARE(cooldown_vehicle_move)