kevinz000 and GitHub
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
Fermiand Fermi
a08c1229d6
OKAY now I'm done I think.
2019-09-21 09:31:53 +01:00
Fermiand Fermi
4b44b31aa3
Okay, feature done
2019-09-21 08:24:46 +01:00
Fermiand Fermi
2b80998f64
Adds: cybernetic_heart_u and VV viewer.
2019-09-21 04:19:34 +01:00
Thalpy and GitHub
641196b9dd
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-19 19:57:57 +01:00
Fermiand Fermi
b9a2a5ce38
Oops
2019-09-19 15:41:26 +01:00
Fermiand Fermi
a398f64b66
Okay
2019-09-19 15:33:40 +01:00
Linzolle
573932437e
COMMA
2019-09-18 23:55:52 -05:00
Linzolle
cd2e894ebe
display results and wording
2019-09-18 23:51:35 -05:00
Linzolle
4bf9c8cc84
citadel fixes
2019-09-18 23:15:05 -05:00
XDTM and Linzolle
023428f6a4
port experimental dissection
2019-09-18 23:04:11 -05:00
XDTM and Linzolle
8ad11d7250
ports ligament surgeries
2019-09-18 22:55:46 -05:00
Fermiand Fermi
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
Fermiand Fermi
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
Fermiand Fermi
dfa40a4b22
tg Code complete, now to bugtest and clear compile errors.
2019-09-18 23:57:21 +01:00
Fermiand 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
344ccaf20d
cleans up some other species related stuff, unmodularizes some code
2019-09-13 22:18:53 -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
65a89030eb
reverts the bleed changes till they can be better tuned
2019-09-12 00:14:26 -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
Fermiand Fermi
c696874d03
Cleanup and compile test.
2019-09-10 22:08:49 +01:00
Fermiand Fermi
68a2b21a7e
removed antagum.
2019-09-10 21:14:34 +01:00
Thalpy and GitHub
ce5095321c
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-10 20:52:31 +01:00
Fermiand Fermi
443f9e433d
Final tweaks
2019-09-10 20:18:45 +01:00
Fermiand Fermi
f03c9c236d
Compile fixes and tweaks.
2019-09-10 18:54:47 +01:00
TrilbySpaceClone
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04:00
Fermiand Fermi
018ebc32ae
All that remains is MK testing.
2019-09-08 02:46:43 +01:00
Fermiand Fermi
d90b4769f1
MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes.
2019-09-05 22:30:53 +01:00
TrilbySpaceClone
084b37ae4e
tada
2019-09-04 10:13:32 -04:00
Fermiand Fermi
7890ad08d5
what is this
2019-09-03 20:30:21 +01:00
Fermi and Fermi
a605d2a776
Todo: finish new words and review langauge
2019-09-03 20:16:41 +01:00
Ghommie
2a7b802957
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-08-29 21:01:23 +02:00
Poojawa
9558252b93
Revert/replaces a lot of #8024 with bleed_rate
...
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood. Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
2019-08-26 14:22:17 -05: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
2d40733ff7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-17 05:43:05 -05:00
Poojawa
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05:00
Poojawa
3de3f511cf
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
2019-08-15 08:24:55 -05:00
kevinz000 and GitHub
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
kevinz000 and GitHub
a576e71a01
Merge pull request #9101 from Sishen1542/stealthy-surgery
...
obfuscates specific surgeries, gives generalized areas to anybody in viewing range
2019-08-11 09:59:29 -07:00
Sishen
23d4b9827d
fix, yadda yadda
2019-08-11 01:19:37 -04:00
Poojawa
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
Ghommie
efe72ce973
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
2019-08-09 06:47:27 +02:00
Poojawa
f76bb27127
Fixes some runtimes and removes a holodeck exploit
...
and a cleanup >.>;
2019-08-08 21:33:42 -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 and GitHub
2256bbb63c
Merge branch 'master' into master
2019-08-07 09:30:53 +01:00
kevinz000 and GitHub
27667d467b
Merge pull request #8673 from Trilbyspaceclone/patch-179
...
Makes upgraded prostics worth getting - Re-balances robotic lims
2019-08-07 00:45:34 -07:00
Thalpy and GitHub
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
kevinz000 and GitHub
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