Commit Graph

9386 Commits

Author SHA1 Message Date
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
Fermi 71088eace9 More fixes 2019-05-21 05:05:32 +01:00
BlackMajor 80c88a8494 Shit he right 2019-05-21 15:16:51 +12:00
Fermi a9bc75fc0e why do I even bother 2019-05-21 02:53:17 +01:00
Carlen White 51f2a37e6e Changed arousal message styling.
Now with less gaudy green.
2019-05-20 17:47:10 -04:00
Trilbyspaceclone 539a965159 Update lavaland_ruin_code.dm 2019-05-20 15:33:46 -04:00
Trilbyspaceclone d59614a9bb Update cult_items.dm 2019-05-20 15:21:06 -04:00
Fermi bb4aecbd5f Progressional fixes 2019-05-20 07:44:39 +01: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
Fermi a6ede9fecc Endless fixes 2019-05-19 23:32:30 +01: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
Fermi 072a4ce6a6 Sleepy fixes 2019-05-19 04:20:34 +01:00
Fermi 8130a10d3a Gosh darn fixes 2019-05-19 03:39:26 +01:00
Fermi 791d021d50 Even more fixes. 2019-05-19 01:37:20 +01:00
Fermi a837eda98b More fixes. 2019-05-18 22:50:20 +01: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
Trilbyspaceclone 9f2b91b2e9 Apply suggestions from code review
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-05-18 12:24:40 -04: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
JTGSZ 6c077758c6 ports gang 2019-05-18 05:06:22 -04: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 &#39;
Because They&#39;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
Fermi 4ef1355933 Made "heyo" a phase 2 2019-05-18 03:32:58 +01:00
Fermi 0700e0c080 Near completion - missing Neko's pH paper and reaction vars. 2019-05-18 03:02:14 +01:00
Fermi 2f75f861ce Explode proc set up 2019-05-18 01:19:04 +01: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
Fermi cabf490134 Fixed compiling errors for Neko. 2019-05-17 16:57:42 +01:00
kevinz000 844fb13467 Merge pull request #8348 from Trilbyspaceclone/patch-123
Makes suitcases craftable
2019-05-17 08:36:20 -07:00
Fermi fa5531285a Push for Neko, probably doesn't compile atm. 2019-05-17 16:23:34 +01: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