From 727c2aef578d05aa5ab2b7bf8c514ae650dce141 Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 15 Dec 2018 05:12:06 +0000 Subject: [PATCH] Dark theme initial commit --- code/controllers/voting.dm | 6 +- code/game/gamemodes/gameticker.dm | 2 +- code/game/gamemodes/technomancer/catalog.dm | 4 +- code/modules/admin/verbs/pray.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 4 +- code/stylesheet.dm | 116 +- interface/interface.dm | 12 +- interface/skin.dmf | 1158 +------------------ 8 files changed, 121 insertions(+), 1183 deletions(-) diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 5dd4e8fc53..eef0cd871c 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -102,7 +102,7 @@ var/global/list/round_voters = list() // Keeps track of the individuals voting f else factor = 1.4 choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor) - world << "Crew Transfer Factor: [factor]" + world << "Crew Transfer Factor: [factor]" greatest_votes = max(choices["Initiate Crew Transfer"], choices["Continue The Round"]) . = list() // Get all options with that many votes and return them in a list @@ -135,7 +135,7 @@ var/global/list/round_voters = list() // Keeps track of the individuals voting f if(mode == VOTE_ADD_ANTAGONIST) antag_add_failed = 1 log_vote(text) - world << "[text]" + world << "[text]" /datum/controller/vote/proc/result() . = announce_result() @@ -249,7 +249,7 @@ var/global/list/round_voters = list() // Keeps track of the individuals voting f log_vote(text) - world << "[text]\nType vote or click here to place your votes.\nYou have [config.vote_period / 10] seconds to vote." + world << "[text]\nType vote or click here to place your votes.\nYou have [config.vote_period / 10] seconds to vote." if(vote_type == VOTE_CREW_TRANSFER || vote_type == VOTE_GAMEMODE || vote_type == VOTE_CUSTOM) world << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 600b097382..3c2c6e41e5 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -142,7 +142,7 @@ var/global/datum/controller/gameticker/ticker //Deleting Startpoints but we need the ai point to AI-ize people later if (S.name != "AI") qdel(S) - to_chat(world, "Enjoy the game!") + to_chat(world, "Enjoy the game!") world << sound('sound/AI/welcome.ogg') // Skie //Holiday Round-start stuff ~Carn Holiday_Game_Start() diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm index 25f824d2b3..3ff126e0cd 100644 --- a/code/game/gamemodes/technomancer/catalog.dm +++ b/code/game/gamemodes/technomancer/catalog.dm @@ -133,7 +133,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - dat += "[spell.name]
" dat += "[spell.desc]
" if(spell.spell_power_desc) - dat += "Spell Power: [spell.spell_power_desc]
" + dat += "Spell Power: [spell.spell_power_desc]
" if(spell.enhancement_desc) dat += "Scepter Effect: [spell.enhancement_desc]
" if(spell.cost <= budget) @@ -255,7 +255,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - If a function is able to be boosted with it, it will be shown underneath the description of the function as \ 'Scepter Effect:'. Note that you must hold the scepter for it to work, so try to avoid losing it.
" dat += "Functions can also be boosted with the core itself. A function that is able to benefit \ - from this will have 'Spell Power:' underneath. Different Cores have different \ + from this will have 'Spell Power:' underneath. Different Cores have different \ amounts of spell power.
" dat += "When a function refers to 'allies', it means you, your apprentices, currently controlled entities (with the \ Control function), and friendly simple-minded entities that you've summoned with the Scepter of Enhancement.
" diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 5469367beb..f879b8332e 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -17,7 +17,7 @@ return var/image/cross = image('icons/obj/storage.dmi',"bible") - msg = "\icon[cross] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC) (SMITE): [msg]" + msg = "\icon[cross] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC) (SMITE): [msg]" for(var/client/C in admins) if(R_ADMIN & C.holder.rights) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 71284f53b2..5d93f215d5 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -622,7 +622,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp is_manifest = TRUE verbs |= /mob/observer/dead/proc/toggle_visibility verbs |= /mob/observer/dead/proc/ghost_whisper - to_chat(src,"As you are now in the realm of the living, you can whisper to the living with the Spectral Whisper verb, inside the IC tab.") + to_chat(src,"As you are now in the realm of the living, you can whisper to the living with the Spectral Whisper verb, inside the IC tab.") if(plane != PLANE_WORLD) user.visible_message( \ "\The [user] drags ghost, [src], to our plane of reality!", \ @@ -754,7 +754,7 @@ mob/observer/dead/MayRespawn(var/feedback = 0) var/msg = sanitize(input(src, "Message:", "Spectral Whisper") as text|null) if(msg) log_say("(SPECWHISP to [key_name(M)]): [msg]", src) - M << " You hear a strange, unidentifiable voice in your head... [msg]" + M << " You hear a strange, unidentifiable voice in your head... [msg]" src << " You said: '[msg]' to [M]." else return diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 7c595b923f..f44fe3f4bd 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -1,15 +1,15 @@ client/script = {"