From 65e39085d6f787d5ffc11e71b1b17c1bae2d57f1 Mon Sep 17 00:00:00 2001 From: cursor Date: Fri, 30 Jun 2023 21:26:08 +0100 Subject: [PATCH 1/5] Adds/Changes various machine descriptions --- code/game/machinery/cryo.dm | 1 + code/game/machinery/vending/vendor_types/medical.dm | 2 +- code/modules/cm_tech/implements/railgun.dm | 1 + .../reagents/chemistry_machinery/chem_dispenser.dm | 9 ++++++++- code/modules/shuttle/computers/dropship_computer.dm | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 435976668577..9ba7807265e8 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -2,6 +2,7 @@ /obj/structure/machinery/cryo_cell name = "cryo cell" + desc = "A donation from the old A.W project, using cryogenic technology, it slowly heals whomever is inside the tube." icon = 'icons/obj/structures/machinery/cryogenics2.dmi' icon_state = "cell" density = FALSE diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index 5815f60b2e0c..c10ff7404ad1 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -272,7 +272,7 @@ /obj/structure/machinery/cm_vending/sorted/medical/blood name = "\improper MM Blood Dispenser" - desc = "Marine Med brand Blood Pack Dispensary" + desc = "The Marine Med Brand Blood Pack Dispensary is the premier, top of the line blood dispenser of 2105! Get yours today!" //Don't update this year, the joke is it's old. icon_state = "blood" wrenchable = TRUE hackable = TRUE diff --git a/code/modules/cm_tech/implements/railgun.dm b/code/modules/cm_tech/implements/railgun.dm index b0d91515419f..b69f9a9d13a8 100644 --- a/code/modules/cm_tech/implements/railgun.dm +++ b/code/modules/cm_tech/implements/railgun.dm @@ -6,6 +6,7 @@ GLOBAL_DATUM(railgun_eye_location, /datum/coords) /obj/effect/landmark/railgun_computer name = "Railgun computer landmark" + desc = "A computer with an orange interface, it's idly blinking, awaiting a password." /obj/effect/landmark/railgun_computer/Initialize(mapload, ...) . = ..() diff --git a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm index 8de20ca2b79a..b38d8b5ed6ff 100644 --- a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm @@ -1,5 +1,6 @@ /obj/structure/machinery/chem_dispenser - name = "chem dispenser" + name = "chemical dispenser" + desc = "A complex machine for mixing elements into chemicals. A Wey-Yu product." density = TRUE anchored = TRUE icon = 'icons/obj/structures/machinery/science_machines.dmi' @@ -21,6 +22,12 @@ "sodium","aluminum","silicon","phosphorus","sulfur","chlorine","potassium","iron", "copper","mercury","radium","water","ethanol","sugar","sulphuric acid") +/obj/structure/machinery/chem_dispenser/get_examine_text(mob/user) + . = ..() + if(in_range(user, src) || istype(user, /mob/dead/observer)) + var/charge = round((energy / max_energy) * 100) + . += SPAN_NOTICE("The charge meter reads [charge]%") + /obj/structure/machinery/chem_dispenser/medbay network = "Medbay" diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index ea4a7fdbc79d..a904b646d7b9 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -1,6 +1,6 @@ /obj/structure/machinery/computer/shuttle/dropship/flight name = "dropship navigation computer" - desc = "flight computer for dropship" + desc = "A flight computer than can be used for autopilot or long range flights." icon = 'icons/obj/structures/machinery/shuttle-parts.dmi' icon_state = "console" req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) From 5456075434fc782dbf3112f32f66d1ab590668c3 Mon Sep 17 00:00:00 2001 From: cursor Date: Fri, 30 Jun 2023 23:01:41 +0100 Subject: [PATCH 2/5] Update chem_dispenser.dm --- code/modules/reagents/chemistry_machinery/chem_dispenser.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm index b38d8b5ed6ff..09d46aa8c053 100644 --- a/code/modules/reagents/chemistry_machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry_machinery/chem_dispenser.dm @@ -22,12 +22,6 @@ "sodium","aluminum","silicon","phosphorus","sulfur","chlorine","potassium","iron", "copper","mercury","radium","water","ethanol","sugar","sulphuric acid") -/obj/structure/machinery/chem_dispenser/get_examine_text(mob/user) - . = ..() - if(in_range(user, src) || istype(user, /mob/dead/observer)) - var/charge = round((energy / max_energy) * 100) - . += SPAN_NOTICE("The charge meter reads [charge]%") - /obj/structure/machinery/chem_dispenser/medbay network = "Medbay" From c65856ca9889d85c85f3ccdffff447ef66940c74 Mon Sep 17 00:00:00 2001 From: Cursor <102828457+theselfish@users.noreply.github.com> Date: Thu, 6 Jul 2023 20:02:46 +0100 Subject: [PATCH 3/5] Update code/game/machinery/cryo.dm Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> --- code/game/machinery/cryo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 9ba7807265e8..afcc9686cff5 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -2,7 +2,7 @@ /obj/structure/machinery/cryo_cell name = "cryo cell" - desc = "A donation from the old A.W project, using cryogenic technology, it slowly heals whomever is inside the tube." + desc = "A donation from the old A.W. project, using cryogenic technology. It slowly heals whoever is inside the tube." icon = 'icons/obj/structures/machinery/cryogenics2.dmi' icon_state = "cell" density = FALSE From bb4a42efc2c245a16dd7d9097581544fa3e18a40 Mon Sep 17 00:00:00 2001 From: Cursor <102828457+theselfish@users.noreply.github.com> Date: Thu, 6 Jul 2023 20:02:56 +0100 Subject: [PATCH 4/5] Update code/modules/shuttle/computers/dropship_computer.dm Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> --- code/modules/shuttle/computers/dropship_computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index a904b646d7b9..50449b32fcb9 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -1,6 +1,6 @@ /obj/structure/machinery/computer/shuttle/dropship/flight name = "dropship navigation computer" - desc = "A flight computer than can be used for autopilot or long range flights." + desc = "A flight computer that can be used for autopilot or long-range flights." icon = 'icons/obj/structures/machinery/shuttle-parts.dmi' icon_state = "console" req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_DROPSHIP) From 789542bd557da84057364137bf97c5bf36e37b9c Mon Sep 17 00:00:00 2001 From: Cursor <102828457+theselfish@users.noreply.github.com> Date: Thu, 6 Jul 2023 20:03:06 +0100 Subject: [PATCH 5/5] Update code/game/machinery/vending/vendor_types/medical.dm Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com> --- code/game/machinery/vending/vendor_types/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index c10ff7404ad1..70ac7701973b 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -272,7 +272,7 @@ /obj/structure/machinery/cm_vending/sorted/medical/blood name = "\improper MM Blood Dispenser" - desc = "The Marine Med Brand Blood Pack Dispensary is the premier, top of the line blood dispenser of 2105! Get yours today!" //Don't update this year, the joke is it's old. + desc = "The Marine Med Brand Blood Pack Dispensary is the premier, top-of-the-line blood dispenser of 2105! Get yours today!" //Don't update this year, the joke is it's old. icon_state = "blood" wrenchable = TRUE hackable = TRUE