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/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index fb8a6b17bd..23d0288163 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -481,7 +481,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["hair_color"] >> hair_color
S["facial_hair_color"] >> facial_hair_color
S["left_eye_color"] >> left_eye_color
- S["right_eye_color"] >> left_eye_color
+ S["right_eye_color"] >> right_eye_color
S["use_custom_skin_tone"] >> use_custom_skin_tone
S["skin_tone"] >> skin_tone
S["hair_style_name"] >> hair_style
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 901d6f8572..ba57bbfac2 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,67 @@
-->
+
01 October 2020
+
BlueWildrose updated:
+
+ - Slimepeople are given unique laughs and screams.
+ - Adds "warbles", "chimpers", and "puffs" to the customizable speech verbs for character.
+
+
+
29 September 2020
+
timothyteakettle updated:
+
+ - fixed a typo causing your right eye colour to save as the left eye colour
+
+
+
28 September 2020
+
ArchieBeepBoop updated:
+
+ - Craftable Micro Powered Fans
+
+
Degirin2120 updated:
+
+ - Added engineering hazard jumpsuits, can be found in the engidrobe, comes in 3 varieties.
+
+
Putnam3145 updated:
+
+ - Added a brute-force check-every-single-tile step to SSair when it has enough time to run.
+ - G fuid production is now much lower.
+ - Supermatter sabotage objective's gone.
+ - Subterfuge objectives are now all equally likely.
+ - Replaced a "(hopefully) 1" with a "2"
+ - Cryoing no longer unwins already-won objectives.
+
+
SiliconMain updated:
+
+ - Minor adjustment to material cost of long range atmos analyzer
+
+
Trilbyspaceclone updated:
+
+ - Most drinks now have some animation in them, from basic soda bubbles fizzing around to ice cubes bobbing just a bit.
+
+
Tupinambis updated:
+
+ - Ghost poly's color value is now a hex value instead of an oct value. This has been a thing for OVER FIVE YEARS
+ - Updates TEG, Antimatter, Jetpack sprites (CO2 and Oxy from Eris).
+ - Replaced old chair sprites with new ones ported and modified from eris.
+ - Beds can now be placed both right and left.
+ - Subtle changes to stool legs to give them more of a shine.
+
+
raspy-on-osu updated:
+
+
thakyZ updated:
+
+ - Added the ability to print the Light Replacer at the Engineering Protolathe
+
+
timothyteakettle updated:
+
+ - turrets can once again be broken
+ - you can now have heterochromia and select individual eye colours
+
+
27 September 2020
SiliconMain updated:
@@ -1080,157 +1141,6 @@
- monkeys no longer continuously bleed everywhere
-
- 30 July 2020
- Adelphon updated:
-
- - Created a Cosmetic version of the camo.
-
- Arturlang updated:
-
- - Bloodsucker LifeTick runs from BiologicalLife now
-
- Ryll-Ryll ported by silicons updated:
-
- - Shoelaces are now a thing. You can untie them by laying down next to someone.
- - shoes now have lace delays and some can't be laced at all
- - do after now tracks who's interacting with who, meaning some actions now break when the target moves away.
-
- SiliconMain updated:
-
- - Ported the long range atmos analyzer from sk*rat, credit to NotRanged
-
- silicons updated:
-
- - energy sword perfect parries now reflect projectiles back at their shooters.
- - any mob can now parry if they have the right item
- - beam rifles now go into emitters properly
- - clickdelay has been refactored into an experimental hybrid system. Check code/modules/mob/clickdelay.dm for more information.
- - Resisting no longer checks clickdelay, but is standardized to a 2 second per resist system for most forms of resisting. It still sets clickdelay, though.
- - Meters have been added for estimating time until next attack/resist. Won't be that useful due to our clickdelay currently being very short, though. They're visible from your hand and resist HUD elements. experimental: Most attacks and forms of attacking (minus unarmed because it's too much of a pain to refactor how hugs/gloves of the north star works) now check for time-since-last-attack rather than making it so you can't attack for said time. This means you can very quickly switch to a gun from a melee weapon, whereas in the old system a melee weapon would put you on lockout for 0.8 seconds, in the new system all the gun cares about is that you did not attack for at least 0.4 seconds.
- - All clickdelay setting/reading are now procs, so it should be trivial to implement another system where drawing/switching to a weapon requires you to have it out for x seconds before using it. I am not personally doing it at this point in time though because it will likely just annoy everyone with no real gain unless we do something like putting a 0.8 second switch-to cooldown for guns (which I did not, yet)
- - attack_hand has been refactored to on_attack_hand remove: sexchems no longer impact click delay
- - turrets now automatically stagger their shots. Happy parrying/blocking.
- - turrets now speed_process, they were shooting slower than they should be
- - anything can now block with the right items
-
- timothyteakettle updated:
-
- - 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:
-
- - The 'Naked' outfit is no longer broken.
-
- Ghommie updated:
-
- - 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.
- - Alt-Clicking a cigarette packet should pull the lighter out first if present, then cigarettes.
-
- Hatterhat updated:
-
- - Directional windows can now be rotated counterclockwise properly again.
-
- NecromancerAnne, Sirich96 updated:
-
- - Stunbaton sprites by Sirich96.
- - New sprites for the stunsword.
-
- necromanceranne updated:
-
- - Adds some in-hands for the rapier sheath.
-
- timothyteakettle updated:
-
- - tail wagging should work in all cases now
- - bluespace jars work as intended now
- - aliens can remove embeds now
- - bloodsuckers are not affected by bloodloss
-
- zeroisthebiggay updated:
-
- - Flannel jackets and bartender winter coat
-
-
- 28 July 2020
- Cacogen updated:
-
- - OSHA has more pull than anyone could have expected. All armor provided by Nanotrasen and the syndicate now have tags that accurately lists defenses and resistances of a piece of clothing.
-
- CameronWoof updated:
-
- - Exotic seed crates now contain a spaceman's trumpet seed packet.
-
- EmeraldSundisk updated:
-
- - Renovates Snow Taxi's northeast bathroom to have multiple non-urinal toilets and showers
- - Adds signage/labeling to improve map readability
- - Adds a bathroom to the northwest station
- - Adds a filing cabinet to the cargo department
- - Area designation adjustments to account for the above changes
- - Adds a missing airlock cyclelink near medical
-
- Ludox235 updated:
-
- - Makes the flavour text that appears when you become a zombie tell you to act like one.
-
- MrJWhit updated:
-
- - Decluttered toxins and hid the yellow mix line in atmos, for metastation
-
- SiliconMain updated:
-
- - Paramedic heirloom is now a zippo
- - Durathread belts now protect their contents from radiation, and can hold full sized extinguishers
-
- Sishen1542 updated:
-
- dapnee updated:
-
- - added a fan to the listening outpost
- - added two missing r-walls near the SM, removed random light and wire node below the engine, and fixed the missing cable in the courtroom on Kilo
-
- kappa-sama updated:
-
- - Stimpaks cost 5tc once more, up from 3tc.
-
- silicons updated:
-
- - polychromatic cloaks to loadout
- - no more self healing with medibeam guns
- - oh no, taser buff. alt fire delay dropped to 0.4 seconds.
- - you can now shoot yourself by disarm-intenting yourself with a gun.
-
- timothyteakettle updated:
-
- - species code is now slightly less messy
- - slight tweak to how material crafting works
- - changed up pet carriers / bluespace jars a bit so you can't fit certain things inside them and also the text shown for resist times is accurate
-
- zeroisthebiggay updated:
-
- - Black Box theft objective
-
-
- 27 July 2020
- Hatterhat updated:
-
- - Training bokkens! Make 'em from wood, use 'em in-hand to toggle between harmful and not-so-harmful, practice your parrying with them!
- - Marker beacons should have a sprite again.
-
- silicons updated:
-
- - clownops and clown mobs now share the same faction. HONK!
-
- timothyteakettle updated:
-
- - modern pickle technology now allows people who have been turned into pickles, to be retrieved through the medical course of dying
-