shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,262 Commits 5 Branches 0 Tags
d7ab97dffcb0c1154bb99e7f696dfd95d17616a8
Commit Graph

376 Commits

Author SHA1 Message Date
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
Fermi
391af0f946 I have no idea why the brain doesn't decay, but this seems to fix it. 2019-09-28 07:26:59 +01:00
Fermi
b622ea4fd2 Fixes 2019-09-27 13:49:25 +01:00
Fermi
b16e697201 eye tweaks. 2019-09-27 13:34:27 +01:00
Fermi
50ef6aa257 Eye fix 2019-09-27 13:28:23 +01:00
Fermi
a6a1449951 This was supposed to be the atomised branch aaargh!! 2019-09-27 11:44:15 +01:00
Fermi
e11197f977 Truth 2019-09-27 11:23:06 +01:00
Fermi
888906b4e7 Fixes Mk1 ! 2019-09-27 11:12:53 +01:00
Poojawa
5876a235c2 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-22 00:22:18 -05:00
Fermi
97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
Fermi
a3ae942c1d Okay.. I think this fixes it all. 2019-09-21 11:13:20 +01:00
kevinz000
5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up 
Adds a new traitor bundle - Synda Major Leage Player
 2019-09-21 01:56:41 -07:00
Fermi
a08c1229d6 OKAY now I'm done I think. 2019-09-21 09:31:53 +01:00
Fermi
4b44b31aa3 Okay, feature done 2019-09-21 08:24:46 +01:00
Fermi
2b80998f64 Adds: cybernetic_heart_u and VV viewer. 2019-09-21 04:19:34 +01:00
Fermi
b9a2a5ce38 Oops 2019-09-19 15:41:26 +01:00
Fermi
a398f64b66 Okay 2019-09-19 15:33:40 +01:00
Fermi
587568bf88 Merge branch 'master' into tg-Organ-port 2019-09-19 01:33:15 +01:00
Fermi
107dd67cbe Well it compiles; just synthtissue and TongueLoss now. 2019-09-19 01:14:12 +01:00
Fermi
dfa40a4b22 tg Code complete, now to bugtest and clear compile errors. 2019-09-18 23:57:21 +01:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Poojawa
fa7bf43ce7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-16 17:44:10 -05:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Poojawa
94afbbd560 Adding Horn colors, multiple-select legs, and species squash 
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
 2019-09-11 17:46:17 -05:00
TrilbySpaceClone
0e12a4f8d1 and swing! 2019-09-08 21:39:32 -04:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Poojawa
2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-15 08:39:41 -05:00
kevinz000
96842ed1c3 Merge pull request #9075 from Ghommie/Ghommie-cit184 
Removes a redunant Remove() from high luminosity eyes.
 2019-08-11 10:05:58 -07:00
Poojawa
dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-10 23:48:47 -05:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Ghommie
df5366e911 Removes a redunant Remove() from high luminosity eyes. 2019-08-08 05:06:53 +02:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000
f8cede1ca8 Merge pull request #8998 from Ghommie/Ghommie-cit167 
Fixes inactive high luminosity eyes turning back on as soon as you move around.
 2019-08-05 00:49:14 -07:00
kevinz000
f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146 
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
 2019-08-04 22:41:49 -07:00
Poojawa
7d65ddb417 bug blood, ipc/slime hearts, blood gen protolathe 
we're all gucchi now boys
 2019-08-04 04:07:44 -05:00
Fermi
18b03f9053 Furranium fixes. 2019-08-01 03:38:06 +01:00
Fermi
fbbc4d8589 Merge branch 'pr/21' 2019-07-29 22:57:40 +01:00
Ghommie
2eda8f2666 Fixes "inactive" high luminosity eyes turning back on as soon as you move around. 2019-07-29 06:13:36 +02:00
Trilbyspaceclone
359d0e8531 Update lungs.dm 2019-07-23 01:27:03 -04:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
Ghommie
ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
Ghommie
676186ee36 Ports "Removes some getflaticon calls from things that don't draw browser interfaces" 2019-07-16 23:15:52 +02:00
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Fermi
8d12d0f017 I am very smart 2019-07-13 20:02:53 +01:00
Fermi
6c9f37790b Fixing bugs from merge conflicts. 2019-07-13 20:02:27 +01:00
Thalpy
4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Fermi
110f0cbb83 Fixes and making a message clearer so people don't think it's admins. 2019-07-13 19:17:19 +01:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000
1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125 
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
 2019-07-12 07:34:19 -07:00