shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,807 Commits 5 Branches 0 Tags
4e528da5c283fa00367b809a3010268fee970dfe
Commit Graph

559 Commits

Author SHA1 Message Date
kevinz000
c222ea0bb3 Merge pull request #10356 from deathride58/sprintprefs 
Adds space to sprint and toggle sprint as preferences
 2019-12-31 19:29:47 -08:00
nik707
8a4e44758f Merge pull request #10165 from Ghommie/Ghommie-cit456 
Minor underwear fixes and tweaks.
 2019-12-30 18:28:48 -06:00
Putnam
d78ebd15f3 amazing. 2019-12-30 12:38:38 -08:00
deathride58
5c9c9d9566 Adds space to sprint and toggle sprint as preferences 2019-12-30 15:32:15 -05:00
Seris02
9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
kevinz000
74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
Putnam3145
640419eed5 Merge pull request #10343 from Ghommie/Ghommie-cit494 
[s] Fixes anti-ghost-role vars a little.
 2019-12-29 20:54:55 -08:00
Ghommie
0ab817c208 [s] Fixes ghost anti-ghostrole timers a little. 2019-12-29 22:22:20 +01:00
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
shellspeed1
1875ea3f58 new wings and fluff 2019-12-21 23:47:41 -08:00
Putnam
ef360838da errors 2019-12-20 14:50:08 -08:00
Putnam
c810145fc1 also adds aphrodisiacs, slaps, all hypno as prefs 2019-12-20 14:47:09 -08:00
Ghom
a398b7c413 Merge pull request #10200 from Citadel-Station-13/kevinz000-patch-125 
Adds 8 character save slots
 2019-12-20 22:55:22 +01:00
Putnam
f2b46f0951 ROBUST OPTING MECHANICS 2019-12-19 11:14:02 -08:00
Putnam
9ec2c8a7f1 MKUltra made double opt-in 2019-12-19 09:54:34 -08:00
Ghommie
ba851d55b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456 2019-12-18 19:42:41 +01:00
kevinz000
b4bd2cbb5c Update preferences.dm 2019-12-15 20:20:04 -07:00
Ghommie
b39ae815f3 Porting several quirks code updates. 2019-12-13 16:12:04 +01:00
Ghommie
c098d497ad Minor underwear fixes and tweaks. 2019-12-13 06:50:14 +01:00
Ghommie
3545f10137 Fixing character setup preview icons. 2019-12-12 17:04:14 +01:00
Putnam3145
c54523e324 Merge pull request #9629 from Citadel-Station-13/kevinz000-patch-87 
can we not tell all the nonantags that antagonist ooc is enabled please
 2019-12-09 13:25:37 -08:00
BlackMajor
786d40032d Merge pull request #9922 from GrayRachnid/braintraumasport 
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
 2019-11-25 12:31:15 +13:00
Lin
e954cec58c Merge pull request #9898 from Ghommie/Ghommie-cit387 
Dreamchecker compatibility changes, part 3.
 2019-11-23 05:52:44 +00:00
GrayRachnid
c8e52fb8e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 15:24:15 -05:00
Lin
1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245 
Touching up job outfits equip procs, little PDA fix.
 2019-11-22 02:37:49 +00:00
Ghommie
dccb3c2e22 part 3 2019-11-21 06:36:22 +01:00
Putnam
f3c4897b48 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 22:31:48 -08:00
kevinz000
af0962088c Merge pull request #9453 from Ghommie/Ghommie-cit226 
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
 2019-11-14 15:47:18 -07:00
Putnam
304ce37d6c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 02:23:48 -08:00
kevinz000
3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335 
Dreamchecker compatibility changes, part 1.
 2019-11-14 01:37:41 -07:00
Putnam
5e51cc63f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-13 16:58:44 -08:00
Ghommie
4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
279c22b781 lentext to length. 2019-11-09 23:17:04 +01:00
Putnam
912ca97d29 Added a preference that auto-votes at extremely low weight. 2019-11-08 03:44:22 -08:00
Ghommie
986c4e11c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit245 2019-11-02 02:32:23 +01:00
kevinz000
587e6b9262 Update aooc.dm 2019-10-31 17:30:29 -07:00
kevinz000
a56726fd94 Update aooc.dm 2019-10-27 01:25:33 -07:00
Ghommie
79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-25 12:42:28 +02:00
Ghommie
69f27e19fe Touching up job outfits equip procs, little PDA fix. 2019-10-18 18:02:24 +02:00
Linzolle
5ddd0484a8 colourable wings 2019-10-17 22:11:47 -05:00
Ghommie
f73516a17f made it into config. 2019-10-17 04:44:30 +02:00
Ghommie
475303bd02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-17 00:50:30 +02:00
r4d6
a61fed2a73 Update preferences.dm 2019-10-10 20:32:19 -04:00
r4d6
ce81e657b5 Update preferences_savefile.dm 2019-10-10 20:32:17 -04:00
GrayRachnid
9f8ad74bf9 New traumas and some other things. 2019-10-08 03:53:01 -04:00
kevinz000
f405cd1be3 Merge pull request #8937 from Ghommie/Ghommie-cit153 
darkmode/lightmode fixes and tweaks.
 2019-10-08 00:25:51 -07:00
Ghommie
02df68a1cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-02 07:26:09 +02:00
JTGSZ
5b3f6dca29 Species Job Check 2019-09-23 23:58:57 -04:00
kevinz000
1fda7755d3 Merge pull request #9298 from Ghommie/Ghommie-cit197 
Fixes undershirts n socks colors prefs.
 2019-09-21 01:43:10 -07:00