From 66a9722fabfda42b3141440b445df1d09144693e Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Mon, 5 Mar 2018 15:16:51 -0800 Subject: [PATCH 001/147] Removes DEBUG from compile_options. byond now as of 1413 only lets you define debug inside the dme, so this was pointless. --- code/_compile_options.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 714e9d114e4d..a37666bdec54 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -1,5 +1,3 @@ -#define DEBUG //Enables byond profiling and full runtime logs - note, this may also be defined in your .dme file - //Enables in-depth debug messages to runtime log (used for debugging) //#define TESTING //By using the testing("message") proc you can create debug-feedback for people with this //uncommented, but not visible in the release version) From fd0e59b45a1dd61e78fcb80330aca174a2bda595 Mon Sep 17 00:00:00 2001 From: oranges Date: Tue, 6 Mar 2018 00:32:28 +0000 Subject: [PATCH 002/147] Minor say code cleanup Remove two unused procs and move another to the mob/living say where it is used --- code/modules/flufftext/TextFilters.dm | 64 --------------------------- code/modules/mob/living/say.dm | 25 ++++++++++- tgstation.dme | 1 - 3 files changed, 24 insertions(+), 66 deletions(-) delete mode 100644 code/modules/flufftext/TextFilters.dm diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm deleted file mode 100644 index 35a78cd49f9e..000000000000 --- a/code/modules/flufftext/TextFilters.dm +++ /dev/null @@ -1,64 +0,0 @@ - - -//is this shit even used at all -/proc/NewStutter(phrase,stun) - phrase = html_decode(phrase) - - var/list/split_phrase = splittext(phrase," ") //Split it up into words. - - var/list/unstuttered_words = split_phrase.Copy() - var/i = rand(1,3) - if(stun) i = split_phrase.len - for(,i > 0,i--) //Pick a few words to stutter on. - - if (!unstuttered_words.len) - break - var/word = pick(unstuttered_words) - unstuttered_words -= word //Remove from unstuttered words so we don't stutter it again. - var/index = split_phrase.Find(word) //Find the word in the split phrase so we can replace it. - - //Search for dipthongs (two letters that make one sound.) - var/first_sound = copytext(word,1,3) - var/first_letter = copytext(word,1,2) - if(lowertext(first_sound) in list("ch","th","sh")) - first_letter = first_sound - - //Repeat the first letter to create a stutter. - var/rnum = rand(1,3) - switch(rnum) - if(1) - word = "[first_letter]-[word]" - if(2) - word = "[first_letter]-[first_letter]-[word]" - if(3) - word = "[first_letter]-[word]" - - split_phrase[index] = word - - return sanitize(jointext(split_phrase," ")) - -/proc/Stagger(mob/M,d) //Technically not a filter, but it relates to drunkenness. - step(M, pick(d,turn(d,90),turn(d,-90))) - -/proc/Ellipsis(original_msg, chance = 50, keep_words) - if(chance <= 0) - return "..." - if(chance >= 100) - return original_msg - - var/list - words = splittext(original_msg," ") - new_words = list() - - var/new_msg = "" - - for(var/w in words) - if(prob(chance)) - new_words += "..." - if(!keep_words) - continue - new_words += w - - new_msg = jointext(new_words," ") - - return new_msg diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 737069a44d92..11c57c9bbc09 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -59,6 +59,29 @@ GLOBAL_LIST_INIT(department_radio_keys, list( "รท" = "cords" )) +/mob/living/proc/Ellipsis(original_msg, chance = 50, keep_words) + if(chance <= 0) + return "..." + if(chance >= 100) + return original_msg + + var/list + words = splittext(original_msg," ") + new_words = list() + + var/new_msg = "" + + for(var/w in words) + if(prob(chance)) + new_words += "..." + if(!keep_words) + continue + new_words += w + + new_msg = jointext(new_words," ") + + return new_msg + /mob/living/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE) var/static/list/crit_allowed_modes = list(MODE_WHISPER = TRUE, MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE) var/static/list/unconscious_allowed_modes = list(MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE) @@ -381,4 +404,4 @@ GLOBAL_LIST_INIT(department_radio_keys, list( if(.) return . - . = ..() \ No newline at end of file + . = ..() diff --git a/tgstation.dme b/tgstation.dme index f02672076dc9..6643901e1d43 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1472,7 +1472,6 @@ #include "code\modules\fields\turf_objects.dm" #include "code\modules\flufftext\Dreaming.dm" #include "code\modules\flufftext\Hallucination.dm" -#include "code\modules\flufftext\TextFilters.dm" #include "code\modules\food_and_drinks\food.dm" #include "code\modules\food_and_drinks\pizzabox.dm" #include "code\modules\food_and_drinks\drinks\drinks.dm" From d39472ead9e79d48b1571f6cc07176b08e359f47 Mon Sep 17 00:00:00 2001 From: Ian Turk Date: Mon, 5 Mar 2018 18:47:44 -0600 Subject: [PATCH 003/147] Fixed new diseases getting their old name Gave camera mobs the ghost verb --- code/datums/diseases/advance/advance.dm | 7 ++----- code/modules/mob/dead/observer/observer.dm | 10 +++++++++- code/modules/reagents/chemistry/machinery/pandemic.dm | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 64af3bc94d5e..3659577c168b 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -166,13 +166,10 @@ var/the_id = GetDiseaseID() if(!SSdisease.archive_diseases[the_id]) - if(new_name) - AssignName() SSdisease.archive_diseases[the_id] = src // So we don't infinite loop SSdisease.archive_diseases[the_id] = Copy() - - var/datum/disease/advance/A = SSdisease.archive_diseases[the_id] - name = A.name + if(new_name) + AssignName() //Generate disease properties based on the effects. Returns an associated list. /datum/disease/advance/proc/GenerateProperties() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 96128a7f6f02..54fe67a1ed6a 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -279,8 +279,16 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(response != "Ghost") return //didn't want to ghost after-all ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3 - return +/mob/camera/verb/ghost() + set category = "OOC" + set name = "Ghost" + set desc = "Relinquish your life and enter the land of the dead." + + var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst still alive you may not play again this round! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body") + if(response != "Ghost") + return + ghostize(0) /mob/dead/observer/Move(NewLoc, direct) if(updatedir) diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index 00a3f0effddf..c6ca72ad4a06 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -57,7 +57,7 @@ if(istype(D, /datum/disease/advance)) var/datum/disease/advance/A = D var/disease_name = SSdisease.get_disease_name(A.GetDiseaseID()) - if(disease_name == "Unknown" && A.mutable) + if((disease_name == "Unknown") && A.mutable) this["can_rename"] = TRUE this["name"] = disease_name this["is_adv"] = TRUE From 78d4e57ba77c1479b7ea3792fed69b2707f3b5ad Mon Sep 17 00:00:00 2001 From: Cebutris Date: Tue, 6 Mar 2018 08:04:22 -0500 Subject: [PATCH 004/147] lithnessk -> litheness --- code/datums/traits/good.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 538146b873aa..4a1a0c3d1ef1 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -26,7 +26,7 @@ desc = "You walk with a gentle step, making stepping on sharp objects quieter and less painful." value = 1 mob_trait = TRAIT_LIGHT_STEP - gain_text = "You walk with a little more lithenessk." + gain_text = "You walk with a little more litheness." lose_text = "You start tromping around like a barbarian." From fe9793f7d7083138f1d597a41f2b8f571f9075e5 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Tue, 6 Mar 2018 18:32:35 +0000 Subject: [PATCH 005/147] Automatic changelog compile, [ci skip] --- html/changelog.html | 8 ++++++++ html/changelogs/.all_changelog.yml | 8 ++++++++ html/changelogs/AutoChangeLog-pr-36160.yml | 8 -------- 3 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-36160.yml diff --git a/html/changelog.html b/html/changelog.html index 98319a264ffa..b96c4f6ec3fd 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -73,6 +73,14 @@

XDTM updated:

  • Revenants now have randomly generated names.
+

Xhuis updated:

+
    +
  • Traits are now assigned in a way that should cause fewer edge cases and strangeness.
    • +
  • Night Vision should now work.
    • +
  • Traits no longer tick while dead.
    • +
  • RDS now triggers twice as often.
    • +
  • You can now modify your trait setup mid-round. Your character is locked to the traits you had selected when you spawned in, though.
    • +

selea updated: