diff --git a/html/changelog.html b/html/changelog.html
index df181650d4..ef0caf1317 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -126,6 +126,39 @@
the aesthetic sterile mask no longer hides faces so you can cosplay egirls and keep flavortexts
+ 09 February 2021
+ Chiirno updated:
+
+ - Charismatic Suit
+ - Urban Jacket
+
+ DeltaFire15 updated:
+
+ - Added nanogel to the robodrobe.
+
+ Putnam3145 updated:
+
+ - Config to keep unreadied players from mode voting
+
+ dzahlus updated:
+
+ - fixes grenadelaunch.ogg being used where it shouldn't and makes mech weapons use correct sound
+
+ keronshb updated:
+
+ - 10 > 30 second for Warp Implant cooldown
+ - Comments out power sink objective.
+
+ timothyteakettle updated:
+
+ - pickpocketing is now logged using log_combat
+ - persistent blood should stop being invisible and alt clicking it shouldn't return the entire spritesheet
+
+ zeroisthebiggay updated:
+
+ - the aesthetic sterile mask no longer hides faces so you can cosplay egirls and keep flavortexts
+
+
09 February 2021
Chiirno updated:
@@ -144,64 +177,6 @@
- sentient viruses can now infect synths and ipcs
- 07 February 2021
- Thalpy updated:
-
- - Dispenser: Adds the ability to store a small amount of reagents in the machine itself for dispensing. Reacting recipies cannot be stored. Size of storage increases with bin size.
- - Dispenser: Allows reagents to be color coded by pH
- - Dispenser: Each reagent displays it's pH on hover
- - Dispenser: Allows the user to toggle between buttons and a radial dial
- - Dispenser: When the dispencer is upgraded it can dispense 5/3/2/1 volumes based on rating refactor: Dispenser: as it was before. This does not break recorded recipes.
- - Adds a round function to some numbers so they're not huge
- - The Chem master can now get purity for all reagents when analysed
- - Synthissue fixes
- - buffers now have a strong and weak variant. Weak can be dispensed, and strong can be created. Strong buffers are 6x more effective.
- - Some buffer pH edge calculation fixes
-
- TyrianTyrell updated:
-
- - added a signed language, that can't be used over the radio but can be used if you're mute. also added the multilingual trait.
- - hopefully added an icon for the signed language.
- - changed how some traits function slightly.
-
- dzahlus updated:
-
- - tweaked a few sounds
- - added a new weapon sounds
- - removed old weapon sounds
- - changed some sound related code
-
- silicons updated:
-
- - syndicate ablative armwraps have been added.
-
-
- 05 February 2021
- SmArtKar updated:
-
- - The orbit menu now has an Auto-Observe button! No more sifting through the lame observe menu to snoop in people's backpacks! Also, orbit menu now refreshes.
- - KAs are no longer getting broken when fired by a circuit
-
- keronshb updated:
-
- - Force and damage > 15 from 18/25
- - Knockdown put down to 5 from 30
- - Armor pen down to 10 from 100.
- - Makes cell chargers, charge faster.
-
- raspy-on-osu updated:
-
- - alien royals can no longer ventcrawl
-
- shellspeed1 updated:
-
- - There actually needs to be people for zombies to happen now.
-
- timothyteakettle updated:
-
- - dwarf facial hair is no longer randomised
-
-
03 February 2021
Hatterhat updated:
diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm
index f7911def84..3eb656f65a 100644
--- a/modular_citadel/code/modules/mob/cit_emotes.dm
+++ b/modular_citadel/code/modules/mob/cit_emotes.dm
@@ -300,3 +300,24 @@
user.nextsoundemote = world.time + 7
var/sound = pick('sound/voice/slime_squish.ogg')
playsound(user, sound, 50, 1, -1)
+
+/datum/emote/living/pain
+ key = "pain"
+ key_third_person = "cries out in pain!"
+ message = "cries out in pain!"
+ emote_type = EMOTE_AUDIBLE
+ muzzle_ignore = FALSE
+ restraint_check = FALSE
+
+/datum/emote/living/pain/run_emote(mob/living/user, params)
+ if(!(. = ..()))
+ return
+ if(user.nextsoundemote >= world.time)
+ return
+ user.nextsoundemote = world.time + 7
+ var/sound
+ if(user.gender == MALE)
+ sound = pick('modular_citadel/sound/voice/human_male_pain_1.ogg', 'modular_citadel/sound/voice/human_male_pain_2.ogg', 'modular_citadel/sound/voice/human_male_pain_3.ogg', 'modular_citadel/sound/voice/human_male_pain_rare.ogg')
+ else
+ sound = pick('modular_citadel/sound/voice/human_female_pain_1.ogg', 'modular_citadel/sound/voice/human_female_pain_2.ogg', 'modular_citadel/sound/voice/human_female_pain_3.ogg')
+ playsound(user, sound, 50, 0, 0)
diff --git a/modular_citadel/sound/voice/human_female_pain_1.ogg b/modular_citadel/sound/voice/human_female_pain_1.ogg
new file mode 100644
index 0000000000..f697996e56
Binary files /dev/null and b/modular_citadel/sound/voice/human_female_pain_1.ogg differ
diff --git a/modular_citadel/sound/voice/human_female_pain_2.ogg b/modular_citadel/sound/voice/human_female_pain_2.ogg
new file mode 100644
index 0000000000..aa2eaba352
Binary files /dev/null and b/modular_citadel/sound/voice/human_female_pain_2.ogg differ
diff --git a/modular_citadel/sound/voice/human_female_pain_3.ogg b/modular_citadel/sound/voice/human_female_pain_3.ogg
new file mode 100644
index 0000000000..c21d462ba5
Binary files /dev/null and b/modular_citadel/sound/voice/human_female_pain_3.ogg differ
diff --git a/modular_citadel/sound/voice/human_male_pain_1.ogg b/modular_citadel/sound/voice/human_male_pain_1.ogg
new file mode 100644
index 0000000000..0dbedfe7e8
Binary files /dev/null and b/modular_citadel/sound/voice/human_male_pain_1.ogg differ
diff --git a/modular_citadel/sound/voice/human_male_pain_2.ogg b/modular_citadel/sound/voice/human_male_pain_2.ogg
new file mode 100644
index 0000000000..6f4a314c5c
Binary files /dev/null and b/modular_citadel/sound/voice/human_male_pain_2.ogg differ
diff --git a/modular_citadel/sound/voice/human_male_pain_3.ogg b/modular_citadel/sound/voice/human_male_pain_3.ogg
new file mode 100644
index 0000000000..7b13505345
Binary files /dev/null and b/modular_citadel/sound/voice/human_male_pain_3.ogg differ
diff --git a/modular_citadel/sound/voice/human_male_pain_rare.ogg b/modular_citadel/sound/voice/human_male_pain_rare.ogg
new file mode 100644
index 0000000000..73a5da2faf
Binary files /dev/null and b/modular_citadel/sound/voice/human_male_pain_rare.ogg differ
diff --git a/modular_citadel/sound/voice/pain emote credits.txt b/modular_citadel/sound/voice/pain emote credits.txt
new file mode 100644
index 0000000000..10b0c205df
--- /dev/null
+++ b/modular_citadel/sound/voice/pain emote credits.txt
@@ -0,0 +1 @@
+pain emote sound ported from https://gitlab.com/cmdevs/colonial-warfare
\ No newline at end of file