From d4f3cf4eaf4ce86ff6cf05792d936e229d57fa1d Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Sun, 14 Feb 2021 03:01:21 -0700 Subject: [PATCH] ok --- code/game/objects/items/weapons/melee/misc.dm | 2 +- code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 8fd9a662a47..065d56e57f4 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -64,7 +64,7 @@ // Randomizes color /obj/item/melee/umbrella/random/Initialize(mapload) - add_atom_colour("#"+get_random_colour(), COLOUR_PRIORITY_FIXED) + add_atom_colour("#"+get_random_colour(), FIXED_COLOUR_PRIORITY) return ..() /obj/item/melee/cursedblade diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index f17022512ef..a5275adda05 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -52,7 +52,7 @@ if(propelled) return if(pulling_along) - if(get_dist(src, pulling_along) > 1)) + if(get_dist(src, pulling_along) > 1) pulling_along = null user.pulledby = null if(user == pulling_along) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 55056e96aea..171c8053f2b 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -699,7 +699,7 @@ recoil = round(recoil*zoom_amount+1) //recoil is worse when looking through a scope //make sure accuracy and recoil are reset regardless of how the item is unzoomed. -/obj/item/gun/zoom() +/obj/item/gun/zoom(tileoffset = 14, viewsize = 9, mob/user = usr) ..() if(!zoom) accuracy = initial(accuracy)