diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 2a60711a81..f69a722473 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -533,16 +533,16 @@ return /obj/machinery/porta_turret/proc/shootAt(atom/movable/target, stagger_enabled = FALSE) - if(stagger_enabled) - randomize_shot_stagger() - sleep(shot_stagger) if(!raised) //the turret has to be raised in order to fire - makes sense, right? return - if(!(obj_flags & EMAGGED)) //if it hasn't been emagged, cooldown before shooting again - if(last_fired + shot_delay > world.time) - return - last_fired = world.time + if(last_fired + shot_delay > world.time) + return + last_fired = world.time + + if(stagger_enabled) + randomize_shot_stagger() + sleep(shot_stagger) var/turf/T = get_turf(src) var/turf/U = get_turf(target) diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm index de00c0042f..26bf630036 100644 --- a/code/modules/language/language_holder.dm +++ b/code/modules/language/language_holder.dm @@ -311,11 +311,17 @@ Key procs /datum/language_holder/synthetic - understood_languages = list(// SKYRAT EDIT - additional languages - /datum/language/sandcode/solcommon = list(LANGUAGE_ATOM), - /datum/language/sandcode/technorussian = list(LANGUAGE_ATOM), - /datum/language/sandcode/neokanji = list(LANGUAGE_ATOM), - /datum/language/sandcode/dunmeri = list(LANGUAGE_ATOM)) + understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), + /datum/language/machine = list(LANGUAGE_ATOM), + /datum/language/draconic = list(LANGUAGE_ATOM), + // SKYRAT EDIT - additional languages + /datum/language/sandcode/solcommon = list(LANGUAGE_ATOM), + /datum/language/sandcode/technorussian = list(LANGUAGE_ATOM), + /datum/language/sandcode/neokanji = list(LANGUAGE_ATOM), + /datum/language/sandcode/dunmeri = list(LANGUAGE_ATOM), + /datum/language/sandcode/sergal = list(LANGUAGE_ATOM), + /datum/language/slime = list(LANGUAGE_ATOM), + /datum/language/dwarf = list(LANGUAGE_ATOM)) spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), /datum/language/machine = list(LANGUAGE_ATOM), /datum/language/draconic = list(LANGUAGE_ATOM), @@ -324,6 +330,7 @@ Key procs /datum/language/sandcode/technorussian = list(LANGUAGE_ATOM), /datum/language/sandcode/neokanji = list(LANGUAGE_ATOM), /datum/language/sandcode/dunmeri = list(LANGUAGE_ATOM), + /datum/language/sandcode/sergal = list(LANGUAGE_ATOM), /datum/language/slime = list(LANGUAGE_ATOM), /datum/language/dwarf = list(LANGUAGE_ATOM)) diff --git a/html/changelogs/AutoChangeLog-pr-13036.yml b/html/changelogs/AutoChangeLog-pr-13036.yml new file mode 100644 index 0000000000..633eb41ed5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13036.yml @@ -0,0 +1,4 @@ +author: "lolman360" +delete-after: True +changes: + - bugfix: "The Tendril-Mother on Lavaland has remembered how to make ashwalkers who know how to speak Draconic again." diff --git a/sandcode/code/modules/language/language.dm b/sandcode/code/modules/language/language.dm index dc5971e8fd..464e160107 100644 --- a/sandcode/code/modules/language/language.dm +++ b/sandcode/code/modules/language/language.dm @@ -165,26 +165,6 @@ icon_state = "solcommon" restricted = FALSE -/datum/language/sandcode/sylvan - name = "Sylvan" - desc = "A complicated, ancient language spoken by sentient plants." - speech_verb = "expresses" - ask_verb = "inquires" - exclaim_verb = "declares" - key = "h" - flags = TONGUELESS_SPEECH - space_chance = 20 - syllables = list( - "fii", "sii", "rii", "rel", "maa", "ala", "san", "tol", "tok", "dia", "eres", - "fal", "tis", "bis", "qel", "aras", "losk", "rasa", "eob", "hil", "tanl", "aere", - "fer", "bal", "pii", "dala", "ban", "foe", "doa", "cii", "uis", "mel", "wex", - "incas", "int", "elc", "ent", "aws", "qip", "nas", "vil", "jens", "dila", "fa", - "la", "re", "do", "ji", "ae", "so", "qe", "ce", "na", "mo", "ha", "yu" - ) - icon_state = "sylvan" - default_priority = 97 - restricted = TRUE - /datum/language/sandcode/technorussian name = "Technorussian" desc = "Ancient language of Russian colonists, rusted with time and bastardized with technical terms in everyday use."