5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
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
573932437e
COMMA
2019-09-18 23:55:52 -05:00
cd2e894ebe
display results and wording
2019-09-18 23:51:35 -05:00
4bf9c8cc84
citadel fixes
2019-09-18 23:15:05 -05:00
023428f6a4
port experimental dissection
2019-09-18 23:04:11 -05:00
8ad11d7250
ports ligament surgeries
2019-09-18 22:55:46 -05:00
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
344ccaf20d
cleans up some other species related stuff, unmodularizes some code
2019-09-13 22:18:53 -05:00
53895106dc
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-13 12:58:02 -05:00
65a89030eb
reverts the bleed changes till they can be better tuned
2019-09-12 00:14:26 -05:00
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
0e12a4f8d1
and swing!
2019-09-08 21:39:32 -04:00
084b37ae4e
tada
2019-09-04 10:13:32 -04:00
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
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
2d40733ff7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-17 05:43:05 -05:00
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05:00
3de3f511cf
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
2019-08-15 08:24:55 -05:00
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
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
23d4b9827d
fix, yadda yadda
2019-08-11 01:19:37 -04:00
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
f76bb27127
Fixes some runtimes and removes a holodeck exploit
...
and a cleanup >.>;
2019-08-08 21:33:42 -05:00
283b5d050e
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-08 16:51:53 -05:00
df5366e911
Removes a redunant Remove() from high luminosity eyes.
2019-08-08 05:06:53 +02:00
2256bbb63c
Merge branch 'master' into master
2019-08-07 09:30:53 +01:00
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
5795f6bbe2
Merge branch 'master' into master
2019-08-05 09:09:36 +01:00
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
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
7d65ddb417
bug blood, ipc/slime hearts, blood gen protolathe
...
we're all gucchi now boys
2019-08-04 04:07:44 -05:00
18b03f9053
Furranium fixes.
2019-08-01 03:38:06 +01:00
3499d73f6b
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
2019-07-31 19:24:39 -05:00
fbbc4d8589
Merge branch 'pr/21'
2019-07-29 22:57:40 +01:00
2eda8f2666
Fixes "inactive" high luminosity eyes turning back on as soon as you move around.
2019-07-29 06:13:36 +02:00
359d0e8531
Update lungs.dm
2019-07-23 01:27:03 -04:00
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
c657244d9b
Merge pull request #8920 from Ghommie/Ghommie-cit149
...
Towels.
2019-07-20 12:06:54 -07:00
589cdae0e1
Towels
2019-07-18 00:03:49 +02:00
ee32e1680f
Ports "Replaces radio channel names and keys with defines"
2019-07-17 00:52:41 +02:00
676186ee36
Ports "Removes some getflaticon calls from things that don't draw browser interfaces"
2019-07-16 23:15:52 +02:00
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
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
8d12d0f017
I am very smart
2019-07-13 20:02:53 +01:00
6c9f37790b
Fixing bugs from merge conflicts.
2019-07-13 20:02:27 +01:00
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
110f0cbb83
Fixes and making a message clearer so people don't think it's admins.
2019-07-13 19:17:19 +01:00
129ca9d71f
Ports "Refactors NODROP flag into TRAIT_NODROP"
2019-07-13 10:27:39 +02:00
13b1e5d409
Merge pull request #8812 from Sishen1542/surgery-hugboxing
...
Using the wrong tool during surgery won't hit the patient with it. Also stops medical borgs from attacking with surgical tools outside of harm intent.
2019-07-12 07:42:11 -07:00
Poojawa