From 0cdf20a9b655067582a40ddb5bdd5ea8f1ceef69 Mon Sep 17 00:00:00 2001 From: Dahlular <55758850+Dahlular@users.noreply.github.com> Date: Fri, 12 Jun 2020 00:42:36 -0600 Subject: [PATCH 1/3] aaaa no dont do that i dont wanna have people yell at me for being a snowflake --- code/modules/events/aurora_caelus.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index 1f3e4452..85bb7960 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -18,7 +18,7 @@ var/aurora_progress = 0 //this cycles from 1 to 8, slowly changing colors from gentle green to gentle blue /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. Winfre 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. 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. 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 = "Kinaris Meteorology Division") for(var/V in GLOB.player_list) From a8407fc71e17bbd23257eef52fb7bd7a82d3a94d Mon Sep 17 00:00:00 2001 From: Dahlular <55758850+Dahlular@users.noreply.github.com> Date: Fri, 12 Jun 2020 00:43:38 -0600 Subject: [PATCH 2/3] reeee --- code/modules/cargo/bounties/slime.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/bounties/slime.dm b/code/modules/cargo/bounties/slime.dm index 042f9f05..80b2dc4d 100644 --- a/code/modules/cargo/bounties/slime.dm +++ b/code/modules/cargo/bounties/slime.dm @@ -3,7 +3,7 @@ /datum/bounty/item/slime/New() ..() - description = "Winfre's head xenobiologist team is hunting for the rare and exotic [name]. A bounty has been offered for finding it." + description = "Kinaris's head xenobiologist team is hunting for the rare and exotic [name]. A bounty has been offered for finding it." reward += rand(0, 4) * 500 /datum/bounty/item/slime/green From 29b0b841d943a73a47fe13f89dd06044e4a1afeb Mon Sep 17 00:00:00 2001 From: Dahlular <55758850+Dahlular@users.noreply.github.com> Date: Fri, 12 Jun 2020 02:31:58 -0600 Subject: [PATCH 3/3] Compiling Error duplicate definition --- code/game/objects/structures/barsigns.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index 043b2efc..ea07cde3 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -316,9 +316,9 @@ /datum/barsign/kinariscorp - var/name = "Kinaris.Co" - var/icon = "kinariscorp" - var/desc = "Provided in saturated olive, much like the drinks" + name = "Kinaris.Co" + icon = "kinariscorp" + desc = "Provided in saturated olive, much like the drinks" /datum/barsign/hiddensigns