Commit Graph

13133 Commits

Author SHA1 Message Date
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 '
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
cbdb98988c fix footsteps for naga/tentacle 2019-05-17 20:42:54 -05: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
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
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
deathride58
cbac4b1daf Merge pull request #8330 from Scorpion-117/master
This is an entire addition to put stargazers back into clock cult.
2019-05-17 00:13:35 -04:00
deathride58
d855a7eb0d Merge pull request #8332 from Useroth/collars-n-shit
Two new collar types (with lockable variants). All collars are now colorable a'la polychromic stuff.
2019-05-17 00:10:41 -04:00
Useroth
7712b51fd0 Tweaks n' shit. 2019-05-17 04:49:39 +02:00
Useroth
06681790cd ... 2019-05-17 04:24:38 +02:00
kevinz000
0e9717845e Update podpeople.dm 2019-05-16 19:03:32 -07:00
kevinz000
c69d9a38d7 Update podpeople.dm 2019-05-16 18:50:09 -07:00
Trilbyspaceclone
88a41f7783 Update cult_items.dm 2019-05-16 19:54:08 -04:00
Trilbyspaceclone
381a4869bb Update cult_items.dm 2019-05-16 19:40:09 -04:00
Trilbyspaceclone
a9eca3c143 Update clothesmate.dm 2019-05-16 15:51:46 -04:00
Trilbyspaceclone
65dfca1c18 Update wardrobes.dm 2019-05-16 15:44:59 -04:00
Sishen
ac04e23e31 Nympho Traiting & Arousal!
Butt slaps 2.0
Added nympho to defined traits, added arousal damage to ass slapping (arousal system needs to be enabled), and added forced orgasms to nymphos at max arousal
2019-05-16 10:17:16 -04:00
dtfe3
3ece75eb76 Makes the jetpack easier to craft 2019-05-16 15:30:46 +02:00
dtfe3
d228334cd5 Fix for the improvised jetpack 2019-05-16 15:19:59 +02:00
CalamaBanana
1e7b537166 Update code/modules/integrated_electronics/core/detailer.dm
Prettier list

Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com>
2019-05-16 00:42:05 +02:00
Useroth
c18756dec4 Well, that's it. 2019-05-15 23:24:12 +02:00
CalamaBanana
9e00562e68 Added custom option
Added custom option to the color selection
2019-05-15 13:13:17 +02:00
Useroth
701b01dfa6 Just another commit to make travis fucking recompile it 2019-05-15 02:30:47 +02:00