cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reallows Noscopes, Losing the weapon/Being stunned/Dying correctly unzooms you.

Browse Source
This commit is contained in:
Remie Richards
2015-12-11 15:10:09 +00:00
parent bc561789c2
commit 3b1afe46f2
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/projectile/sniper.dm
+20 -9
View File
@@ -25,16 +25,24 @@
azoom.rifle = src
/obj/item/weapon/gun/projectile/sniper_rifle/dropped(mob/living/user)
zoom(user,FALSE)
azoom.Remove(user)
/obj/item/weapon/gun/projectile/sniper_rifle/pickup(mob/living/user)
azoom.Grant(user)
/obj/item/weapon/gun/projectile/sniper_rifle/proc/zoom(mob/living/user)
/obj/item/weapon/gun/projectile/sniper_rifle/proc/zoom(mob/living/user, forced_zoom)
if(!user || !user.client)
return
zoomed = !zoomed
switch(forced_zoom)
if(FALSE)
zoomed = FALSE
if(TRUE)
zoomed = TRUE
else
zoomed = !zoomed
if(zoomed)
var/_x = 0
var/_y = 0
@@ -54,24 +62,27 @@
user.client.pixel_x = 0
user.client.pixel_y = 0
/obj/item/weapon/gun/projectile/sniper_rifle/can_shoot()
if(..())
if(zoomed)
return 1
return 0
/datum/action/sniper_zoom
name = "Zoom Sniper Rifle"
check_flags = AB_CHECK_ALIVE
check_flags = AB_CHECK_ALIVE|AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING
button_icon_state = "sniper_zoom"
var/obj/item/weapon/gun/projectile/sniper_rifle/rifle = null
/datum/action/sniper_zoom/Trigger()
rifle.zoom(owner)
/datum/action/sniper_zoom/IsAvailable()
. = ..()
if(!. && rifle)
rifle.zoom(owner, FALSE)
/datum/action/sniper_zoom/Remove(mob/living/L)
rifle.zoom(L, FALSE)
..()