From 29be5360ce6feec13d8f3edc8bc4c696e0c5ff47 Mon Sep 17 00:00:00 2001 From: AlphaM01 <33434925+AlphaM01@users.noreply.github.com> Date: Thu, 3 Oct 2024 11:38:32 -0300 Subject: [PATCH] Rewords many event announcements & some medical things (#6778) ## About The Pull Request ![noteoth2](https://github.com/user-attachments/assets/21bd3bb3-4825-4239-955f-ffae09a1c258) ## Why It's Good For The Game Mappers thought their reign would last a thousand years, and hardcoded extremely specific announcements that make no sense in new maps. ## Changelog :cl: tweak: tweaked many IC event announcements tweak: small medical terminology fixes tweak: cult and meteor alarm volume has been reduced /:cl: --- code/game/objects/items/weapons/autopsy.dm | 2 +- code/modules/events/carp_migration.dm | 4 ++-- code/modules/events/cult.dm | 4 ++-- code/modules/events/dust.dm | 2 +- code/modules/events/gravity.dm | 2 +- code/modules/events/meteors.dm | 2 +- code/modules/events/rogue_drones.dm | 8 ++++---- nano/templates/dish_incubator.tmpl | 2 +- tgui/packages/tgui/interfaces/DishIncubator.js | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/weapons/autopsy.dm b/code/game/objects/items/weapons/autopsy.dm index 937fa123221..5a893235ee3 100644 --- a/code/game/objects/items/weapons/autopsy.dm +++ b/code/game/objects/items/weapons/autopsy.dm @@ -3,7 +3,7 @@ //please preference put stuff where it's easy to find - C // todo: redo autopsy /obj/item/autopsy_scanner - name = "biopsy scanner" + name = "autopsy scanner" desc = "Extracts information on wounds." icon = 'icons/obj/autopsy_scanner.dmi' icon_state = "" diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index 8459e76d4d4..451ebc2e333 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -36,9 +36,9 @@ GLOBAL_LIST_INIT(carp_count,list())// a list of Z levels (string), associated wi /datum/event/carp_migration/announce() if(severity > EVENT_LEVEL_MODERATE) - command_announcement.Announce("A massive migration of unknown biological entities has been detected in the vicinity of the [location_name()]. Exercise external operations with caution.") + command_announcement.Announce("A massive migration of space-borne biological entities has been detected in the vicinity of the [location_name()]. Exercise external operations with caution.") else - command_announcement.Announce("A large migration of unknown biological entities has been detected in the vicinity of the [location_name()]. Caution is advised.") + command_announcement.Announce("A large migration of space-borne biological entities has been detected in the vicinity of the [location_name()]. Caution is advised.") /datum/event/carp_migration/proc/spawn_carp(var/num_groups, var/group_size_min, var/group_size_max, var/dir, var/speed) diff --git a/code/modules/events/cult.dm b/code/modules/events/cult.dm index f7f6f4ab043..cba2b5e3892 100644 --- a/code/modules/events/cult.dm +++ b/code/modules/events/cult.dm @@ -31,7 +31,7 @@ endWhen = 45 /datum/event/cult/announce() - command_announcement.Announce("Attention [station_name()], unknown humanoid and non-humanoid entities are warping onto the ships! Advise immediate removal of these intruders before productivity aboard gets hindered!", "Screaming Signals Detected", new_sound = sound('sound/effects/c_alarm.mp3',volume=4)) + command_announcement.Announce("Attention [station_name()], unknown humanoid and non-humanoid entities have been detected warping into the facility! We advise crew move to a secure area immediately!", "Screaming Signals Detected", new_sound = sound('sound/effects/c_alarm.mp3',volume=2)) /datum/event/cult/start() @@ -114,7 +114,7 @@ if(istype(victim, /obj/overmap/entity/visitable/ship/talon)) command_announcement.Announce("Attention ITV Talon. You have run into a hostile sub-sector. High potential for humanoid and non-humanoid entities to warp on your ship. Brace.", "Screaming Signals Intercepted") else - command_announcement.Announce("Attention [station_name()], the ship has run into a hostile sub-sector and reports of humanoid and non-humanoid entities are warping onto the ships! Advise immediate removal of these intruders before productivy aboard gets hindered!", "Screaming Signals Intercepted", new_sound = 'sound/effects/c_alarm.mp3')//,volume=4) + command_announcement.Announce("Attention [station_name()], the ship has run into a hostile sub-sector and humanoid and non-humanoid signatures have been detected warping aboard! Expect boarders imminently!", "Screaming Signals Intercepted", new_sound = 'sound/effects/c_alarm.mp3')//,volume=4) return /datum/event/cult/overmap/start() // override - cancel if not main ship since it doesn't properly target the actual triggering ship diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index e393bb80918..bb6e9356e6e 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -10,7 +10,7 @@ if(victim) command_announcement.Announce("The [location_name()] is now passing through a belt of space dust.", "[location_name()] Sensor Array") else - command_announcement.Announce("Debris resulting from activity on another nearby asteroid is approaching \the [location_name()]", "Dust Alert") + command_announcement.Announce("A micrometeoroid cloud has been detected approaching \the [location_name()]", "Dust Alert") /datum/event/dust/tick() if(prob(10)) diff --git a/code/modules/events/gravity.dm b/code/modules/events/gravity.dm index 1da87059c60..eb48450c3e8 100644 --- a/code/modules/events/gravity.dm +++ b/code/modules/events/gravity.dm @@ -34,4 +34,4 @@ if(A.z in zLevels) A.gravitychange(gravity_is_on, A) - command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored") + command_announcement.Announce("Gravity generators are again functioning within normal parameters. We apologize for the inconvenience.", "Gravity Restored") diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index 6d9ed24d776..61d75224407 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -27,7 +27,7 @@ /datum/event/meteor_wave/announce() switch(severity) if(EVENT_LEVEL_MAJOR) - command_announcement.Announce("Meteors have been detected on collision course with \the [location_name()].", "Meteor Alert", new_sound = sound('sound/effects/meteor_storm.ogg',volume=8)) + command_announcement.Announce("Meteors have been detected on collision course with \the [location_name()].", "Meteor Alert", new_sound = sound('sound/effects/meteor_storm.ogg',volume=2)) else command_announcement.Announce("\The [location_name()] is now in a meteor shower.", "Meteor Alert") diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm index 9c9cae60426..7c8732d8dd0 100644 --- a/code/modules/events/rogue_drones.dm +++ b/code/modules/events/rogue_drones.dm @@ -24,17 +24,17 @@ var/rng = rand(1,5) switch(rng) if(1) - msg = "A combat drone wing operating in close orbit above Sif has failed to return from a anti-piracy sweep. If any are sighted, \ + msg = "A combat drone wing operating within the sector has failed to return from a anti-piracy sweep. If any are sighted, \ approach with caution." if(2) - msg = "Contact has been lost with a combat drone wing in Sif orbit. If any are sighted in the area, approach with \ + msg = "Contact has been lost with a combat drone wing in the sector. If any are sighted in the area, approach with \ caution." if(3) - msg = "Unidentified hackers have targeted a combat drone wing deployed around Sif. If any are sighted in the area, approach with caution." + msg = "Unidentified hackers have targeted a combat drone wing deployed in this sector. If any are sighted in the area, approach with caution." if(4) msg = "A passing derelict ship's drone defense systems have just activated. If any are sighted in the area, use caution." if(5) - msg = "We're detecting a swarm of small objects approaching your station. Most likely a bunch of drones. Please exercise caution if you see any." + msg = "We're detecting a swarm of small objects approaching your station. Sensor returns indicate it may be a fleet of drones. Please exercise caution." command_announcement.Announce(msg, "Rogue drone alert") diff --git a/nano/templates/dish_incubator.tmpl b/nano/templates/dish_incubator.tmpl index ae887e6986e..6ba2ea4dcce 100644 --- a/nano/templates/dish_incubator.tmpl +++ b/nano/templates/dish_incubator.tmpl @@ -72,7 +72,7 @@
- {{:!data.dish_inserted ? 'N/A' : data.can_breed_virus ? 'Suitable' : 'No hemolytic samples detected'}} + {{:!data.dish_inserted ? 'N/A' : data.can_breed_virus ? 'Suitable' : 'No hematologic samples detected'}} {{if data.blood_already_infected}}
diff --git a/tgui/packages/tgui/interfaces/DishIncubator.js b/tgui/packages/tgui/interfaces/DishIncubator.js index 5d1924df04b..19f995ce060 100644 --- a/tgui/packages/tgui/interfaces/DishIncubator.js +++ b/tgui/packages/tgui/interfaces/DishIncubator.js @@ -114,7 +114,7 @@ export const DishIncubator = (props, context) => { - {dish_inserted ? (can_breed_virus ? 'Suitable' : 'No hemolytic samples detected') : 'N/A'} + {dish_inserted ? (can_breed_virus ? 'Suitable' : 'No hematologic samples detected') : 'N/A'} {blood_already_infected ? ( CAUTION: Viral infection detected in blood sample. ) : null}