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
Fermi
c696874d03
Cleanup and compile test.
2019-09-10 22:08:49 +01:00
Fermi
68a2b21a7e
removed antagum.
2019-09-10 21:14:34 +01:00
Thalpy
ce5095321c
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-10 20:52:31 +01:00
Fermi
443f9e433d
Final tweaks
2019-09-10 20:18:45 +01:00
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
Fermi
018ebc32ae
All that remains is MK testing.
2019-09-08 02:46:43 +01:00
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
Fermi
7890ad08d5
what is this
2019-09-03 20:30:21 +01:00
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
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
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
2256bbb63c
Merge branch 'master' into master
2019-08-07 09:30:53 +01:00
kevinz000
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
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
Poojawa
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05: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
Ghommie
376f6e8b4a
arousal states won't persist after death anymore.
2019-07-23 23:54:11 +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
kevinz000
c657244d9b
Merge pull request #8920 from Ghommie/Ghommie-cit149
...
Towels.
2019-07-20 12:06:54 -07:00
Ghommie
589cdae0e1
Towels
2019-07-18 00:03:49 +02: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