shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,564 Commits 5 Branches 0 Tags
d8024ef36f5d8cd07e6103b72a0c69e8fb573546
Commit Graph
20564 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot 1c608ca910 Automatic changelog generation for PR #8388 [ci skip] 2019-05-18 10:30:12 -05:00
kevinz000andGitHub 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
CalamaBananaandGitHub 0364b87358 Merge pull request #1 from Citadel-Station-13/master 
test
 2019-05-18 15:12:45 +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
kevinz000andGitHub 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
CitadelStationBot 4087dafeb6 Automatic changelog generation for PR #8362 [ci skip] 2019-05-17 23:27:57 -05:00
kevinz000andGitHub 20b27ea92c Merge pull request #8362 from dtfe3/jetpack-stuff 
Making the Improvised Jetpack recipe less confusing
 2019-05-17 21:27:55 -07:00
CitadelStationBot 675c72d276 Automatic changelog generation for PR #8303 [ci skip] 2019-05-17 23:27:35 -05:00
kevinz000andGitHub 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
Poojawa f1b27427b4 SEENGING PAIPZE 2019-05-17 11:03:32 -05:00
CitadelStationBot d4eba1f12a Automatic changelog generation for PR #8348 [ci skip] 2019-05-17 10:36:22 -05:00
kevinz000andGitHub 844fb13467 Merge pull request #8348 from Trilbyspaceclone/patch-123 
Makes suitcases craftable
 2019-05-17 08:36:20 -07:00
kevinz000andGitHub fac9f2a3d3 Merge pull request #8364 from Poojawa/Vent-and-scrubbers 
Improved Vent and Scrubber icon port
 2019-05-17 08:35:50 -07:00
kevinz000andGitHub 77232cc4bb Merge pull request #8365 from Poojawa/salt-inducer 
[s] Increases salt 100 fold
 2019-05-17 08:34:36 -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
deathride58andGitHub 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
deathride58andGitHub 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
CitadelStationBot c8eb4ba8cb Automatic changelog generation for PR #8311 [ci skip] 2019-05-16 23:33:14 -05:00
deathride58andGitHub 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
deathride58andGitHub 50bdbcc46f Merge branch 'master' into kevinz000-patch-41 2019-05-17 00:29:31 -04:00
deathride58andGitHub ba125a2648 Merge pull request #8270 from Citadel-Station-13/kevinz000-patch-40 
makes Eutactic (so the other energy sword) swords not strictly crappier than normal swords, makes combining them possible and makes the hyper-eutactic blade not strictly crappier than the desword
 2019-05-17 00:14:36 -04:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub e7d50f6e57 Merge pull request #8355 from CalamaBanana/Circuit-Colors 
Adds pink and a custom color option to the circuit coloring tool
 2019-05-16 23:30:00 -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
kevinz000andGitHub 0e9717845e Update podpeople.dm 2019-05-16 19:03:32 -07:00
kevinz000andGitHub c69d9a38d7 Update podpeople.dm 2019-05-16 18:50:09 -07:00
TrilbyspacecloneandGitHub f6ce2b25bb Update mime.txt 2019-05-16 20:37:53 -04:00
TrilbyspacecloneandGitHub 88a41f7783 Update cult_items.dm 2019-05-16 19:54:08 -04:00