From 92df10c505e16e2776395aa9141afa4577f3479c Mon Sep 17 00:00:00 2001 From: MrSky12 Date: Mon, 1 Aug 2022 00:46:44 +0200 Subject: [PATCH] Revert "Garret changes." This reverts commit 05881a1561b9c0defb722c61817df588608b3abc. --- code/modules/cargo/bounties/assistant.dm | 14 +------------- code/modules/cargo/bounties/chef.dm | 12 ++---------- code/modules/events/aurora_caelus.dm | 4 ++-- .../reagents/chemistry/reagents/other_reagents.dm | 2 +- hyperstation/code/datums/weather/oxygen_rain.dm | 4 ---- 5 files changed, 6 insertions(+), 30 deletions(-) diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index 3ca828e5..f013495b 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -1,31 +1,19 @@ /datum/bounty/item/assistant/strange_object name = "Strange Object" -<<<<<<< Updated upstream description = "GATO has taken an interest in strange objects. Find one in maint, and ship it off to CentCom right away." -======= - description = "Gato has taken an interest in strange objects. Find one in maint, and ship it off to CentCom right away." ->>>>>>> Stashed changes reward = 600 wanted_types = list(/obj/item/relic) /datum/bounty/item/assistant/scooter name = "Scooter" -<<<<<<< Updated upstream description = "GATO has determined walking to be wasteful. Ship a scooter to CentCom to speed operations up." -======= - description = "Gato has determined walking to be wasteful. Ship a scooter to CentCom to speed operations up." ->>>>>>> Stashed changes reward = 850 // the mat hoffman wanted_types = list(/obj/vehicle/ridden/scooter) include_subtypes = FALSE /datum/bounty/item/assistant/skateboard name = "Skateboard" -<<<<<<< Updated upstream description = "GATO has determined walking to be wasteful. Ship a skateboard to CentCom to speed operations up." -======= - description = "Gato has determined walking to be wasteful. Ship a skateboard to CentCom to speed operations up." ->>>>>>> Stashed changes reward = 700 // the tony hawk wanted_types = list(/obj/vehicle/ridden/scooter/skateboard) @@ -254,4 +242,4 @@ description = "Something wack is happening at Central Command, and now they requested some filled condoms?" reward = 1150 required_count = 5 - wanted_types = list(/obj/item/condom/filled) + wanted_types = list(/obj/item/condom/filled) \ No newline at end of file diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index 3c71024e..395905d0 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -60,7 +60,7 @@ /datum/bounty/item/chef/superbite name = "Super Bite Burger" - description = "Commander Lydia would like a snack. Send her a Super Bite Burger." + description = "Commander Tubbs thinks he can set a competitive eating world record. All he needs is a super bite burger shipped to him." reward = 1800 wanted_types = list(/obj/item/reagent_containers/food/snacks/burger/superbite) @@ -78,11 +78,7 @@ /datum/bounty/item/chef/hotdog name = "Hot Dog" -<<<<<<< Updated upstream description = "GATO is conducting taste tests to determine the best hot dog recipe. Ship your station's version to participate." -======= - description = "Gato is conducting taste tests to determine the best hot dog recipe. Ship your station's version to participate." ->>>>>>> Stashed changes reward = 4000 wanted_types = list(/obj/item/reagent_containers/food/snacks/hotdog) @@ -102,11 +98,7 @@ /datum/bounty/item/chef/chawanmushi name = "Chawanmushi" -<<<<<<< Updated upstream description = "GATO wants to improve relations with its sister company, Donk.Co. Ship Chawanmushi immediately." -======= - description = "Gato wants to improve relations with Donk.Co. Ship Chawanmushi immediately." ->>>>>>> Stashed changes reward = 5000 wanted_types = list(/obj/item/reagent_containers/food/snacks/chawanmushi) @@ -119,7 +111,7 @@ /datum/bounty/item/chef/soylentgreen name = "Soylent Green" - description = "CentCom has heard wonderful things about the product 'Soylent Green', and would love to try some. If you indulge them, expect a pleasant bonus." + description = "CentCom has heard wonderful things about the product 'Soylent Green', and would love to try some. If you endulge them, expect a pleasant bonus." reward = 4000 wanted_types = list(/obj/item/reagent_containers/food/snacks/soylentgreen) diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index 269c3689..e5f64264 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -20,9 +20,9 @@ var/list/applicable_areas = list() /datum/round_event/aurora_caelus/announce() - priority_announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull. Gato Command has approved a short break for all employees to relax and observe this very rare event. During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. We will also play quiet music for you to enjoy and relax. Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. We hope you enjoy the lights.", + priority_announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull. Kinaris Command has approved a short break for all employees to relax and observe this very rare event. During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. We will also play quiet music for you to enjoy and relax. Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. We hope you enjoy the lights.", sound = 'sound/misc/notice2.ogg', - sender_override = "Gato Meteorology Division") + sender_override = "Kinaris Meteorology Division") for(var/V in GLOB.player_list) var/mob/M = V if((M.client.prefs.toggles & SOUND_MIDI) && is_station_level(M.z)) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index b3659298..b6094aae 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -974,7 +974,7 @@ /datum/reagent/chlorine name = "Chlorine" - description = "A pale yellow gas that's well known as an oxidizer. While it forms many harmless molecules in its elemental form, it is far from harmless." + description = "A pale yellow gas that's well known as an oxidizer. While it forms many harmless molecules in its elemental form it is far from harmless." reagent_state = GAS color = "#808080" // rgb: 128, 128, 128 taste_description = "chlorine" diff --git a/hyperstation/code/datums/weather/oxygen_rain.dm b/hyperstation/code/datums/weather/oxygen_rain.dm index bf751796..174169ad 100644 --- a/hyperstation/code/datums/weather/oxygen_rain.dm +++ b/hyperstation/code/datums/weather/oxygen_rain.dm @@ -29,11 +29,7 @@ . = ..() priority_announce("[station_name()]: A large quantity of condensed low temperature oxygen clouds has been detected around and above the station. A liquid oxygen downpour is expected.", sound = 'sound/misc/notice2.ogg', -<<<<<<< Updated upstream sender_override = "GATO Meteorology Division") -======= - sender_override = "Gato Meteorology Division") ->>>>>>> Stashed changes for(var/V in GLOB.player_list) var/mob/M = V if((M.client.prefs.toggles & SOUND_MIDI) && is_station_level(M.z))