[MIRROR] Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use (#2039)

* Beam Rifle Zooming Rework + Click catcher memes + bunch of other random stuff that players won't use

* Fixes beam rifle indent error

* Projectile target check hit code now uses a proc for resharing

* Update beam_rifle.dm

* Delete beam_rifle.dm.rej

* Changes clickcatcher to dynamically scale based on view range rather than making 1 tile for each tile viewed

* Update turf.dm

* Update turf.dm

* Delete click.dm.rej

* Update click.dm

* fxies

* woops

* Update turf.dm

* the actual rifle

* dumb clickcatcher

* actions
This commit is contained in:
CitadelStationBot
2017-08-03 06:12:27 -07:00
committed by kevinz000
parent 1b22c5fe0c
commit d4f15ff6da
15 changed files with 485 additions and 175 deletions
+16 -5
View File
@@ -432,14 +432,26 @@
/obj/screen/click_catcher
icon = 'icons/mob/screen_gen.dmi'
icon_state = "click_catcher"
icon_state = "flash"
plane = CLICKCATCHER_PLANE
mouse_opacity = 2
screen_loc = "CENTER"
/obj/screen/click_catcher/New()
..()
transform = matrix(200, 0, 0, 0, 200, 0)
/obj/screen/click_catcher/proc/UpdateGreed(view_size_x = 7, view_size_y = 7)
var/icon/newicon = icon('icons/mob/screen_gen.dmi', "flash")
if(view_size_x > 16 || view_size_y > 16)
newicon.Scale((16 * 2 + 1) * world.icon_size,(16 * 2 + 1) * world.icon_size)
icon = newicon
var/tx = view_size_x/16
var/ty = view_size_y/16
var/matrix/M = new
M.Scale(tx, ty)
transform = M
screen_loc = "CENTER-16,CENTER-16"
else
screen_loc = "CENTER-[view_size_x],CENTER-[view_size_y]"
newicon.Scale((view_size_x * 2 + 1) * world.icon_size,(view_size_y * 2 + 1) * world.icon_size)
icon = newicon
/obj/screen/click_catcher/Click(location, control, params)
var/list/modifiers = params2list(params)
@@ -453,7 +465,6 @@
T.Click(location, control, params)
. = 1
/* MouseWheelOn */
/mob/proc/MouseWheelOn(atom/A, delta_x, delta_y, params)