diff --git a/code/game/objects/items/devices/drop_targeter/orbital_drops.dm b/code/game/objects/items/devices/drop_targeter/orbital_drops.dm index 8d6fe660825..f2a011121a2 100644 --- a/code/game/objects/items/devices/drop_targeter/orbital_drops.dm +++ b/code/game/objects/items/devices/drop_targeter/orbital_drops.dm @@ -68,7 +68,7 @@ emagged = TRUE // to let people drop it in the station drop_message_emagged = "NanoTrasen combat drones coming your way! Happy hunting!" - announcer_name = "NDV Icarus" + announcer_name = "SCCV Horizon Sensor Array" map = null diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index 4005a0831e3..cdf95f993a1 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -25,10 +25,10 @@ var/announcement = "" var/soundfile = 'sound/AI/carp_migration.ogg' if(severity == EVENT_LEVEL_MAJOR && deploy_drones) - announcement = "A massive migration of unknown biological entities has been detected near [location_name()], please stand-by. The NDV Icarus has dispatched combat drones to assist." + announcement = "A massive migration of unknown biological entities has been detected near [location_name()], please stand-by." soundfile = 'sound/AI/massivespacecarp.ogg' else - announcement = "Unknown biological [length(spawned_carp) == 1 ? "entity has" : "entities have"] been detected near [location_name()], please stand-by.[severity == EVENT_LEVEL_MODERATE ? " The NDV Icarus has dispatched combat drones to assist." : ""]" + announcement = "Unknown biological [length(spawned_carp) == 1 ? "entity has" : "entities have"] been detected near [location_name()], please stand-by." command_announcement.Announce(announcement, "Lifesign Alert", new_sound = soundfile) break diff --git a/code/modules/mob/living/simple_animal/hostile/icarus_drone.dm b/code/modules/mob/living/simple_animal/hostile/icarus_drone.dm index 34f536a7f07..4fb88e1bdad 100644 --- a/code/modules/mob/living/simple_animal/hostile/icarus_drone.dm +++ b/code/modules/mob/living/simple_animal/hostile/icarus_drone.dm @@ -1,6 +1,6 @@ /mob/living/simple_animal/hostile/icarus_drone name = "combat drone" - desc = "An automated combat drone armed with state of the art weaponry and shielding. This one has the markings of the NDV Icarus on the side." + desc = "An automated combat drone armed with state of the art weaponry and shielding. This one has the markings of a drone carrier on the side." desc_fluff = "Produced by NanoTrasen, these combat drones are often carried and deployed by NDV Drone Carriers to protect local assets." icon_state = "drone3" icon_living = "drone3" diff --git a/html/changelogs/mattatlas-ndvicarus.yml b/html/changelogs/mattatlas-ndvicarus.yml new file mode 100644 index 00000000000..be3d6bd74e2 --- /dev/null +++ b/html/changelogs/mattatlas-ndvicarus.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Removed leftover mentions of the Icarus." diff --git a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm index fe1c41e5682..60756577be3 100644 --- a/maps/sccv_horizon/code/sccv_horizon_shuttles.dm +++ b/maps/sccv_horizon/code/sccv_horizon_shuttles.dm @@ -65,7 +65,7 @@ ) landmark_transition = "nav_skipjack_interim" - announcer = "NDV Icarus" + announcer = "SCCV Horizon Sensor Array" arrival_message = "Attention, the radar systems have detected a small spacecraft approaching the ship's perimeter." departure_message = "Attention, the radar systems have detected a small spacecraft leaving the ship's perimeter. " @@ -115,7 +115,7 @@ ) landmark_transition = "nav_merc_interim" - announcer = "NDV Icarus" + announcer = "SCCV Horizon Sensor Array" arrival_message = "Attention, the radar systems have detected a spacecraft approaching the ship's perimeter." departure_message = "Attention, the radar systems have detected a spacecraft leaving the ship's perimeter. "