diff --git a/byond-extools.dll b/byond-extools.dll index af036e9147..c404bf1be5 100644 Binary files a/byond-extools.dll and b/byond-extools.dll differ diff --git a/byond-extools.pdb b/byond-extools.pdb index c80101f6b5..f89dc06441 100644 Binary files a/byond-extools.pdb and b/byond-extools.pdb differ diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 09d4aadf50..e8726f8316 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(redacted_strings, list("\[REDACTED\]", "\[CLASSIFIED\]", "\[ARC GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt")) -GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "declares", "bellows", "buzzes" ,"beeps", "chirps" ,"hisses" ,"poofs" ,"rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters")) +GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps" ,"hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles")) GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc)) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index e0c6c48eaa..e207fe838a 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -77,7 +77,6 @@ SUBSYSTEM_DEF(air) /datum/controller/subsystem/air/proc/extools_update_ssair() /datum/controller/subsystem/air/proc/extools_update_reactions() -/datum/controller/subsystem/air/proc/scan_for_active_turfs() /datum/controller/subsystem/air/fire(resumed = 0) var/timer = TICK_USAGE_REAL @@ -165,8 +164,6 @@ SUBSYSTEM_DEF(air) if(state != SS_RUNNING) return resumed = 0 - if(get_amt_active_turfs() < 3000 && !TICK_CHECK) - scan_for_active_turfs() currentpart = SSAIR_REBUILD_PIPENETS diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 55764d8d50..1d78979cbd 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -227,6 +227,21 @@ return else if(isinsect(C)) playsound(C, 'sound/voice/moth/mothlaugh.ogg', 50, 1) + else if(isjellyperson(C)) + var/mob/living/carbon/human/H = C + if(H.dna.features["mam_ears"] == "Cat" || H.dna.features["mam_ears"] == "Cat, Big") //slime have cat ear. slime go nya. + playsound(C, pick('sound/voice/jelly/nyahaha1.ogg', + 'sound/voice/jelly/nyahaha2.ogg', + 'sound/voice/jelly/nyaha.ogg', + 'sound/voice/jelly/nyahehe.ogg'), + 50, 1) + return + else if(user.gender == FEMALE) + playsound(C, 'sound/voice/jelly/womanlaugh.ogg', 50, 1) + return + else + playsound(C, pick('sound/voice/jelly/manlaugh1.ogg', 'sound/voice/jelly/manlaugh2.ogg'), 50, 1) + return else if(ishumanbasic(C)) if(user.gender == FEMALE) playsound(C, 'sound/voice/human/womanlaugh.ogg', 50, 1) diff --git a/html/changelog.html b/html/changelog.html index 5b0590981c..230da3631f 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -1173,41 +1173,6 @@
  • some crafted crates won't contain items now, and thus have stopped breaking the laws of physics
  • beepskys hats now follow the laws of gravity and move up/down when he bobs up and down
    • - -

    29 July 2020

    -

    DeltaFire15 updated:

    - -

    Ghommie updated:

    - -

    Hatterhat updated:

    - -

    NecromancerAnne, Sirich96 updated:

    - -

    necromanceranne updated:

    - -

    timothyteakettle updated:

    - -

    zeroisthebiggay updated:

    - GoonStation 13 Development Team diff --git a/html/changelogs/AutoChangeLog-pr-13416.yml b/html/changelogs/AutoChangeLog-pr-13416.yml new file mode 100644 index 0000000000..03e0dbb73a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13416.yml @@ -0,0 +1,5 @@ +author: "BlueWildrose" +delete-after: True +changes: + - soundadd: "Slimepeople are given unique laughs and screams." + - tweak: "Adds \"warbles\", \"chimpers\", and \"puffs\" to the customizable speech verbs for character." diff --git a/libbyond-extools.so b/libbyond-extools.so index 63c5729007..bdae36893f 100644 Binary files a/libbyond-extools.so and b/libbyond-extools.so differ diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm index 3b442af1c7..28c3f7ea99 100644 --- a/modular_citadel/code/modules/mob/cit_emotes.dm +++ b/modular_citadel/code/modules/mob/cit_emotes.dm @@ -42,6 +42,11 @@ sound = pick('modular_citadel/sound/voice/scream_m1.ogg', 'modular_citadel/sound/voice/scream_m2.ogg') if(user.gender == FEMALE) sound = pick('modular_citadel/sound/voice/scream_f1.ogg', 'modular_citadel/sound/voice/scream_f2.ogg') + if(is_species(user, /datum/species/jelly)) + if(user.gender == FEMALE) + sound = pick('modular_citadel/sound/voice/scream_jelly_f1.ogg', 'modular_citadel/sound/voice/scream_jelly_f2.ogg') + else + sound = pick('modular_citadel/sound/voice/scream_jelly_m1.ogg', 'modular_citadel/sound/voice/scream_jelly_m2.ogg') if(is_species(user, /datum/species/android) || is_species(user, /datum/species/synth) || is_species(user, /datum/species/ipc)) sound = 'modular_citadel/sound/voice/scream_silicon.ogg' if(is_species(user, /datum/species/lizard)) diff --git a/modular_citadel/sound/voice/scream_jelly_f1.ogg b/modular_citadel/sound/voice/scream_jelly_f1.ogg new file mode 100644 index 0000000000..6bbe8d2811 Binary files /dev/null and b/modular_citadel/sound/voice/scream_jelly_f1.ogg differ diff --git a/modular_citadel/sound/voice/scream_jelly_f2.ogg b/modular_citadel/sound/voice/scream_jelly_f2.ogg new file mode 100644 index 0000000000..03bd62728a Binary files /dev/null and b/modular_citadel/sound/voice/scream_jelly_f2.ogg differ diff --git a/modular_citadel/sound/voice/scream_jelly_m1.ogg b/modular_citadel/sound/voice/scream_jelly_m1.ogg new file mode 100644 index 0000000000..496d5b1719 Binary files /dev/null and b/modular_citadel/sound/voice/scream_jelly_m1.ogg differ diff --git a/modular_citadel/sound/voice/scream_jelly_m2.ogg b/modular_citadel/sound/voice/scream_jelly_m2.ogg new file mode 100644 index 0000000000..2a70ae29fe Binary files /dev/null and b/modular_citadel/sound/voice/scream_jelly_m2.ogg differ diff --git a/sound/voice/jelly/manlaugh1.ogg b/sound/voice/jelly/manlaugh1.ogg new file mode 100644 index 0000000000..665c8df908 Binary files /dev/null and b/sound/voice/jelly/manlaugh1.ogg differ diff --git a/sound/voice/jelly/manlaugh2.ogg b/sound/voice/jelly/manlaugh2.ogg new file mode 100644 index 0000000000..ec1b5eaf55 Binary files /dev/null and b/sound/voice/jelly/manlaugh2.ogg differ diff --git a/sound/voice/jelly/nyaha.ogg b/sound/voice/jelly/nyaha.ogg new file mode 100644 index 0000000000..3369995a3d Binary files /dev/null and b/sound/voice/jelly/nyaha.ogg differ diff --git a/sound/voice/jelly/nyahaha1.ogg b/sound/voice/jelly/nyahaha1.ogg new file mode 100644 index 0000000000..c74a038dae Binary files /dev/null and b/sound/voice/jelly/nyahaha1.ogg differ diff --git a/sound/voice/jelly/nyahaha2.ogg b/sound/voice/jelly/nyahaha2.ogg new file mode 100644 index 0000000000..7eaa1aeebe Binary files /dev/null and b/sound/voice/jelly/nyahaha2.ogg differ diff --git a/sound/voice/jelly/nyahehe.ogg b/sound/voice/jelly/nyahehe.ogg new file mode 100644 index 0000000000..eb1d2d3c90 Binary files /dev/null and b/sound/voice/jelly/nyahehe.ogg differ diff --git a/sound/voice/jelly/womanlaugh.ogg b/sound/voice/jelly/womanlaugh.ogg new file mode 100644 index 0000000000..bafe1b0292 Binary files /dev/null and b/sound/voice/jelly/womanlaugh.ogg differ