Fixes beam crossing

Adds Medbeam gun to Nukeop Uplink
Adds Medbeam gun to ERT medic equipment
This commit is contained in:
AnturK
2015-12-11 20:44:53 +01:00
parent f333562223
commit ec85d5ceec
3 changed files with 16 additions and 5 deletions
+7
View File
@@ -698,6 +698,13 @@ var/list/uplink_items = list()
gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang)
surplus = 20
/datum/uplink_item/device_tools/medgun
name = "Medbeam Gun"
desc = "Medical Beam Gun, useful in prolonged firefights."
item = /obj/item/weapon/gun/medbeam
cost = 15
gamemodes = list(/datum/game_mode/nuclear)
// IMPLANTS
+2 -1
View File
@@ -104,7 +104,8 @@
/obj/item/weapon/melee/baton/loaded=1,\
/obj/item/clothing/mask/gas/sechailer=1,\
/obj/item/weapon/gun/energy/gun=1,\
/obj/item/weapon/reagent_containers/hypospray/combat=1)
/obj/item/weapon/reagent_containers/hypospray/combat=1,\
/obj/item/weapon/gun/medbeam=1)
/datum/outfit/ert/medic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
+7 -4
View File
@@ -94,9 +94,9 @@
if(!AM.CanPass(dummy,turf,1))
qdel(dummy)
return 0
for(var/obj/effect/overlay/beam/O in turf)// Don't cross the str-beams!
if(O.BeamSource!=user)
explosion(O.loc,0,3,5,8)
for(var/obj/effect/ebeam/medical/B in turf)// Don't cross the str-beams!
if(B.owner != current_beam)
explosion(B.loc,0,3,5,8)
qdel(dummy)
return 0
qdel(dummy)
@@ -111,4 +111,7 @@
return
/obj/item/weapon/gun/medbeam/proc/on_beam_relase(var/mob/living/target)
return
return
/obj/effect/ebeam/medical
name = "medical beam"