mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-14 00:23:29 +01:00
Merge pull request #11126 from Arkatos1/Syndie_Borg_Medibeam
Adds Medical Beamgun to a Syndicate Medical Cyborg
This commit is contained in:
@@ -429,6 +429,7 @@
|
||||
modules += new /obj/item/bonesetter(src)
|
||||
modules += new /obj/item/surgicaldrill(src)
|
||||
modules += new /obj/item/gripper/medical(src)
|
||||
modules += new /obj/item/gun/medbeam(src)
|
||||
modules += new /obj/item/melee/energy/sword/cyborg/saw(src) //Energy saw -- primary weapon
|
||||
modules += new /obj/item/card/emag(src)
|
||||
modules += new /obj/item/crowbar/cyborg(src)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user