shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,501 Commits 5 Branches 0 Tags
43c1dd4aece2bdb06b19004761bf5bd419e24898
Commit Graph

12734 Commits

Author SHA1 Message Date
kevinz000
3ae9661866 Merge pull request #8390 from CalamaBanana/station-charter-apostrophes 
Captain's Charter no longer turns apostrophes into "'", too
 2019-05-20 23:32:50 -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
dff600f1e5 Merge pull request #8389 from CalamaBanana/vote-sound 
Plays a harmless sound when a vote is started
 2019-05-20 23:31:56 -07:00
kevinz000
733bb498ca Merge pull request #8376 from Poojawa/oracle-cloning 
Ports Oracle's cloning tube
 2019-05-20 23:31:38 -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
BlackMajor
80c88a8494 Shit he right 2019-05-21 15:16:51 +12: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
d8579b2e2d Merge pull request #8372 from Poojawa/paws-of-life-needs-more-fixing 
Unfucks borg defibs
 2019-05-19 12:47:03 -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
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
Poojawa
5f358a5a75 Local sune fixes armor without having to do spritework 2019-05-18 23:42:29 -05: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
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
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
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
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
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
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