shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,309 Commits 5 Branches 0 Tags
6ff7083bfb592fdc8fe5679b8ecec38ddfa16dec
Commit Graph

10769 Commits

Author SHA1 Message Date
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
Fermi 37ac0ccb66 Okay 2019-11-23 00:23:43 +00:00
Fermi b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks 2019-11-23 00:10:33 +00:00
GrayRachnid 77913406ed Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into disablesnolegs 2019-11-22 18:50:24 -05:00
Putnam3145 6145cd0d96 Merge pull request #9886 from Ghommie/Ghommie-cit384 
chem dispenser beakers and bikehorn fixes.
 2019-11-22 15:48:28 -08:00
Fermi b056d91ea5 Removes the random love 2019-11-22 23:48:21 +00:00
Putnam3145 b7f7342e43 Merge pull request #9900 from Ghommie/Ghommie-cit388 
fixing a get_idcard runtime. or The betrayal of the ?. operator
 2019-11-22 15:41:52 -08:00
GrayRachnid a7918717ff fixes compile errors. 2019-11-22 18:22:53 -05: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
Ghommie 7d3599b2f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277 2019-11-22 18:53:58 +01:00
kiwedespars 98998ca85f un-moths the anthromorphic insects 2019-11-21 19:47:48 -08:00
Lin 522a664f55 Merge pull request #9887 from Ghommie/Ghommie-cit385 
Martial arts pacifism fixes and boxing buff, more ported pacifist fixes.
 2019-11-22 02:39:29 +00: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
Lin c2d182d50d Merge pull request #9823 from Seris02/wintergalorefix 
Adds HoS, HoP, CE, CMO, QM, RD, chemistry, genetics, virology, robotics, janitor and cosmic winter coats - Try 2
 2019-11-22 01:16:35 +00:00
Unknown 4974400ccb Merge branch 'master' into xantholne-berets01 2019-11-21 11:01:42 -07:00
Useroth 29ae9eb962 Added reagent IDs. 2019-11-21 12:52:49 +01:00
Useroth 2ced7db508 Ported a bunch of tg hydroponic stuff. 2019-11-21 10:53:57 +01:00
Ghommie bfeece4c6e fixing a get_idcard runtime. The betrayal of the ?. 2019-11-21 09:23:05 +01:00
loginsandylogout a95b78af52 Update code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-11-21 00:52:52 -06:00
Ghommie 6a0bd7c925 THE REVENGE OF THE WHITESPACES 2019-11-21 07:40:49 +01:00
Ghommie 5153ed04ec aaa 2019-11-21 06:48:26 +01:00
Ghommie 911a33bfd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387 2019-11-21 06:36:59 +01:00
Ghommie dccb3c2e22 part 3 2019-11-21 06:36:22 +01:00
Unknown 71b3b8fdc6 Ports/Adds new Berets 
Ports some berets adds even more to most jobs
 2019-11-20 22:21:20 -07:00
kevinz000 c22ae596fc Merge pull request #9880 from Putnam3145/meteor-random-fix 
Makes sure every dynamic-triggered event isn't random on dynamic
 2019-11-20 22:12:42 -07:00
kevinz000 1efd3ae395 Merge pull request #9866 from Useroth/tatorstrangeseeds 
Adds strange seeds as a buyable traitor botanist item.
 2019-11-20 22:09:53 -07:00
kevinz000 30aefd050a Merge pull request #9868 from Ghommie/Ghommie-cit376 
Fixes superlube waterflower.
 2019-11-20 22:08:54 -07:00
Seris02 60def2a9fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-21 13:08:23 +08:00
nik707 8d363b8e9d Merge pull request #9323 from Citadel-Station-13/kevinz000-patch-85 
adds poll ignore for magical antagonists
 2019-11-20 23:03:39 -06:00
nik707 0300927974 Merge pull request #9487 from Citadel-Station-13/spooky 
adds an easy way for admins to force enable halloween races without the rest of halloween's code
 2019-11-20 23:00:09 -06:00
nik707 56d2c0edad Merge pull request #9681 from Citadel-Station-13/kevinz000-patch-107 
buffs bluespace apprentice (targeted teleport --> blink)
 2019-11-20 22:55:21 -06:00
nik707 28190bc168 Merge pull request #9703 from Citadel-Station-13/kevinz000-patch-109 
emagged medibots now murder the everloving fuck out of slimepeople
 2019-11-20 22:52:11 -06:00
nik707 df11e75414 Merge pull request #9718 from Citadel-Station-13/kevinz000-patch-110 
fixes a bug with rnd multiprinting
 2019-11-20 22:51:32 -06:00
nik707 6d889e66c4 Merge pull request #9720 from Citadel-Station-13/kevinz000-patch-111 
Is it the time of year to buff disablers again?
 2019-11-20 22:51:11 -06:00
kevinz000 8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353 
Dreamchecker compatibility changes, part 2.
 2019-11-20 21:49:58 -07:00
kevinz000 c503e564db Merge pull request #9873 from Ghommie/Ghommie-cit378 
Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit
 2019-11-20 21:48:41 -07:00
kevinz000 47888bd208 Merge pull request #9877 from Ghommie/Ghommie-cit381 
Unmodularize pAI holo-chassis icons.
 2019-11-20 21:47:00 -07:00
kevinz000 f82dd255dc Merge pull request #9869 from Hatterhat/ayy-dna-manip 
what if i gave botanists the ability to get the fancy alien dna manipulator. haha, just kidding. ...unless?
 2019-11-20 21:46:37 -07:00
Fermi bfb5f75016 Finishing up final UI adjustments 2019-11-20 21:23:54 +00:00
Ghommie 920eba0b03 ayy 2019-11-20 21:41:59 +01:00
Ghommie aab7ad192b Martial arts pacifism fixes and boxing buff, more ported pacifist fixes. 2019-11-20 21:00:17 +01:00
Ghommie ac44bfcad2 chem dispenser beakers and bikehorn fixes. 2019-11-20 17:55:11 +01:00
loginsandylogout 5395e0c893 meme 2019-11-20 10:35:40 -06:00
Useroth 2a8152c835 Applied suggestions. 2019-11-20 15:15:10 +01:00
Thalpy ebe3859cc5 syncs size 2019-11-20 13:28:35 +00:00
Fermi 4dd8223634 Undoes circuitboards and converts to sleeper. 2019-11-20 11:58:06 +00:00
Fermi 48e1c64c8d Final 2019-11-20 11:35:40 +00:00
Putnam 0d297e92c7 read words 2019-11-19 22:02:06 -08:00