This commit is contained in:
silicons
2021-02-14 03:01:21 -07:00
parent 1ddccb2d98
commit d4f3cf4eaf
3 changed files with 3 additions and 3 deletions
@@ -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
@@ -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)
+1 -1
View File
@@ -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)