b589565398
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-03 15:05:26 -05:00
a177e5a457
Merge pull request #9364 from Ghommie/Ghommie-cit206
...
Fixing the blood cult radial menu unholy flask option's icon.
2019-10-01 23:59:49 -07:00
117e5a409d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-01 00:05:44 -05:00
426104021e
Merge pull request #9321 from Linzolle/bloodrites
...
some cult fixes + cult qol
2019-09-28 00:24:15 -07:00
6b33e3bd0b
Merge pull request #9322 from Sishen1542/cult
...
blood cult conversion no longer requires consent
2019-09-28 00:23:48 -07:00
f14272e445
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-27 23:30:05 -05:00
0d3a2cdd57
cultist check
2019-09-27 19:15:19 -05:00
ce02f712ba
tested.
2019-09-27 17:59:26 +02:00
35237066b8
Merge pull request #9341 from Ghommie/Ghommie-cit206
...
Blood cult altar, forge and archives now use radial menus.
2019-09-26 19:31:36 -07:00
274fdf8c06
return.
2019-09-24 01:40:48 +02:00
1fa40dac38
Changes.
2019-09-23 17:25:08 +02:00
f37b676a14
runtimes.
2019-09-22 23:38:48 +02:00
a995e161ca
more.
2019-09-22 22:36:29 +02:00
a30dbcd721
vars and procs
2019-09-22 22:34:04 +02:00
5b2cc917b3
Blood cult's alter, forge and archives now use radials.
2019-09-22 22:30:44 +02:00
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
43f39a75d6
Update runes.dm
2019-09-20 18:45:44 -04:00
37d52239e3
Update runes.dm
2019-09-20 18:39:50 -04:00
deeceafb77
cult fixes
2019-09-20 16:38:37 -05:00
023428f6a4
port experimental dissection
2019-09-18 23:04:11 -05:00
fa7bf43ce7
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-16 17:44:10 -05:00
6668630649
Merge branch 'master' into are-those-horns-are-are-you-just-retarded
2019-09-15 23:25:22 -05:00
5159a58fef
Update strained_muscles.dm
2019-09-14 12:00:28 -04: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
6353bd1064
Cult heals do bleed stopping
...
blood cap raised because honestly there's so much bleed_rate heal available now too
2019-09-11 04:37:22 -05:00
c5f3f3d7f9
Merge pull request #9250 from MrJWhit/abductor-spawntext
...
Changes Abductor Spawntext
2019-09-07 11:26:38 -07:00
97072c63c8
Adds text to not disturb the habatat to abductor spawntext
...
Adds "Try not to disturb the habitat, it could lead to dead specimens." to the spawntext.
2019-09-07 13:52:08 -04:00
87cf0b971a
Merge pull request #9221 from Sishen1542/chappy
...
adds some new nullrods with some back end null rod refactors
2019-09-06 16:47:46 -07:00
3f954f10a7
Update runes.dm
2019-09-02 02:09:59 -04:00
4085b479d1
Fixing clockie mass recall that I apparently didn't really fix before.
2019-09-01 01:45:33 +02:00
279a6ed83e
bibles now destroy runes instead of nullrods, due to holy weapons encompassing more typepaths
2019-08-31 17:57:36 -04:00
9a0b6a21f9
Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64
...
Amber alert ERTs no longer get pulse weapons
2019-08-28 13:05:56 -05:00
106cd7b845
Fixes "Blood Cult Conversion Prompt Issues"
2019-08-23 19:38:39 +02:00
96834bc517
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-20 03:36:17 -05:00
1ab64d4003
Update ert.dm
2019-08-18 23:43:31 -07:00
86cb735cc9
Merge branch 'master' into kevinz000-patch-64
2019-08-18 23:41:40 -07:00
8a96b29ef9
Merge pull request #9137 from Sishen1542/the-d-boiz
...
addition of the "assistant response team" a pack of assistants sent in from CComm
2019-08-18 23:34:49 -07:00
f55682d6dd
Merge pull request #9136 from Sishen1542/strained
...
strained muscles now costs chems to use, slows chem regen, and drains stacking stamina over time
2019-08-18 23:32:47 -07:00
088bc484e3
Forensics re-destroyed, but better this time.
...
All lists are LAZYINITLIST, cleaning code is preserved, examine is preserved. We should be back in buisness, but this is just a 'holy fuck finally' commit
2019-08-17 02:43:59 -05:00
20d71d1196
Fixes warp whistle runtimes for real this time.
2019-08-16 22:19:37 -04:00
26de2b8111
greybois
2019-08-16 10:49:26 -04:00
03ec103e3d
Update strained_muscles.dm
2019-08-16 10:02:52 -04:00
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05:00
2cdfa9cf2f
Merge pull request #9126 from Sishen1542/viro-cures
...
Adds more variety in virus cures, more consistent difficulty scaling.
2019-08-15 01:12:12 -07:00
382487fdc2
viruseseses-cures
2019-08-13 05:32:37 -04:00
d3b3836d33
Merge pull request #9010 from BurgerLUA/Actual-War-Ops
...
War Ops now informs the crew where the Nuclear Device is located when activated.
2019-08-11 10:13:02 -07:00
123b478edd
Merge pull request #8927 from Ghommie/Ghommie-cit151
...
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
2019-08-11 10:12:20 -07:00
Poojawa