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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

Browse Source 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
This commit is contained in:
Mark van Alphen
2019-04-04 22:04:55 +02:00
parent 33d6017e28 aa44ffa74e
commit a21ec0f30b
73 changed files with 846 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/medbeam.dm
+4 -4
View File
@@ -54,8 +54,8 @@
feedback_add_details("gun_fired","[type]")
/obj/item/gun/medbeam/process()
var/mob/living/carbon/human/H = loc
if(!istype(H))
var/source = loc
if(!ishuman(source) && !isrobot(source))
LoseTarget()
return
@@ -68,9 +68,9 @@
last_check = world.time
if(get_dist(H,current_target)>max_range || !los_check(H,current_target))
if(get_dist(source,current_target)>max_range || !los_check(source,current_target))
LoseTarget()
to_chat(H, "<span class='warning'>You lose control of the beam!</span>")
to_chat(source, "<span class='warning'>You lose control of the beam!</span>")
return
if(current_target)