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

Some LWAP (and other scoped weapons) fixes (#25775)

Browse Source 
* can't use lwap from lockers

* active hand flag

* rename SCOPE_CLICK_MIDDLE
This commit is contained in:
larentoun
2024-06-25 21:28:18 +00:00
committed by GitHub
parent 1166c3dcd3
commit 6b70c59c96
6 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/scope.dm
+12 -9
View File
@@ -12,20 +12,17 @@
var/item_action_type
/// Time to scope up, if you want the scope to take time to boot up. Used by the LWAP
var/time_to_scope
/// Do we let the user scope and click on the middle of their screen?
var/allow_middle_click = FALSE
/// Do we have the scope cancel on move?
var/movement_cancels_scope = FALSE
/// Flags for scoping. Check `code\__DEFINES\flags.dm`
var/flags
/datum/component/scope/Initialize(range_modifier = 1, zoom_method = ZOOM_METHOD_ITEM_ACTION, item_action_type = /datum/action/zoom, time_to_scope = 0, allow_middle_click = FALSE, movement_cancels_scope = FALSE)
/datum/component/scope/Initialize(range_modifier = 1, zoom_method = ZOOM_METHOD_ITEM_ACTION, item_action_type = /datum/action/zoom, time_to_scope = 0, flags)
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
src.range_modifier = range_modifier
src.zoom_method = zoom_method
src.item_action_type = item_action_type
src.time_to_scope = time_to_scope
src.allow_middle_click = allow_middle_click
src.movement_cancels_scope = movement_cancels_scope
src.flags = flags
/datum/component/scope/Destroy(force)
@@ -156,15 +153,21 @@
if(HAS_TRAIT(user, TRAIT_SCOPED))
to_chat(user, "<span class='warning'>You are already zoomed in!</span>")
return
if((flags & SCOPE_TURF_ONLY) && !isturf(user.loc))
to_chat(user, "<span class='warning'>There is not enough space to zoom in!</span>")
return
if((flags & SCOPE_NEED_ACTIVE_HAND) && user.get_active_hand() != parent)
to_chat(user, "<span class='warning'>You need to hold [parent] in your active hand to zoom in!</span>")
return
if(time_to_scope)
if(!do_after_once(user, time_to_scope, target = parent))
return
user.playsound_local(parent, 'sound/weapons/scope.ogg', 75, TRUE)
tracker = user.overlay_fullscreen("scope", /atom/movable/screen/fullscreen/stretch/cursor_catcher/scope, istype(parent, /obj/item/gun))
tracker.assign_to_mob(user, range_modifier)
if(movement_cancels_scope)
if(flags & SCOPE_MOVEMENT_CANCELS)
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
if(allow_middle_click)
if(flags & SCOPE_CLICK_MIDDLE)
RegisterSignal(tracker, COMSIG_CLICK, PROC_REF(generic_click))
tracker_owner_ckey = user.ckey
if(user.is_holding(parent))