shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,488 Commits 5 Branches 0 Tags
733bb498ca00ade6282dc39ba8e3744984e08854
Commit Graph

7824 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Useroth
8500e69088 Merge branch 'collars-n-shit' of github.com:Useroth/Citadel-Station-13 into collars-n-shit 2019-05-15 02:09:41 +02:00
Useroth
3f64128513 Apply suggestions from code review 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-05-15 02:08:43 +02:00
Useroth
6a29a0744b Applied suggested changes. 2019-05-15 02:07:16 +02:00
Useroth
f910eea9f8 Update code/modules/clothing/neck/_neck.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-05-15 01:41:18 +02:00
CalamaBanana
7cd74e6601 Adds pink to the circuit coloring tool 2019-05-15 00:07:53 +02:00
kevinz000
a3114d830a Merge pull request #8336 from BurgerLUA/Integrated-Circuit-Fixes-and-Additions 
Adds Stun Circuit, Pneumatic Cannon Circuit. Makes Extinguisher and Smoke Reagent circuits work.
 2019-05-14 13:48:54 -07:00
Sishen
afaf15bc59 Booty Calls! 
Added butt slaps
 2019-05-14 10:29:04 -04:00
deathride58
06ea7de46b [S] Fixes a fairly huge vector for server crashes 2019-05-13 21:49:33 -04:00
Trilbyspaceclone
41400ff94a Update recipes.dm 2019-05-12 21:54:18 -04:00
Trilbyspaceclone
90268dea1d Update recipes.dm 2019-05-12 21:17:28 -04:00
BurgerLua
34cb661211 Requested changes 2019-05-12 13:44:23 -07:00
kevinz000
9f3aa6de13 Merge pull request #8316 from Trilbyspaceclone/Lock_and_key 
Better Locked Collar checks
 2019-05-11 22:21:16 -07:00
kevinz000
4f12a762f3 Merge pull request #8342 from BurgerLUA/Cult-Improvements-and-Fixes 
Adds EMP Defensive Traps to Clockcult
 2019-05-11 22:19:46 -07:00
kevinz000
db99b595f3 Merge pull request #8331 from Useroth/dick-circuits 
Dildo-shaped circuit assemblies. Because that's what the community needs.
 2019-05-11 22:17:46 -07:00
kevinz000
36ee078e23 Merge pull request #8333 from Useroth/ayy-baton 
Abductor baton buff. Because it currently sucks balls.
 2019-05-11 22:17:27 -07:00
kevinz000
86e3992945 Merge pull request #8335 from Poojawa/quick-fiiiix-marking 
Quick fiiiix marking
 2019-05-11 22:16:37 -07:00
kevinz000
9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding 
Satchel of Holding!
 2019-05-11 22:14:15 -07:00
kevinz000
4276f53338 Merge pull request #8341 from Trilbyspaceclone/golden 
Golden toolboxes.
 2019-05-11 22:13:18 -07:00