shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,809 Commits 5 Branches 0 Tags
7fb96ab0cfba467c2fbc997c4d659f06bd1083eb
Commit Graph

718 Commits

Author SHA1 Message Date
Ghommie
7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
kevinz000
90d4f213bf Update preferences.dm (#12230) 2020-05-12 17:39:37 +02:00
kevinz000
f1ba2ae8e4 Merge pull request #12196 from Citadel-Station-13/Ghommie-patch-1 
bumps up savefile version cause horns/wings
 2020-05-11 04:18:29 -07:00
kevinz000
f292d4047c Adds OOC notes (#12067) 
* ooc notes

* fixes

* repath

* ok

* This SHOULD compile, or else...

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-11 01:35:48 +02:00
Ghom
84f95d032d Update preferences_savefile.dm 2020-05-10 14:14:32 +02:00
Ghommie
ccfce7cb64 Makes wings/horns colors dna features instead of human defines 2020-05-05 06:22:58 +02:00
Ghommie
3de0e545c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-05 05:44:55 +02:00
kevinz000
8f29839dbf Runechat Port (#12065) 
* A

* A

* Ports Runechat

* compile fix

* fuck

* maybe?

* will this work?

* PLEASE

* fix

* fuck this
 2020-05-03 03:53:19 +02:00
Ghommie
cd642aff73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-01 22:12:00 +02:00
Ghommie
94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-25 17:09:34 +02:00
kevinz000
1236e11eca Merge pull request #11950 from Citadel-Station-13/Ghommie-patch-3 
Fixing a little mistake with a config.
 2020-04-22 18:41:21 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghom
63362f74c9 Merge pull request #11912 from Seris02/betteruipref 
toggle for tetris bags
 2020-04-22 22:26:40 +02:00
Seris02
39199a3a79 there 2020-04-22 12:31:55 +08:00
Putnam3145
45f032a600 Merge pull request #11854 from Citadel-Station-13/Ghommie-patch-1 
Something about configs and integers.
 2020-04-21 13:04:31 -07:00
Ghommie
c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Ghommie
e0d219650f Ready for testing. 2020-04-21 01:26:34 +02:00
Ghom
4cf80cb277 Update preferences_savefile.dm 2020-04-20 17:56:48 +02:00
Ghom
e870830a72 Update preferences.dm 2020-04-20 17:52:10 +02:00
Ghommie
0bef955806 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-20 15:14:30 +02:00
Ghommie
3bef4b88ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-04-20 02:29:34 +02:00
Seris02
cc82f08ebc weh 2020-04-18 18:28:35 +08:00
Putnam
33039f9962 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization 2020-04-17 18:56:26 -07:00
Ghom
7a47debe9e Merge branch 'master' into Ghommie-patch-1 2020-04-18 01:27:00 +02:00
Ghommie
87a6bd013c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-17 21:57:21 +02:00
Ghommie
3dab97b62f I set amount instead of max_amount to INFINITY, that's why it hanged. 2020-04-17 21:52:08 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Ghommie
2200c690f7 configs 2020-04-16 18:44:05 +02:00
Ghom
b7b9fc55f5 Update preferences_savefile.dm 2020-04-16 15:54:59 +02:00
Ghommie
586966ea51 General refactor for some snowflake bodyparts procs and taurs. 2020-04-16 03:37:52 +02:00
Putnam
3b79d6085b WHOOPS GOTTA UPDATE SAVEFILE VERSION 2020-04-14 20:10:32 -07:00
Ghommie
d84ef22f22 I'm amazed this actually works fine. 2020-04-14 21:58:37 +02:00
Ghommie
571584901c Custom skin tone preferences. 2020-04-14 19:10:28 +02:00
Putnam
1e8fffbf0b Replaced all the extraneous flags with bitflags 2020-04-13 16:47:43 -07:00
Ghommie
e6fbd0cced Whops 2020-04-12 05:13:43 +02:00
Ghommie
fe4b270568 Sprite size preferences?! Oh no! 2020-04-12 05:08:49 +02:00
kevinz000
d19dd8f2e1 fixes baystruments (#11790) 
* fix

* sigh
 2020-04-10 15:36:42 +02:00
Artur
f26f0c2555 Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix 2020-04-05 18:21:50 +03:00
Artur
881f8765f4 Stufffs 2020-04-01 15:29:40 +03:00
kevinz000
37625adb69 Merge pull request #11698 from Ghommie/Ghommie-cit656 
The banishment of the floating disembodied phallus.
 2020-03-31 18:04:28 -07:00
Ghommie
4582e9cdf5 Oh. 2020-03-31 02:44:20 +02:00
Ghommie
e26b43d80b The banishment of the floating disembodied phallus. 2020-03-31 02:40:28 +02:00
Seris02
5095eee659 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into AAAAAAAAAAA 2020-03-30 17:37:47 +08:00
Seris02
63f033e46a FUCKING INFURIATING ME ALL THIS TIME 2020-03-30 17:30:08 +08:00
kevinz000
6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650 
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
 2020-03-28 16:00:48 -07:00
kevinz000
9797089f0c Merge pull request #11650 from Ghommie/Ghommie-cit649 
Ports "Adds spam prevention to clients"
 2020-03-28 15:59:40 -07:00
Putnam3145
b5c4124d7a Merge pull request #11638 from Ghommie/Ghommie-cit646 
Moderately unoriginal PR title about runtime errors.
 2020-03-27 17:12:49 -07:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Ghommie
9ab0cccdec porting stuff 2020-03-27 19:52:33 +01:00
Putnam3145
1a6107a518 Removed nymphomania, plus code cleanup (#11641) 2020-03-27 14:03:05 +01:00