shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

19834 Commits

Author SHA1 Message Date
BlackMajor c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
BlackMajor 6f98efb18e Merge pull request #9902 from Useroth/new-tg-plants 
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
 2019-11-25 11:30:43 +13:00
BlackMajor 47b5dbeaaa Merge pull request #9625 from Ghommie/Ghommie-cit277 
Unmodularize digi/muzzled clothing sprites.
 2019-11-25 11:30:31 +13:00
Lin 7481661182 Merge pull request #9907 from Putnam3145/midround-Vr-fix 
[DYNAMIC] Prevents VR mobs from being midround antags.
 2019-11-24 20:01:36 +00:00
Useroth 6a59cc1c99 Added missing jupitercup mycelium icon. Added a mutation path for galaxythistle. 2019-11-24 10:14:16 +01:00
Putnam 6c51f09a82 Make organs no longer contaminable. 2019-11-23 21:14:24 -08:00
Fermi 99e9c606c0 I dunno what I did but it's fixed... somehow. 2019-11-24 04:03:51 +00:00
Fermi 614a462176 Revert "Revert "Merge remote-tracking branch 'upstream/master'"" 
This reverts commit 1509d9d183.
 2019-11-24 03:33:02 +00:00
Fermi ba4fa1ef67 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 03:06:08 +00:00
Fermi aeb8606ce0 Revert "Revert "PLASE"" 
This reverts commit 00601a0c87.
 2019-11-24 03:04:52 +00:00
Fermi 2501b5c88c Revert "Revert "Okay"" 
This reverts commit fb2c29caff.
 2019-11-24 03:04:27 +00:00
Fermi 3155e3ffb3 Revert "Revert "Removes the random love"" 
This reverts commit ce7e9ac452.
 2019-11-24 03:04:20 +00:00
Fermi 1509d9d183 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
 2019-11-24 03:04:13 +00:00
Fermi c8b206a4cf Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 03:04:04 +00:00
Fermi 4c1c257035 Revert "Revert "pls"" 
This reverts commit b23f2a4460.
 2019-11-24 03:02:21 +00:00
Fermi 9eaed4ea8e Revert "pls2" 
This reverts commit 0eb635b908.
 2019-11-24 03:02:04 +00:00
Fermi 8ea6618f5d Revert "ARGH" 
This reverts commit f0f52ce3f8.
 2019-11-24 03:01:59 +00:00
Fermi cb4bfa65d1 Revert "?" 
This reverts commit 05d18171e0.
 2019-11-24 03:01:55 +00:00
Fermi 1f7e9d8ab5 Revert "please" 
This reverts commit ac53c26d87.
 2019-11-24 03:01:51 +00:00
Fermi ac53c26d87 please 2019-11-24 02:58:15 +00:00
Fermi 05d18171e0 ? 2019-11-24 02:57:46 +00:00
Fermi f0f52ce3f8 ARGH 2019-11-24 02:55:50 +00:00
Fermi 0eb635b908 pls2 
ugh
 2019-11-24 02:52:17 +00:00
Fermi b23f2a4460 Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 02:49:20 +00:00
Fermi 8c97511871 pls 
ugh
 2019-11-24 02:47:52 +00:00
Fermi 135608551f Merge remote-tracking branch 'upstream/master' 2019-11-24 02:45:28 +00:00
Fermi ce7e9ac452 Revert "Removes the random love" 
This reverts commit b056d91ea5.
 2019-11-24 02:45:06 +00:00
Fermi fb2c29caff Revert "Okay" 
This reverts commit 37ac0ccb66.
 2019-11-24 02:44:32 +00:00
Fermi 00601a0c87 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 02:44:00 +00:00
Fermi 8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
Winter Flare fb4a47d310 Added more items to vendors. 
-Added stuff to the following:
clothing vendor
chef utensil vendor
snack vendors
kinkmate
 2019-11-23 15:58:04 -05:00
Linzolle e19b85c823 change recipe 2019-11-23 12:58:42 -06:00
kevinz000 f0996208a3 Merge pull request #9874 from Ghommie/Ghommie-cit379 
Honkbot slip and slide fun ride.
 2019-11-23 11:49:32 -07:00
kevinz000 aba39f0b36 Merge pull request #9891 from Putnam3145/dynamic-traitor-fix 
[DYNAMIC] Reverted making latejoiners count for roundstart rulesets
 2019-11-23 11:46:28 -07:00
kevinz000 f28a6feb5f Merge pull request #9881 from Putnam3145/persistent-dynamic-weights 
Allows extended voting on dynamic if recent rounds too chaotic
 2019-11-23 11:45:58 -07:00
kevinz000 be679b97a6 Merge pull request #9885 from Commandersand/cuckcult 
Makes the brass skewer more ouchie than ouchie~
 2019-11-23 11:45:24 -07:00
kevinz000 f88ed98ee4 Merge pull request #9909 from kiwedespars/anthromorphic-insect-revert 
Anthromorphic Insect Revert
 2019-11-23 11:44:52 -07:00
kevinz000 75510d8da9 Merge pull request #9749 from Trilbyspaceclone/patch-238 
What do you mean I cant hold the armory on my back? -BOH nerf
 2019-11-23 11:42:37 -07:00
kevinz000 88762c5d89 Merge pull request #9864 from Knouli/Legioncore-Use-In-Hand 
Able to use Legion Cores in-hand
 2019-11-23 11:39:35 -07:00
Winter Flare eee8c8c108 Shields Bounty is now 2 for 3000 2019-11-23 03:11:00 -05:00
GrayRachnid a69b4b4916 removes creep 2019-11-23 02:28:31 -05:00
Lin e954cec58c Merge pull request #9898 from Ghommie/Ghommie-cit387 
Dreamchecker compatibility changes, part 3.
 2019-11-23 05:52:44 +00:00
Lin 592dcdb6fd Merge pull request #9896 from Ghommie/Ghommie-cit386 
Fixing cyborg camera interaction for real
 2019-11-23 05:52:11 +00:00
Lin 028fa518e4 Merge pull request #9879 from Ghommie/Ghommie-cit383 
Unmodularize closets.
 2019-11-23 05:39:33 +00:00
YakumoChen 038887e27b Adds new AI display options removes duplicate entry 2019-11-23 04:59:52 +00:00
YakumoChen 6ebab6300a Adds AI icons and fixes the comma. Again. 2019-11-23 04:41:36 +00:00
YakumoChen 6d5c4c3bdb Adds AI core display options 2019-11-23 04:35:50 +00:00
YakumoChen 1c8b557466 fixes AI.dm again 2019-11-23 04:13:30 +00:00
YakumoChen 6426e5dade makes the icons not break 2019-11-23 03:54:39 +00:00
YakumoChen a6ff44782a adds more unique ai holograms 2019-11-23 03:51:04 +00:00