shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14971 from Arturlang/nanite_updates

Browse Source 
Ports update appearance
This commit is contained in:
silicons
2021-08-08 04:06:18 -07:00
committed by GitHub
parent 9457b6b3e2 feac8568b6
commit 59e541d2e7
218 changed files with 2251 additions and 1898 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/misc/beam_rifle.dm
+2 -2
View File
@@ -280,7 +280,7 @@
/obj/item/gun/energy/beam_rifle/onMouseDown(object, location, params, mob/mob)
if(istype(mob))
set_user(mob)
if(istype(object, /obj/screen) && !istype(object, /obj/screen/click_catcher))
if(istype(object, /atom/movable/screen) && !istype(object, /atom/movable/screen/click_catcher))
return
if((object in mob.contents) || (object == mob))
return
@@ -288,7 +288,7 @@
return ..()
/obj/item/gun/energy/beam_rifle/onMouseUp(object, location, params, mob/M)
if(istype(object, /obj/screen) && !istype(object, /obj/screen/click_catcher))
if(istype(object, /atom/movable/screen) && !istype(object, /atom/movable/screen/click_catcher))
return
process_aim()
if(fire_check() && can_trigger_gun(M))