Commit Graph

14638 Commits

Author SHA1 Message Date
Useroth 2ec5bc2db6 Because Travis is being a bitch right now. 2019-05-19 21:29:09 +02:00
deathride58 426033ab9d Merge pull request #8377 from Poojawa/crusher-nerf
Improves Recycler code by making it respect indestructible resistance
2019-05-19 14:14:25 -04:00
JTGSZ 03f129fa6e More changes 2019-05-19 07:29:09 -04: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
CalamaBanana de841761b2 Charter apostrophes fixed, too 2019-05-18 16:19:25 +02:00
CalamaBanana 4b91eb89b4 Update vote.dm 2019-05-18 16:05:38 +02:00
CalamaBanana 5c4da48593 Plays a sound if a vote is started 2019-05-18 16:03:59 +02: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
Nero1024 cbdb98988c fix footsteps for naga/tentacle 2019-05-17 20:42:54 -05:00
Fermi 2f75f861ce Explode proc set up 2019-05-18 01:19:04 +01:00
Nero1024 752f368ed2 Ports additional footsteps
And actually make it all compile.
2019-05-17 19:12:22 -05: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 aeac0134ec Improves Recycler code by making it respect indestructable resistance 2019-05-17 07:33:24 -05:00
Poojawa 601b9d9c65 Ports Oracle's cloning tube 2019-05-17 06:58:36 -05: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 eb717645bd M.emote("scream") 2019-05-17 05:16:53 -05:00
Poojawa 4f75f68a5d make hostile mobs gurgle people 2019-05-17 05:13:30 -05:00
Poojawa 751166cfbe Unfucks borg defibs 2019-05-17 04:59:53 -05:00
Poojawa b95bc24def mission accomplished 2019-05-17 04:24:23 -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
deathride58 02eb7f9e61 Merge pull request #8268 from Citadel-Station-13/kevinz000-patch-38
Makes auto transfer delay loaded from config rather than hardcoded to 2 hours
2019-05-17 00:34:17 -04:00
deathride58 aa1fdd9fb7 Merge pull request #8311 from Trilbyspaceclone/patch-114
Adds new phobias and tweaks others - syndicate, eye phobia
2019-05-17 00:33:12 -04:00
deathride58 50bdbcc46f Merge branch 'master' into kevinz000-patch-41 2019-05-17 00:29:31 -04:00