Merge branch 'master' into slime-puddle

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))
 

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)

html/changelog.html

@@ -50,6 +50,8 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">30 August 2020</h2>
+			<h3 class="author">raspy-on-osu updated:</h3>
 			<h2 class="date">29 September 2020</h2>
 			<h3 class="author">timothyteakettle updated:</h3>
 			<ul class="changes bgimages16">
@@ -494,13 +496,15 @@
 			</ul>
 			<h3 class="author">shellspeed1 updated:</h3>
 			<ul class="changes bgimages16">
-				<li class="rscadd">Adds slow mode for iv drips</li>
+				<li class="rscadd">new explosion echoes</li>
+				<li class="tweak">explosion echo range</li>
+				<li class="soundadd">5 new explosion related sounds</li>
 			</ul>
+
+			<h2 class="date">28 August 2020</h2>
 			<h3 class="author">timothyteakettle updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">an ancient game over a thousand years old has re-emerged among crewmembers - rock paper scissors</li>
-				<li class="tweak">customization features appear in alphabetical order where necessary</li>
-				<li class="tweak">bokken do two more stamina damage now</li>
 				<li class="rscadd">you can now choose a body sprite as an anthromorph or anthromorphic insect, and can choose from aquatic/avian and apid respectively (and obviously back to the defaults too)</li>
 			</ul>
 
@@ -1173,41 +1177,6 @@
 				<li class="bugfix">some crafted crates won't contain items now, and thus have stopped breaking the laws of physics</li>
 				<li class="tweak">beepskys hats now follow the laws of gravity and move up/down when he bobs up and down</li>
 			</ul>
-
-			<h2 class="date">29 July 2020</h2>
-			<h3 class="author">DeltaFire15 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">The 'Naked' outfit is no longer broken.</li>
-			</ul>
-			<h3 class="author">Ghommie updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed cremator trays, paleness examination strings, chat message for stamping paper, looping sounds, load away missions/VR admin verb, access requirements for using the sechuds.</li>
-				<li class="tweak">Alt-Clicking a cigarette packet should pull the lighter out first if present, then cigarettes.</li>
-			</ul>
-			<h3 class="author">Hatterhat updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Directional windows can now be rotated counterclockwise properly again.</li>
-			</ul>
-			<h3 class="author">NecromancerAnne, Sirich96 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Stunbaton sprites by Sirich96.</li>
-				<li class="rscadd">New sprites for the stunsword.</li>
-			</ul>
-			<h3 class="author">necromanceranne updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Adds some in-hands for the rapier sheath.</li>
-			</ul>
-			<h3 class="author">timothyteakettle updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">tail wagging should work in all cases now</li>
-				<li class="bugfix">bluespace jars work as intended now</li>
-				<li class="bugfix">aliens can remove embeds now</li>
-				<li class="bugfix">bloodsuckers are not affected by bloodloss</li>
-			</ul>
-			<h3 class="author">zeroisthebiggay updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Flannel jackets and bartender winter coat</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -27101,29 +27101,9 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - tweak: changing your character's gender won't randomize its hairstyle and facial
       hairstyle now
 2020-08-28:
-  EmeraldSundisk:
-  - rscadd: Adds more paper to the library
-  - rscadd: The law office now has a desk window
-  - tweak: Expands most of CogStation's exterior airlocks. Slightly adjusts surrounding
-      areas to accommodate this.
-  - tweak: Updates some of CogStation's paperwork
-  - tweak: The rat in the morgue turned themselves into a possum. Funniest shit I've
-      ever seen.
-  - bugfix: Adjusts some area designations so cameras should receive power properly
-  - bugfix: Cleans up an errant decal
-  Hatterhat:
-  - tweak: Traitor holoparasites can now only be bought once, because apparently you
-      can only have one active holopara.
-  - balance: PDA bombs can now only be bought once per uplink.
-  lolman360:
-  - rscadd: atmos = radiation = chemistry.
-  shellspeed1:
-  - rscadd: Adds slow mode for iv drips
   timothyteakettle:
   - rscadd: an ancient game over a thousand years old has re-emerged among crewmembers
       - rock paper scissors
-  - tweak: customization features appear in alphabetical order where necessary
-  - tweak: bokken do two more stamina damage now
   - rscadd: you can now choose a body sprite as an anthromorph or anthromorphic insect,
       and can choose from aquatic/avian and apid respectively (and obviously back
       to the defaults too)
@@ -27132,283 +27112,3 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: new explosion echoes
   - tweak: explosion echo range
   - soundadd: 5 new explosion related sounds
-2020-08-31:
-  Arturlang:
-  - tweak: Slimes can now damage structures, don't leave them unfed!
-  Chiirno:
-  - bugfix: Moves pill_bottles/dice to box/dice on CogStation.
-  Couls, ported by NecromancerAnne:
-  - code_imp: cleans up mech backstabbing code
-  DeltaFire15:
-  - rscdel: teleport-to-ark ability of the eminence, commented out
-  - rscadd: teleport-to-obelisk ability for the eminence
-  Detective-Google:
-  - tweak: plasmamen have no more slowdown
-  - rscadd: object reskins now use very nice and cool radials
-  EmeraldSundisk:
-  - rscadd: Adds a pool to MetaStation
-  - tweak: Slight readjustments to the surrounding area
-  - bugfix: Fixes a handful of external airlocks
-  ForrestWick:
-  - balance: removes wall walking boots from nukie uplink
-  - tweak: removes wall walking boots from nukie uplink
-  Ghommie:
-  - bugfix: e-gun overlays and some floor decals should have been fixed.
-  LetterN:
-  - rscadd: tgchat
-  Lynxless:
-  - tweak: Changed anatomic panacea into a direct buff, instead of a chem injection
-  - balance: Changed the values of anatomic panacea
-  - imageadd: Added a new icon for panacea's buff alert
-  Putnam3145:
-  - tweak: Pref for genital/vore examine text
-  - bugfix: Fixed a couple events having ghost roles eligible.
-  - balance: 'Buffed slaughter demon: gets stronger as it eats people'
-  - balance: 'Nerfed slaughter demon: no longer permanently round-removes all who
-      are eaten by it, instead releasing their now-heartless bodies'
-  - bugfix: Dynamic storytellers now calculate property weights properly.
-  Sonic121x:
-  - bugfix: Fix the four type of new tea that will stuck inside your vein.
-  - rscadd: drinking glass sprite for those tea.
-  kappa-sama:
-  - balance: miners can no longer acquire funny antag item
-  lolman360:
-  - bugfix: shuttle engine/heater sprites now face the right way
-  raspy-on-osu:
-  - tweak: TEG power output
-  - tweak: tesla movement priorities
-  - rscadd: tesla counterplay
-  - rscadd: tesla containment check (containment variable now usable)
-  silicons:
-  - bugfix: brooms now sweep objects on MOVABLE_PRE_MOVE rather than MOVABLE_MOVED
-  - balance: firedoors no longer automatically open on touch when there's no pressure
-      differences.
-  timothyteakettle:
-  - tweak: buzz, buzz2 and ping are now all unrestricted emotes and can be used by
-      anyone
-  - imagedel: the drake credit and pickle credit sprites have been removed
-  - refactor: tongue speech handling is now done by accent datums
-  zeroisthebiggay:
-  - rscdel: waffleco
-2020-09-01:
-  BlueWildrose:
-  - bugfix: fixed slimes starting off hungry
-2020-09-02:
-  Putnam3145:
-  - code_imp: Added a unit test for character saving.
-  - balance: Plastitanium rapier no longer silently sleeps with no chance at counterplay
-      when used by pacifists.
-  - bugfix: Fusion scan is now actually useful.
-  Tupinambis:
-  - tweak: moved the dakis, genital growth pills, and genital autosurgeons out of
-      the maintenance loot table and into kinkmates.
-  raspy-on-osu:
-  - bugfix: pyroclastic anomaly client spam
-  timothyteakettle:
-  - rscadd: you can hide your ckey now from the roundend report
-2020-09-03:
-  Ghommie:
-  - bugfix: Jaunters should now work with magic mirror chasming.
-  - bugfix: The photocopier can now print more than one copy at a time.
-  - bugfix: Alkali perspiration infos don't crash the Pandemic UI anymore.
-  - bugfix: Windoors can be actually tinted now.
-2020-09-04:
-  timothyteakettle:
-  - bugfix: ipcs can speak
-2020-09-05:
-  Bhijn:
-  - rscadd: Readded the old method of temperature notifications in the form of a new
-      pair of shivering/sweating notifications.
-  Putnam3145:
-  - tweak: Hilbert hotel flavor text for one particular snowflake hotel changed.
-  - admin: admins can now actually reduce threat level in dynamic
-  - tweak: Made owo.ogg smaller.
-  - tweak: Character saving unit test is now more verbose on failure.
-  - refactor: Added an extools proc hook alternative to rust_g logging.
-  raspy-on-osu:
-  - tweak: supermatter shard examine text
-  - tweak: protolathe item categories
-2020-09-06:
-  Putnam3145:
-  - rscdel: Dynamic no longer pushes events.
-  - balance: Made spontaneous brain trauma a good deal less annoying.
-  lolman360, NecromancerAnne:
-  - rscadd: The ancient art of blacksmithing, now in pixels.
-  - imageadd: cool swords and shit (thanks anne)
-  raspy-on-osu:
-  - tweak: thermomachine examine text
-2020-09-07:
-  DeltaFire15:
-  - spellcheck: fixed a typo causing a span not to show.
-  Putnam for debugging ammo loading! Thx!!:
-  - rscdel: Removed spell blade, diamond picaxe, and fire wand from lava land loot
-      tables
-  - tweak: Each mini boss now has its own type of crate.
-  - tweak: Each spike has its own type of crate that it pulls its now smaller loot
-      table from
-  - balance: Moved god eye from spike loot table to hard spawn collosses fight
-  - balance: Moved holoparasight from spike loot table to bubble gum
-  - balance: Moved magic meat hook from spike loot table to drake
-  - rscadd: 2 more crates to Arena Shuttle as well as 4-4-4 of each new type of chest
-  - balance: Replaced the diamond pick loot with a better one
-  - tweak: Replaced the cursted katana with a non cursted verson that deals half the
-      damage and has less block!
-  - rscadd: Three new potions, blue heals the mind like a mama potion, Green heals
-      the soul aka the organs! Lastly Red heals the body, by 100 damage of each main
-      types. Best not to waste them!
-  - rscadd: Four more "wands" Spellbooks! These fun little guys shoot out its own
-      pages to do the affect, one will set the target on fire like a bullet, one will
-      harm them a bit, one will heal the target a small bit - How nice! Last one will
-      give them a few statis affects like a taser bolt but without as much power or
-      tasing affect
-2020-09-08:
-  Ghommie:
-  - spellcheck: fixed names of the Electrical Toolbox goodie pack and green croptop
-      christmas suit.
-  - bugfix: Fixed turf visuals for real. Original PR by AnturK on tgstation.
-  KeRSedChaplain:
-  - soundadd: added borg_deathsound.ogg and android_scream.ogg
-  silicons:
-  - balance: meteor waves now have a static 5 minute timer.
-2020-09-09:
-  Putnam3145:
-  - bugfix: Made superconductivity work for the first time literally ever.
-  timothyteakettle:
-  - bugfix: accents work better
-2020-09-11:
-  Putnam3145:
-  - balance: Superconducting turfs now can't go below 0 celsius.
-2020-09-12:
-  BlueWildrose:
-  - bugfix: The Polychromic winter coat's hoodie will now polychrome, alongside any
-      other new polychromic items with toggleable headwear.
-  - bugfix: Minesweeper will no longer blow up the player's ears when they select
-      "Play on the same board"
-  - rscadd: Slimepeople will find warm donk pockets among other toxin healing items
-      even more repulsive, as they are anti-toxic.
-  - tweak: Slimepeople are now neutral to gross foods.
-  DeltaFire15:
-  - balance: AIs can no longer qdel() the gravity generator
-  Putnam3145:
-  - code_imp: Added some unit tests for reactions.
-  - refactor: replaced handle_changeling and handle_bloodsucker with signal registration
-  Sonic121x:
-  - bugfix: Fixed pill button on chemical press
-  TheObserver-sys:
-  - rscadd: Brass now has a proper datum. Aspiring Forgetenders rejoice!
-  Trilbyspaceclone:
-  - bugfix: Race based drinks will no longer stay inside your blood for ever.
-  Tupinambis:
-  - tweak: Redid Cogstation atmos pipes to make it less cluttered.
-  - tweak: Removed a few doors from the main hallway to mitigate chokepoint issues
-  - bugfix: All belt hell conveyers are now on by default, so that belt hell actually
-      works.
-  - bugfix: IDs for poddoors and belts and the like. Everything is now properly hooked
-      and should work as expected (except for the pressure triggered mass drivers)
-  - bugfix: addresses most if not all roundstart active turfs.
-  - bugfix: Issue where wires were connected to the SMES improperly, and SMES were
-      not properly precharged, resulting in power failure earlier than intended.
-  - bugfix: various rogue turfs and wirings.
-  - bugfix: security office APC being hooked to maintenance for some reason.
-  - bugfix: TEG is now directly wired to the SMES.
-  - code_imp: 'adds a subtype of mass drivers that is triggered by things being on
-      it. TODO: Make these mass drivers trigger poddoors, to make belt hell fully
-      functional.'
-  lolman360:
-  - bugfix: glaives now work again
-  zeroisthebiggay:
-  - balance: Revolver is now poplocked down to fifteen people.
-2020-09-16:
-  timothyteakettle:
-  - tweak: fixed an icon path
-2020-09-17:
-  DeltaFire15:
-  - rscadd: Failing the plushmium reaction can now create peculiar plushies, depending
-      on reaction volume.
-  - bugfix: The mood-buff from petting a plushie now works properly again.
-  - bugfix: Fixed wacky necropolis loot chest behavior
-  EmeraldSundisk:
-  - rscadd: Adds the Research Director's office to Omega Station
-  - rscadd: Adds 2 new solar arrays (and control rooms)
-  - rscadd: Adds some action figures that weren't there previously
-  - rscadd: The CMO's office now has a light switch
-  - tweak: Slight readjustments to impacted areas
-  - tweak: Readjusts the toxins air supply line to (ideally) be easier to service
-  - bugfix: Department camera consoles should now be able to actually check appropriate
-      cameras
-  - bugfix: Xenobiology can now be locked down (by the Research Director)
-  MrJWhit:
-  - rscadd: Adds a brain damage line
-  Putnam3145:
-  - bugfix: Your balls finally feel full, again.
-  timothyteakettle:
-  - rscadd: due to changes in policy, and several lawsuits, Nanotrasen has been forced
-      to allow disabled people to sign up
-2020-09-20:
-  DeltaFire15:
-  - bugfix: Sutures work on simplemobs again.
-  - bugfix: Attacking dismembered bodyparts now targets the chest instead, for weapons
-      aswell as unarmed attacks.
-  MrJWhit:
-  - rscadd: New sprites for chess pieces! You can craft them in-game with metal sheets.
-  silicons:
-  - balance: hulks can smash again (walls no longer break their hands)
-  - rscdel: acid no longer degrades armor
-2020-09-22:
-  Arturlang:
-  - rscadd: TGUI Statpanel
-  YakumoChen:
-  - imageadd: Mechsuits, robotics jumpsuits added to RoboDrobe
-  timothyteakettle:
-  - tweak: character previews should be more consistent now
-2020-09-24:
-  Putnam3145:
-  - refactor: Atmos is free.
-2020-09-25:
-  Putnam3145:
-  - bugfix: Removed a non-working proc that already had its functionality implemented
-      in another proc in the same file.
-2020-09-26:
-  CoreFlare:
-  - rscadd: IPC's can have hair. Why wasn't this added earlier. Use the bald hairstyle
-      for no hair.
-2020-09-27:
-  SiliconMain:
-  - tweak: Holograms made from projectors (atmos, engi, sec, medical, ect...) can
-      no longer be contaminated by radiation
-2020-09-28:
-  ArchieBeepBoop:
-  - rscadd: Craftable Micro Powered Fans
-  Degirin2120:
-  - rscadd: Added engineering hazard jumpsuits, can be found in the engidrobe, comes
-      in 3 varieties.
-  Putnam3145:
-  - tweak: Added a brute-force check-every-single-tile step to SSair when it has enough
-      time to run.
-  - balance: G fuid production is now much lower.
-  - rscdel: Supermatter sabotage objective's gone.
-  - balance: Subterfuge objectives are now all equally likely.
-  - spellcheck: Replaced a "(hopefully) 1" with a "2"
-  - tweak: Cryoing no longer unwins already-won objectives.
-  SiliconMain:
-  - tweak: Minor adjustment to material cost of long range atmos analyzer
-  Trilbyspaceclone:
-  - tweak: Most drinks now have some animation in them, from basic soda bubbles fizzing
-      around to ice cubes bobbing just a bit.
-  Tupinambis:
-  - bugfix: Ghost poly's color value is now a hex value instead of an oct value. This
-      has been a thing for OVER FIVE YEARS
-  - imageadd: Updates TEG, Antimatter, Jetpack sprites (CO2 and Oxy from Eris).
-  - imageadd: Replaced old chair sprites with new ones ported and modified from eris.
-  - tweak: Beds can now be placed both right and left.
-  - tweak: Subtle changes to stool legs to give them more of a shine.
-  raspy-on-osu:
-  - tweak: TEG power generation
-  thakyZ:
-  - rscadd: Added the ability to print the Light Replacer at the Engineering Protolathe
-  timothyteakettle:
-  - bugfix: turrets can once again be broken
-  - rscadd: you can now have heterochromia and select individual eye colours
-2020-09-29:
-  timothyteakettle:
-  - bugfix: fixed a typo causing your right eye colour to save as the left eye colour

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."

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))