shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,116 Commits 5 Branches 0 Tags
231da023ec9c073f1644172794de8ef2dc43017e
Commit Graph

13165 Commits

Author SHA1 Message Date
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
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
c9f6b02a0e Update briefcase.dm 2019-05-12 21:23:40 -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
Trilbyspaceclone
3e4412e171 Delete autolathe_designs.dm 2019-05-12 02:04:07 -04:00
Trilbyspaceclone
62e5037eab Merge branch 'master' into patch-118 2019-05-12 02:03:32 -04:00
Trilbyspaceclone
db74544a7c Create autolathe_designs.dm 2019-05-12 02:02:49 -04: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