Commit Graph

7930 Commits

Author SHA1 Message Date
Poojawa ae939c4344 Female Gendered markings 2019-05-21 22:51:00 -05:00
Carlen White e9c450bf17 Flavor text with special characters don't get partially unescaped
Copying the text that was escaped would occasionally trim an escaping character. Now it's decoded, copied, then encoded to prevent it.
2019-05-21 22:04:14 -04:00
CdrCross 82d308eb5e Defibrillator Upgrades Proofread
My first ever contribution to Citadel, and first ever real GitHub Commit. This PR is a simple exercise in fixing and standardising some flavour text across Trilby's otherwise excellent defibrillator upgrades. (PR#8173)
No stats or gameplay elements have been adjusted.
2019-05-21 23:37:28 +02:00
dtfe3 0085a69d31 Watcher Wing Trophy Effect increase 2019-05-21 18:12:42 +02:00
deathride58 4a17f192e8 Merge pull request #8201 from Citadel-Station-13/kevinz000-patch-19
Changes OD thresholds to match RP server and only trigger when you /exceed/ it per definition of threshold
2019-05-21 08:05:54 -04:00
deathride58 eb099ecbc4 Merge pull request #7704 from Citadel-Station-13/kevinz000-patch-6
Adds manual play internet sound for when youtube-dl is too out of date to play Rasputin automatically
2019-05-21 08:05:22 -04:00
deathride58 efe8d73372 Merge pull request #8269 from Citadel-Station-13/kevinz000-patch-39
adds variant of podpersons with 20% brute/burn heal and 70% toxheal and 75% nutrition/light factor of normal for roundstart pod species
2019-05-21 08:04:57 -04:00
deathride58 f3116baa08 Merge pull request #8253 from Citadel-Station-13/kevinz000-patch-37
Removes firing pins from preprinted gravity guns
2019-05-21 08:04:26 -04:00
kevinz000 dc548c06b5 Merge pull request #8293 from Useroth/ninja-adrenals
Adrenal implant, as well as ling and ninja adrenals buff (or rather, making them function like pre-rework (or even slightly better))
2019-05-20 23:40:52 -07:00
kevinz000 a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker
[Ready]Makes a blue space bike horn HONK
2019-05-20 23:40:17 -07:00
kevinz000 d5f2fc156c Merge pull request #8368 from Trilbyspaceclone/patch-128
Adds more clothing to venders
2019-05-20 23:36:42 -07:00
kevinz000 cccf1e1291 Merge pull request #8369 from Trilbyspaceclone/patch-129
Adds more shuttle curse texts
2019-05-20 23:36:25 -07:00
kevinz000 999bb87b4a Merge pull request #8378 from Useroth/nutcracker
Nutcracker. Yes, it's big enough to crush heads.
2019-05-20 23:35:33 -07:00
kevinz000 bcf78736ba Merge pull request #8385 from BlackMajor/Dunga
Adds a cream pie smite.
2019-05-20 23:32:27 -07:00
kevinz000 a6a1de2f2f Merge pull request #8386 from BlackMajor/Ooga
Ling hivemind no longer turns apostrophes into '
2019-05-20 23:30:48 -07:00
kevinz000 74af355079 Merge pull request #8392 from Poojawa/donator-item-fixing
Fixes Kiara's sabre belt icons, fixes armor offsets for taurs
2019-05-20 23:30:28 -07:00
kevinz000 bd54053e7a Merge pull request #8375 from Poojawa/signaller-improvements
Singallers are now input instead of button mashing
2019-05-20 23:30:04 -07:00
BurgerLua bcf563e132 Fixes ass slapping to be less annoying. 2019-05-20 21:53:47 -07:00
BlackMajor 80c88a8494 Shit he right 2019-05-21 15:16:51 +12:00
Carlen White 51f2a37e6e Changed arousal message styling.
Now with less gaudy green.
2019-05-20 17:47:10 -04:00
Trilbyspaceclone d59614a9bb Update cult_items.dm 2019-05-20 15:21:06 -04:00
kevinz000 626ede8464 Merge pull request #8367 from Poojawa/genital-improvements
[READY] Genital fixes and skintone sync [Adds erections[]
2019-05-19 22:47:01 -07:00
kevinz000 6c79587dad Merge pull request #8354 from Sishen1542/Get-Your-Ass-Back-Here!
Butt Slaps
2019-05-19 22:43:40 -07:00
kevinz000 1deb83949d Merge pull request #8374 from Poojawa/Heart-attacks
Heart Attacks will murder you now
2019-05-19 12:46:39 -07:00
kevinz000 8ceec4271e Merge pull request #8373 from Poojawa/vore-mobs-should-gurgle
Simple Mob vore toggle works again
2019-05-19 12:46:13 -07:00
kevinz000 393d025465 Merge pull request #8382 from CalamaBanana/ear-Skintone-fix
Fixes color of elf ears, using skintone
2019-05-19 12:40:33 -07:00
Useroth 2ec5bc2db6 Because Travis is being a bitch right now. 2019-05-19 21:29:09 +02:00
Poojawa 5f358a5a75 Local sune fixes armor without having to do spritework 2019-05-18 23:42:29 -05:00
Useroth a92abcbb96 It's always the more extreme stuff you don't notice. Moved the damage check AFTER the check whether the head exists to begin with. 2019-05-18 21:40:43 +02:00
kevinz000 ed4c9506a7 Merge pull request #8388 from Useroth/collars-n-shit
Quick fix for the colorable collars. I've made the mistake of not testing code after applying a suggestion.
2019-05-18 08:30:10 -07:00
Useroth 8ea639a5ac Quick fix for the colorable collars. 2019-05-18 15:26:46 +02:00
Poojawa 28a1afa626 Properly adds NOGENITALS to species that wouldn't 2019-05-18 01:37:37 -05:00
BlackMajor 20bbc0888d Ling hivemind no longer turns apostrophes into '
Because They're not enjoying speaking gibberish for having proper grammar.
2019-05-18 17:42:17 +12:00
BlackMajor 00356ce980 Cream pie smite 2019-05-18 17:09:26 +12:00
kevinz000 8b127387c6 Merge pull request #8344 from Trilbyspaceclone/patch-119
Makes sushie fucken have its correct subcat so we can craft it
2019-05-17 21:28:59 -07:00
kevinz000 20b27ea92c Merge pull request #8362 from dtfe3/jetpack-stuff
Making the Improvised Jetpack recipe less confusing
2019-05-17 21:27:55 -07:00
kevinz000 50b6a610e9 Merge pull request #8303 from BurgerLUA/Vent-Clog-Fixes-And-Additions
Vent Clog Event Rebalance and Improvements
2019-05-17 21:27:32 -07:00
Nero1024 2a4a656a4d Port new footsteps from tg 2019-05-17 18:10:03 -05:00
CalamaBanana b3668a32d0 Fixes color of elf ears
Fixes color of elf ears
2019-05-17 20:29:43 +02:00
kevinz000 844fb13467 Merge pull request #8348 from Trilbyspaceclone/patch-123
Makes suitcases craftable
2019-05-17 08:36:20 -07:00
Useroth d2f7b961d9 Touch-up 2019-05-17 17:16:43 +02:00
Useroth 0f54bf7471 Might as well format it a little more. 2019-05-17 17:09:10 +02:00
Useroth 73c3e94946 A fixed oopsie. 2019-05-17 17:07:45 +02:00
Useroth 4d75eca582 Well, that was surely an interesting thing to code. 2019-05-17 16:22:17 +02:00
Poojawa 022e8710f9 port TG#43799 for signallers 2019-05-17 06:21:26 -05:00
Poojawa f95da1aae5 Heart Attacks will murder you now
Also sanity check for cursed heart overlay
2019-05-17 05:59:28 -05:00
Poojawa 0d02956144 Fixes simple mob vore toggle 2019-05-17 05:28:54 -05:00
Poojawa 4f75f68a5d make hostile mobs gurgle people 2019-05-17 05:13:30 -05:00
Sishen 267661e078 Tail Wagging
Makes it so nymphos will continue wagging their tails when booty or face slapped
2019-05-17 01:56:44 -04:00
deathride58 276a6e9896 Merge pull request #8307 from Citadel-Station-13/kevinz000-patch-49
buff sleepy pens to quickly drain stamina after 10 seconds
2019-05-17 00:54:17 -04:00