From 451c477e4c99e5ebb45c349a6d52724eacf7fd44 Mon Sep 17 00:00:00 2001
From: Neerti <neerti01@gmail.com>
Date: Mon, 21 Dec 2015 04:01:05 -0500
Subject: [PATCH] Tweaks event text to fit with the lore better. Adds more
 informative text for vending machines. Removes RNG viruses.

---
 code/controllers/shuttle_controller.dm    |  6 +++---
 code/game/gamemodes/heist/heist.dm        |  2 +-
 code/game/objects/items/toys.dm           |  2 +-
 code/modules/economy/TradeDestinations.dm |  8 --------
 code/modules/events/brand_intelligence.dm |  3 ++-
 code/modules/events/dust.dm               |  4 ++--
 code/modules/events/electrical_storm.dm   |  2 +-
 code/modules/events/event_dynamic.dm      |  1 -
 code/modules/events/gravity.dm            |  3 ++-
 code/modules/events/infestation.dm        | 21 ++++++++-----------
 code/modules/events/meteors.dm            |  8 ++++----
 code/modules/events/money_lotto.dm        |  2 +-
 code/modules/events/rogue_drones.dm       | 25 +++++++++++++++--------
 code/modules/events/wallrot.dm            |  2 +-
 polaris.dme                               |  2 --
 15 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm
index 807f97cfe5..0262558f2f 100644
--- a/code/controllers/shuttle_controller.dm
+++ b/code/controllers/shuttle_controller.dm
@@ -286,9 +286,9 @@ var/global/datum/shuttle_controller/shuttle_controller
 		"Mining Station" = locate(/area/skipjack_station/mining)
 		)
 
-	VS.announcer = "NDV Icarus"
-	VS.arrival_message = "Attention, [station_short], we just tracked a small target bypassing our defensive perimeter. Can't fire on it without hitting the station - you've got incoming visitors, like it or not."
-	VS.departure_message = "Your guests are pulling away, [station_short] - moving too fast for us to draw a bead on them. Looks like they're heading out of the system at a rapid clip."
+	VS.announcer = "Colony Automated Radar Array"
+	VS.arrival_message = "Attention.  Unidentified object with no signature detected approaching the colony."
+	VS.departure_message = "Attention.  Unidentified object exiting local space.  Unidentified object expected to escape Kara gravity well with current velocity."
 	VS.interim = locate(/area/skipjack_station/transit)
 
 	VS.warmup_time = 0
diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm
index 8c2a063164..ab60dc6b6e 100644
--- a/code/game/gamemodes/heist/heist.dm
+++ b/code/game/gamemodes/heist/heist.dm
@@ -10,7 +10,7 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
 	required_players = 15
 	required_players_secret = 15
 	required_enemies = 4
-	round_description = "An unidentified bluespace signature has slipped past the Icarus and is approaching the station!"
+	round_description = "An unidentified bluespace signature is approaching the station!"
 	end_on_antag_death = 0
 	antag_tags = list(MODE_RAIDER)
 
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 22cb51b748..0068473fb7 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -794,7 +794,7 @@
 
 /obj/structure/plushie/drone
 	name = "plush drone"
-	desc = "A plushie of a happy drone! It appears to be smiling, and has a small tag which reads \"N.D.V. Icarus Gift Shop\"."
+	desc = "A plushie of a happy drone! It appears to be smiling."
 	icon_state = "droneplushie"
 	phrase = "Beep boop!"
 
diff --git a/code/modules/economy/TradeDestinations.dm b/code/modules/economy/TradeDestinations.dm
index eec6b70fa3..3aca3e6bad 100644
--- a/code/modules/economy/TradeDestinations.dm
+++ b/code/modules/economy/TradeDestinations.dm
@@ -41,14 +41,6 @@ var/list/weighted_mundaneevent_locations = list()
 		[pick("mind-machine interfacing","neuroscience","nano-augmentation","genetics")]. [company_name] is expected to announce a co-exploitation deal within the fortnight."
 	return null
 
-/datum/trade_destination/icarus
-	name = "NDV Icarus"
-	description = "Corvette assigned to patrol local space."
-	distance = 0.1
-	willing_to_buy = list()
-	willing_to_sell = list()
-	viable_random_events = list(SECURITY_BREACH, AI_LIBERATION, PIRATES)
-
 /datum/trade_destination/redolant
 	name = "OAV Redolant"
 	description = "Osiris Atmospherics station in orbit around the only gas giant insystem. They retain tight control over shipping rights, and Osiris warships protecting their prize are not an uncommon sight in Tau Ceti."
diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm
index 1d25ac3cbf..8540bcf630 100644
--- a/code/modules/events/brand_intelligence.dm
+++ b/code/modules/events/brand_intelligence.dm
@@ -8,7 +8,8 @@
 
 
 /datum/event/brand_intelligence/announce()
-	command_announcement.Announce("Rampant brand intelligence has been detected aboard [station_name()], please stand-by.", "Machine Learning Alert")
+	command_announcement.Announce("An ongoing mass upload of malware for vendors has been detected onboard  [station_name()], which appears to transmit \
+	to other nearby vendors.  The original infected machine is believed to be a [originMachine.name].", "Vendor Service Alert")
 
 
 /datum/event/brand_intelligence/start()
diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm
index 12be475fc8..e70a18ae21 100644
--- a/code/modules/events/dust.dm
+++ b/code/modules/events/dust.dm
@@ -3,13 +3,13 @@
 	endWhen		= 30
 
 /datum/event/dust/announce()
-	command_announcement.Announce("The station is now passing through a belt of space dust.", "Dust Alert")
+	command_announcement.Announce("Debris resulting from activity on another nearby asteroid is approaching your colony.", "Dust Alert")
 
 /datum/event/dust/start()
 	dust_swarm(get_severity())
 
 /datum/event/dust/end()
-	command_announcement.Announce("The station has now passed through the belt of space dust.", "Dust Notice")
+	command_announcement.Announce("The colony is no longer in danger of impact from space debris.", "Dust Notice")
 
 /datum/event/dust/proc/get_severity()
 	switch(severity)
diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm
index be40542687..73198dec9b 100644
--- a/code/modules/events/electrical_storm.dm
+++ b/code/modules/events/electrical_storm.dm
@@ -4,7 +4,7 @@
 
 
 /datum/event/electrical_storm/announce()
-	command_announcement.Announce("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert")
+	command_announcement.Announce("An electrical issue has been detected in your area, please repair potential electronic overloads.", "Electrical Alert")
 
 
 /datum/event/electrical_storm/start()
diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm
index d34fadeb32..99b4855d73 100644
--- a/code/modules/events/event_dynamic.dm
+++ b/code/modules/events/event_dynamic.dm
@@ -76,7 +76,6 @@ var/list/event_last_fired = list()
 	if(active_with_role["Medical"] > 0)
 		possibleEvents[/datum/event/radiation_storm] = active_with_role["Medical"] * 10
 		possibleEvents[/datum/event/spontaneous_appendicitis] = active_with_role["Medical"] * 10
-		possibleEvents[/datum/event/viral_infection] = active_with_role["Medical"] * 10
 
 	possibleEvents[/datum/event/prison_break] = active_with_role["Security"] * 50
 	if(active_with_role["Security"] > 0)
diff --git a/code/modules/events/gravity.dm b/code/modules/events/gravity.dm
index 078e632842..8e9bd1d60c 100644
--- a/code/modules/events/gravity.dm
+++ b/code/modules/events/gravity.dm
@@ -5,7 +5,8 @@
 	endWhen = rand(15, 60)
 
 /datum/event/gravity/announce()
-	command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled whilst the system reinitializes. Further failures may result in a gravitational collapse and formation of blackholes.", "Gravity Failure")
+	command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled whilst the system \
+	reinitializes. Please stand by while the gravity system reinitializes.", "Gravity Failure")
 
 /datum/event/gravity/start()
 	gravity_is_on = 0
diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm
index c88472688f..e7afa00109 100644
--- a/code/modules/events/infestation.dm
+++ b/code/modules/events/infestation.dm
@@ -1,13 +1,12 @@
 #define LOC_KITCHEN 0
 #define LOC_ATMOS 1
-#define LOC_INCIN 2
-#define LOC_CHAPEL 3
-#define LOC_LIBRARY 4
-#define LOC_HYDRO 5
-#define LOC_VAULT 6
-#define LOC_CONSTR 7
-#define LOC_TECH 8
-#define LOC_TACTICAL 9
+#define LOC_CHAPEL 2
+#define LOC_LIBRARY 3
+#define LOC_HYDRO 4
+#define LOC_VAULT 5
+#define LOC_CONSTR 6
+#define LOC_TECH 7
+#define LOC_TACTICAL 8
 
 #define VERM_MICE 0
 #define VERM_LIZARDS 1
@@ -23,7 +22,7 @@
 
 /datum/event/infestation/start()
 
-	location = rand(0,9)
+	location = rand(0,8)
 	var/list/turf/simulated/floor/turfs = list()
 	var/spawn_area_type
 	switch(location)
@@ -33,9 +32,6 @@
 		if(LOC_ATMOS)
 			spawn_area_type = /area/engineering/atmos
 			locstring = "atmospherics"
-		if(LOC_INCIN)
-			spawn_area_type = /area/maintenance/incinerator
-			locstring = "the incinerator"
 		if(LOC_CHAPEL)
 			spawn_area_type = /area/chapel/main
 			locstring = "the chapel"
@@ -101,7 +97,6 @@
 
 #undef LOC_KITCHEN
 #undef LOC_ATMOS
-#undef LOC_INCIN
 #undef LOC_CHAPEL
 #undef LOC_LIBRARY
 #undef LOC_HYDRO
diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm
index 74de2a0d15..6ffb6011ef 100644
--- a/code/modules/events/meteors.dm
+++ b/code/modules/events/meteors.dm
@@ -13,9 +13,9 @@
 /datum/event/meteor_wave/announce()
 	switch(severity)
 		if(EVENT_LEVEL_MAJOR)
-			command_announcement.Announce("Meteors have been detected on collision course with the station.", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg')
+			command_announcement.Announce("Meteors have been detected on collision course with the colony.", "Meteor Alert", new_sound = 'sound/AI/meteors.ogg')
 		else
-			command_announcement.Announce("The station is now in a meteor shower.", "Meteor Alert")
+			command_announcement.Announce("The colony is now in a meteor shower.", "Meteor Alert")
 
 /datum/event/meteor_wave/tick()
 	if(waves && activeFor >= next_meteor)
@@ -32,9 +32,9 @@
 /datum/event/meteor_wave/end()
 	switch(severity)
 		if(EVENT_LEVEL_MAJOR)
-			command_announcement.Announce("The station has cleared the meteor storm.", "Meteor Alert")
+			command_announcement.Announce("The colony has cleared the meteor storm.", "Meteor Alert")
 		else
-			command_announcement.Announce("The station has cleared the meteor shower", "Meteor Alert")
+			command_announcement.Announce("The colony has cleared the meteor shower", "Meteor Alert")
 
 /datum/event/meteor_wave/proc/get_meteors()
 	switch(severity)
diff --git a/code/modules/events/money_lotto.dm b/code/modules/events/money_lotto.dm
index 09d4ebd7bf..4c016333f8 100644
--- a/code/modules/events/money_lotto.dm
+++ b/code/modules/events/money_lotto.dm
@@ -17,7 +17,7 @@
 			T.amount = winner_sum
 			T.date = current_date_string
 			T.time = worldtime2text()
-			T.source_terminal = "Biesel TCD Terminal #[rand(111,333)]"
+			T.source_terminal = "Sif TCD Terminal #[rand(111,333)]"
 			D.transaction_log.Add(T)
 
 			deposit_success = 1
diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm
index 850b03a4f7..ee748d6f8c 100644
--- a/code/modules/events/rogue_drones.dm
+++ b/code/modules/events/rogue_drones.dm
@@ -23,12 +23,21 @@
 
 /datum/event/rogue_drone/announce()
 	var/msg
-	if(prob(33))
-		msg = "A combat drone wing operating out of the NDV Icarus has failed to return from a sweep of this sector, if any are sighted approach with caution."
-	else if(prob(50))
-		msg = "Contact has been lost with a combat drone wing operating out of the NDV Icarus. If any are sighted in the area, approach with caution."
-	else
-		msg = "Unidentified hackers have targetted a combat drone wing deployed from the NDV Icarus. If any are sighted in the area, approach with caution."
+	var/rng = rand(1,5)
+	switch(rng)
+		if(1)
+			msg = "A combat drone wing operating near various asteroids in the Kara subsystem 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 wring operating out in the asteroid field near Kara.  If any are sighted in the area, approach with \
+			caution."
+		if(3)
+			msg = "Unidentified hackers have targeted a combat drone wing deployed in the Kara subsystem. 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."
+
 	command_announcement.Announce(msg, "Rogue drone alert")
 
 /datum/event/rogue_drone/end()
@@ -44,6 +53,6 @@
 		num_recovered++
 
 	if(num_recovered > drones_list.len * 0.75)
-		command_announcement.Announce("Icarus drone control reports the malfunctioning wing has been recovered safely.", "Rogue drone alert")
+		command_announcement.Announce("The drones that were malfunctioning has been recovered safely.", "Rogue drone alert")
 	else
-		command_announcement.Announce("Icarus drone control registers disappointment at the loss of the drones, but the survivors have been recovered.", "Rogue drone alert")
+		command_announcement.Announce("We're disappointed at the loss of the drones, but the survivors have been recovered.", "Rogue drone alert")
diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm
index b36f7f9376..096c7f8965 100644
--- a/code/modules/events/wallrot.dm
+++ b/code/modules/events/wallrot.dm
@@ -3,7 +3,7 @@ datum/event/wallrot/setup()
 	endWhen = announceWhen + 1
 
 datum/event/wallrot/announce()
-	command_announcement.Announce("Harmful fungi detected on station. Station structures may be contaminated.", "Biohazard Alert")
+	command_announcement.Announce("Harmful fungi detected on the colony. Station structures may be contaminated.", "Biohazard Alert")
 
 datum/event/wallrot/start()
 	spawn()
diff --git a/polaris.dme b/polaris.dme
index 85b53114e9..261bfe9dc9 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -1135,7 +1135,6 @@
 #include "code\modules\events\carp_migration.dm"
 #include "code\modules\events\comms_blackout.dm"
 #include "code\modules\events\communications_blackout.dm"
-#include "code\modules\events\disease_outbreak.dm"
 #include "code\modules\events\dust.dm"
 #include "code\modules\events\electrical_storm.dm"
 #include "code\modules\events\event.dm"
@@ -1158,7 +1157,6 @@
 #include "code\modules\events\spacevine.dm"
 #include "code\modules\events\spider_infestation.dm"
 #include "code\modules\events\spontaneous_appendicitis.dm"
-#include "code\modules\events\viral_infection.dm"
 #include "code\modules\events\wallrot.dm"
 #include "code\modules\examine\examine.dm"
 #include "code\modules\examine\stat_icons.dm"