diff --git a/code/game/sound.dm b/code/game/sound.dm index 03e629999418..b909dbf09e63 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -11,7 +11,7 @@ var/falloff = 1 var/volume_cat = VOLUME_SFX var/range = 0 - var/list/echo + var/list/echo = new(18) var/x //Map coordinates, not sound coordinates var/y var/z diff --git a/code/modules/admin/verbs/adminpanelweapons.dm b/code/modules/admin/verbs/adminpanelweapons.dm index 9c626b9c4b82..26d6ca803b60 100644 --- a/code/modules/admin/verbs/adminpanelweapons.dm +++ b/code/modules/admin/verbs/adminpanelweapons.dm @@ -19,7 +19,7 @@ var/list/datum/space_weapon_ammo/potential_ammo = list() for(var/ammo_to_get in potential_weapons[weapon_type].possibly_ammunition) var/datum/space_weapon_ammo/ammo_to_set = GLOB.space_weapons_ammo[ammo_to_get] - LAZYSET(potential_ammo, ammo_to_set.name, ammo_to_set) + LAZYSET(potential_ammo, ammo_to_set.name, ammo_to_get) while(length(potential_ammo)) var/additional_ammo = tgui_input_list(src, "Choose ammo", "Ammo selector", potential_ammo, 20 SECONDS) diff --git a/code/modules/vehicles/apc/apc.dm b/code/modules/vehicles/apc/apc.dm index daac51f53a82..48319f0e321b 100644 --- a/code/modules/vehicles/apc/apc.dm +++ b/code/modules/vehicles/apc/apc.dm @@ -25,7 +25,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) "right" = list(-2, 0), "rear left" = list(1, 2), "rear center" = list(0, 2), - "rear right" = list(-1, 2) + "rear right" = list(-1, 2), ) entrance_speed = 0.5 SECONDS @@ -65,22 +65,22 @@ GLOBAL_LIST_EMPTY(command_apc_list) "global" = list( /obj/vehicle/multitile/proc/get_status_info, /obj/vehicle/multitile/proc/open_controls_guide, - /obj/vehicle/multitile/proc/name_vehicle + /obj/vehicle/multitile/proc/name_vehicle, ), VEHICLE_DRIVER = list( /obj/vehicle/multitile/proc/toggle_door_lock, - /obj/vehicle/multitile/proc/activate_horn + /obj/vehicle/multitile/proc/activate_horn, ), VEHICLE_GUNNER = list( /obj/vehicle/multitile/proc/switch_hardpoint, /obj/vehicle/multitile/proc/cycle_hardpoint, - /obj/vehicle/multitile/proc/toggle_shift_click + /obj/vehicle/multitile/proc/toggle_shift_click, ), VEHICLE_SUPPORT_GUNNER_ONE = list( - /obj/vehicle/multitile/proc/reload_firing_port_weapon + /obj/vehicle/multitile/proc/reload_firing_port_weapon, ), VEHICLE_SUPPORT_GUNNER_TWO = list( - /obj/vehicle/multitile/proc/reload_firing_port_weapon + /obj/vehicle/multitile/proc/reload_firing_port_weapon, ) ) @@ -203,7 +203,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) //PRESET: only wheels installed /obj/effect/vehicle_spawner/apc/plain hardpoints = list( - /obj/item/hardpoint/locomotion/apc_wheels + /obj/item/hardpoint/locomotion/apc_wheels, ) //PRESET: default hardpoints, destroyed @@ -212,7 +212,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) /obj/item/hardpoint/primary/dualcannon, /obj/item/hardpoint/secondary/frontalcannon, /obj/item/hardpoint/support/flare_launcher, - /obj/item/hardpoint/locomotion/apc_wheels + /obj/item/hardpoint/locomotion/apc_wheels, ) /obj/effect/vehicle_spawner/apc/decrepit/spawn_vehicle(obj/vehicle/multitile/spawning) @@ -234,7 +234,7 @@ GLOBAL_LIST_EMPTY(command_apc_list) /obj/item/hardpoint/primary/dualcannon, /obj/item/hardpoint/secondary/frontalcannon, /obj/item/hardpoint/support/flare_launcher, - /obj/item/hardpoint/locomotion/apc_wheels + /obj/item/hardpoint/locomotion/apc_wheels, ) //fpw diff --git a/code/modules/vehicles/apc/apc_command.dm b/code/modules/vehicles/apc/apc_command.dm index 201018e51810..c8f16481b702 100644 --- a/code/modules/vehicles/apc/apc_command.dm +++ b/code/modules/vehicles/apc/apc_command.dm @@ -19,7 +19,7 @@ entrances = list( "left" = list(2, 0), - "right" = list(-2, 0) + "right" = list(-2, 0), ) seats = list( diff --git a/code/modules/vehicles/apc/apc_medical.dm b/code/modules/vehicles/apc/apc_medical.dm index 598a48fe902e..cef40a48cb23 100644 --- a/code/modules/vehicles/apc/apc_medical.dm +++ b/code/modules/vehicles/apc/apc_medical.dm @@ -16,7 +16,7 @@ entrances = list( "left" = list(2, 0), - "right" = list(-2, 0) + "right" = list(-2, 0), ) seats = list( diff --git a/code/modules/vehicles/arc/arc.dm b/code/modules/vehicles/arc/arc.dm index 4715c8ca6244..2f99f33c1b1c 100644 --- a/code/modules/vehicles/arc/arc.dm +++ b/code/modules/vehicles/arc/arc.dm @@ -57,7 +57,7 @@ /obj/vehicle/multitile/proc/toggle_door_lock, /obj/vehicle/multitile/proc/activate_horn, /obj/vehicle/multitile/proc/name_vehicle, - /obj/vehicle/multitile/arc/proc/toggle_antenna + /obj/vehicle/multitile/arc/proc/toggle_antenna, ) ) diff --git a/code/modules/vehicles/multitile/multitile.dm b/code/modules/vehicles/multitile/multitile.dm index b20d50a1b893..f06e80334137 100644 --- a/code/modules/vehicles/multitile/multitile.dm +++ b/code/modules/vehicles/multitile/multitile.dm @@ -145,7 +145,7 @@ var/list/misc_multipliers = list( "move" = 1.0, "accuracy" = 1.0, - "cooldown" = 1 + "cooldown" = 1, ) //Changes how much damage the vehicle takes @@ -156,7 +156,8 @@ "bullet" = 1.0, "explosive" = 1.0, "blunt" = 1.0, - "abstract" = 1.0) //abstract for when you just want to hurt it + "abstract" = 1.0, + ) //abstract for when you just want to hurt it // This is more important than you think. // Explosive waves can propagate through the vehicle and hit it multiple times diff --git a/code/modules/vehicles/tank/tank.dm b/code/modules/vehicles/tank/tank.dm index 95e8a848bb10..8a0a9b626104 100644 --- a/code/modules/vehicles/tank/tank.dm +++ b/code/modules/vehicles/tank/tank.dm @@ -50,7 +50,7 @@ /obj/item/hardpoint/armor/paladin, /obj/item/hardpoint/armor/snowplow, /obj/item/hardpoint/locomotion/treads, - /obj/item/hardpoint/locomotion/treads/robust + /obj/item/hardpoint/locomotion/treads/robust, ) seats = list( @@ -68,16 +68,16 @@ /obj/vehicle/multitile/proc/get_status_info, /obj/vehicle/multitile/proc/switch_hardpoint, /obj/vehicle/multitile/proc/open_controls_guide, - /obj/vehicle/multitile/proc/name_vehicle + /obj/vehicle/multitile/proc/name_vehicle, ), VEHICLE_DRIVER = list( /obj/vehicle/multitile/proc/toggle_door_lock, - /obj/vehicle/multitile/proc/activate_horn + /obj/vehicle/multitile/proc/activate_horn, ), VEHICLE_GUNNER = list( /obj/vehicle/multitile/proc/cycle_hardpoint, /obj/vehicle/multitile/proc/toggle_gyrostabilizer, - /obj/vehicle/multitile/proc/toggle_shift_click + /obj/vehicle/multitile/proc/toggle_shift_click, ) ) @@ -88,7 +88,7 @@ "bullet" = 0.4, "explosive" = 0.8, "blunt" = 0.8, - "abstract" = 1 + "abstract" = 1, ) explosive_resistance = 400 @@ -198,7 +198,7 @@ vehicle_type = /obj/vehicle/multitile/tank hardpoints = list( - /obj/item/hardpoint/holder/tank_turret + /obj/item/hardpoint/holder/tank_turret, ) var/list/turret_hardpoints = list() @@ -221,7 +221,7 @@ /obj/effect/vehicle_spawner/tank/plain hardpoints = list( /obj/item/hardpoint/holder/tank_turret, - /obj/item/hardpoint/locomotion/treads + /obj/item/hardpoint/locomotion/treads, ) //PRESET: no hardpoints @@ -239,12 +239,12 @@ /obj/item/hardpoint/support/artillery_module, /obj/item/hardpoint/armor/paladin, /obj/item/hardpoint/holder/tank_turret, - /obj/item/hardpoint/locomotion/treads + /obj/item/hardpoint/locomotion/treads, ) turret_hardpoints = list( /obj/item/hardpoint/primary/cannon, - /obj/item/hardpoint/secondary/m56cupola + /obj/item/hardpoint/secondary/m56cupola, ) /obj/effect/vehicle_spawner/tank/decrepit/spawn_vehicle(obj/vehicle/multitile/spawning) @@ -260,12 +260,12 @@ /obj/item/hardpoint/support/artillery_module, /obj/item/hardpoint/armor/paladin, /obj/item/hardpoint/holder/tank_turret, - /obj/item/hardpoint/locomotion/treads + /obj/item/hardpoint/locomotion/treads, ) turret_hardpoints = list( /obj/item/hardpoint/primary/cannon, - /obj/item/hardpoint/secondary/m56cupola + /obj/item/hardpoint/secondary/m56cupola, ) //PRESET: minigun kit @@ -274,12 +274,12 @@ /obj/item/hardpoint/support/weapons_sensor, /obj/item/hardpoint/armor/ballistic, /obj/item/hardpoint/holder/tank_turret, - /obj/item/hardpoint/locomotion/treads + /obj/item/hardpoint/locomotion/treads, ) turret_hardpoints = list( /obj/item/hardpoint/primary/minigun, - /obj/item/hardpoint/secondary/small_flamer + /obj/item/hardpoint/secondary/small_flamer, ) //PRESET: dragon flamer kit @@ -288,12 +288,12 @@ /obj/item/hardpoint/support/overdrive_enhancer, /obj/item/hardpoint/armor/ballistic, /obj/item/hardpoint/holder/tank_turret, - /obj/item/hardpoint/locomotion/treads + /obj/item/hardpoint/locomotion/treads, ) turret_hardpoints = list( /obj/item/hardpoint/primary/flamer, - /obj/item/hardpoint/secondary/grenade_launcher + /obj/item/hardpoint/secondary/grenade_launcher, ) //PRESET: autocannon kit @@ -302,10 +302,10 @@ /obj/item/hardpoint/support/artillery_module, /obj/item/hardpoint/armor/ballistic, /obj/item/hardpoint/holder/tank_turret, - /obj/item/hardpoint/locomotion/treads + /obj/item/hardpoint/locomotion/treads, ) turret_hardpoints = list( /obj/item/hardpoint/primary/autocannon, - /obj/item/hardpoint/secondary/towlauncher + /obj/item/hardpoint/secondary/towlauncher, ) diff --git a/code/modules/vehicles/van/van.dm b/code/modules/vehicles/van/van.dm index 3bbd8a8ee901..b16dbacce032 100644 --- a/code/modules/vehicles/van/van.dm +++ b/code/modules/vehicles/van/van.dm @@ -266,7 +266,7 @@ //PRESET: wheels installed, destroyed /obj/effect/vehicle_spawner/van/decrepit hardpoints = list( - /obj/item/hardpoint/locomotion/van_wheels + /obj/item/hardpoint/locomotion/van_wheels, ) /obj/effect/vehicle_spawner/van/decrepit/spawn_vehicle(obj/vehicle/multitile/spawning) @@ -279,7 +279,7 @@ //PRESET: wheels installed /obj/effect/vehicle_spawner/van/fixed hardpoints = list( - /obj/item/hardpoint/locomotion/van_wheels + /obj/item/hardpoint/locomotion/van_wheels, ) /obj/effect/vehicle_spawner/van/fixed/spawn_vehicle(obj/vehicle/multitile/spawning)