Skip to content

Commit

Permalink
Rewords many event announcements & some medical things (#6778)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request


![noteoth2](https://github.com/user-attachments/assets/21bd3bb3-4825-4239-955f-ffae09a1c258)


<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## 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.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: tweaked many IC event announcements
tweak: small medical terminology fixes
tweak: cult and meteor alarm volume has been reduced
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
AlphaM01 authored Oct 3, 2024
1 parent 84812a4 commit 29be536
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/autopsy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
4 changes: 2 additions & 2 deletions code/modules/events/carp_migration.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/events/cult.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/dust.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/events/gravity.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
2 changes: 1 addition & 1 deletion code/modules/events/meteors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
8 changes: 4 additions & 4 deletions code/modules/events/rogue_drones.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion nano/templates/dish_incubator.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</div>
<div class='itemContent'>
<span class='{{:data.can_breed_virus ? "good" : "average"}}'>
{{:!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'}}
</span>
{{if data.blood_already_infected}}
<br/>
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/DishIncubator.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export const DishIncubator = (props, context) => {
</ProgressBar>
</LabeledList.Item>
<LabeledList.Item label="Breeding Environment" color={can_breed_virus ? 'good' : 'average'}>
{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 ? (
<Box color="bad">CAUTION: Viral infection detected in blood sample.</Box>
) : null}
Expand Down

0 comments on commit 29be536

Please sign in to comment.