From 8645a0b0ef099bb51a07339d6ccc83620bc0836d Mon Sep 17 00:00:00 2001 From: IAmBigCoat Date: Wed, 5 Jun 2019 01:49:58 -0400 Subject: [PATCH 1/2] Added warnings to the medbeam gun re: stream-crossing --- code/datums/uplink_item.dm | 2 +- code/modules/projectiles/guns/medbeam.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 3f3c394a7e6..152880e2509 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -1351,7 +1351,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/device_tools/medgun name = "Medbeam Gun" - desc = "Medical Beam Gun, useful in prolonged firefights." + desc = "Medical Beam Gun, useful in prolonged firefights. DO NOT CROSS THE BEAMS. Crossing the beams or attaching two beams to one target will have explosive consequences." item = /obj/item/gun/medbeam reference = "MBG" cost = 15 diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm index d77621051e2..ad3ac6cf888 100644 --- a/code/modules/projectiles/guns/medbeam.dm +++ b/code/modules/projectiles/guns/medbeam.dm @@ -1,6 +1,6 @@ /obj/item/gun/medbeam name = "Medical Beamgun" - desc = "Delivers medical nanites in a focused beam." + desc = "Delivers volatile medical nanites in a focused beam. Don't cross the beams!" icon = 'icons/obj/chronos.dmi' icon_state = "chronogun" item_state = "chronogun" @@ -92,6 +92,7 @@ return 0 for(var/obj/effect/ebeam/medical/B in turf)// Don't cross the str-beams! if(B.owner != current_beam) + turf.visible_message("The medbeams cross and EXPLODE!") explosion(B.loc,0,3,5,8) qdel(dummy) return 0 From f04a0a4c53ac350d957046ea771d58f8ab606470 Mon Sep 17 00:00:00 2001 From: IAmBigCoat Date: Wed, 5 Jun 2019 17:07:09 -0400 Subject: [PATCH 2/2] Added proposed uplink description change. --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 152880e2509..d7f446bdaae 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -1351,7 +1351,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) /datum/uplink_item/device_tools/medgun name = "Medbeam Gun" - desc = "Medical Beam Gun, useful in prolonged firefights. DO NOT CROSS THE BEAMS. Crossing the beams or attaching two beams to one target will have explosive consequences." + desc = "Medical Beam Gun, useful in prolonged firefights. DO NOT CROSS THE BEAMS. Crossing beams with another medbeam or attaching two beams to one target will have explosive consequences." item = /obj/item/gun/medbeam reference = "MBG" cost = 15