cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes laser pointer crashing [MDB IGNORE] (#14454)

Browse Source 
* Fixes laser pointer crashing (#67907)

Fixes #67885.

I don't know if this works because I can't reproduce locally, but I can reproduce on servers so I'll let you know next Sybil round It works

* Fixes laser pointer crashing

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-06-23 06:12:26 +01:00
committed by GitHub
co-authored by Mothblocks
parent 7c354bb6c3
commit 710c686283
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/wiremod/components/action/laserpointer.dm
+6 -13
View File
@@ -1,4 +1,3 @@
/**
* # laser pointer Component
*
@@ -10,9 +9,6 @@
category = "Action"
circuit_flags = CIRCUIT_FLAG_INPUT_SIGNAL|CIRCUIT_FLAG_OUTPUT_SIGNAL
/// The Laser Pointer Variables
var/turf/pointer_loc
/// The input port
var/datum/port/input/target_input
var/datum/port/input/image_pixel_x = 0
@@ -47,7 +43,7 @@
var/atom/target = target_input.value
var/atom/movable/shell = parent.shell
var/turf/targloc = get_turf(target)
var/turf/target_location = get_turf(target)
var/pointer_icon_state = lasercolour_option.value
@@ -56,20 +52,17 @@
if(get_dist(current_turf, target) > max_range || current_turf.z != target.z)
return
/// only has cyborg flashing since felinid moving spikes time dilation when spammed and the other two features of laserpointers would be unbalanced when spammed
// only has cyborg flashing since felinid moving spikes time dilation when spammed and the other two features of laserpointers would be unbalanced when spammed
if(iscyborg(target))
var/mob/living/silicon/silicon = target
log_combat(shell, silicon, "shone in the sensors", src)
silicon.flash_act(affect_silicon = 1) /// no stunning, just a blind
silicon.flash_act(affect_silicon = TRUE) /// no stunning, just a blind
to_chat(silicon, span_danger("Your sensors were overloaded by a weakened laser shone by [shell]!"))
///laserpointer image
var/image/laser_location = image('icons/obj/guns/projectiles.dmi',targloc,"[pointer_icon_state]_laser",10)
var/image/laser_location = image('icons/obj/guns/projectiles.dmi',target_location,"[pointer_icon_state]_laser",10)
laser_location.pixel_x = clamp(target.pixel_x + image_pixel_x.value,-15,15)
laser_location.pixel_y = clamp(target.pixel_y + image_pixel_y.value,-15,15)
flick_overlay_view(laser_location, targloc, 10)
target_location.add_overlay(laser_location)
addtimer(CALLBACK(target_location, /atom/proc/cut_overlay, laser_location), 1 SECONDS)