kevinz000
7c3036f027
Merge pull request #9267 from Tupinambis/EngineeringCriticalFix
...
Gives the Endivend Upgraded RCDs by default, instead of Autolathe ones.
2019-09-28 00:28:43 -07:00
kevinz000
8d9520ee58
Merge pull request #9336 from Thalpy/beakerpH_tweaks
...
Tweaks how beakers melt in response to poll and feedback. Allows syringe/dropper use on beakers in heaters.
2019-09-28 00:26:51 -07:00
kevinz000
426104021e
Merge pull request #9321 from Linzolle/bloodrites
...
some cult fixes + cult qol
2019-09-28 00:24:15 -07:00
kevinz000
6b33e3bd0b
Merge pull request #9322 from Sishen1542/cult
...
blood cult conversion no longer requires consent
2019-09-28 00:23:48 -07:00
kevinz000
cbe6a54531
Merge pull request #9326 from YakumoChen/radioactive-paperweight
...
Advanced energy guns glow more
2019-09-28 00:23:31 -07:00
kevinz000
cc64b8e0a4
Merge pull request #9320 from Ghommie/Ghommie-cit200
...
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
2019-09-28 00:22:13 -07:00
kevinz000
3ce5b318ca
Merge pull request #9317 from Ghommie/Ghommie-cit199
...
Ports sleepy pens and emagged borg cookies buffs (also "chloralhydratedelayed" removal), plus tirizene buff.
2019-09-28 00:21:47 -07:00
kevinz000
5562db4ed4
Merge pull request #8914 from Ghommie/Ghommie-cit147
...
Updating spraycans and crayons.
2019-09-28 00:20:42 -07:00
kevinz000
b28e65637e
Merge pull request #9344 from Ghommie/Ghommie-cit208
...
Makes abandoned crates less prone to explosions.
2019-09-28 00:15:27 -07:00
kevinz000
1b295c8501
Merge pull request #9359 from deathride58/fuckstoredpower
...
Rad collector tweaks - Reverts point production to its original behavior, clears up examine text
2019-09-28 00:14:47 -07: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
Poojawa
f14272e445
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-27 23:30:05 -05:00
Linzolle
0d3a2cdd57
cultist check
2019-09-27 19:15:19 -05:00
Fermi
d44fbd3fb1
Brain fix
2019-09-27 23:46:44 +01:00
Ghommie
ce02f712ba
tested.
2019-09-27 17:59:26 +02: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
3f7c657111
Plate and pH (pHlate)
2019-09-27 12:01:03 +01:00
Fermi
146219edf9
Merge branch 'master' into beakerpH_tweaks
2019-09-27 11:50:31 +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
Thalpy
1bdb66d5de
Okay a few things I just saw
2019-09-27 07:28:02 +01:00
nik707
3f1f234686
Merge pull request #9170 from Trilbyspaceclone/more_cooking2
...
Makes peaches used in crafting a lot more, grammer fixes and new icecreams and floats - Remakes charrie shakes into icecreams rather then drinks
2019-09-26 23:54:17 -05:00
kevinz000
436e01ed0e
Merge pull request #9335 from Raptorizer/Guardian_Parasite_Buffs
...
Guardian/Holoparasite Buffs
2019-09-26 19:33:25 -07:00
kevinz000
06eb6e1537
Merge pull request #9318 from Thalpy/clingy-Chems
...
[Fix] Fixes small residues of chems sitting in holders without breaking slow reactions.
2019-09-26 19:31:58 -07:00
kevinz000
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
kevinz000
428a34d0f4
Merge pull request #9348 from Ghommie/Ghommie-cit209
...
Reduces holy water message spam for blood/clock cultists.
2019-09-26 19:31:01 -07:00
deathride58
d0840074b5
PER MINUTE
2019-09-26 13:44:56 -04:00
deathride58
b3cd0859cd
Rad collector tweaks - Makes point production use all stored power every process cycle, clears up examine text, makes the gas touching more obvious
2019-09-26 13:39:47 -04:00
Fermi
60adaa9f1b
Merge branch 'master' into FERMICHEMCurTweaks
2019-09-26 08:44:21 +01:00
TrilbySpaceClone
41fbb759b2
Merge branch 'master' into more_cooking2
2019-09-25 14:56:11 -04:00
JTGSZ
5b3f6dca29
Species Job Check
2019-09-23 23:58:57 -04:00
YakumoChen
b8c3dfc6f0
made it commented out instead of deleted
2019-09-24 03:26:24 +00:00
YakumoChen
e350e50aa3
slightly less holy melons
2019-09-24 03:11:50 +00:00
Ghommie
274fdf8c06
return.
2019-09-24 01:40:48 +02:00
Ghommie
5a822d95a4
M to L
2019-09-23 18:20:45 +02:00
Ghommie
7d3003179b
This will fix and close #9346
2019-09-23 17:55:55 +02:00
Ghommie
1fa40dac38
Changes.
2019-09-23 17:25:08 +02:00
Ghommie
05a9b63b79
spam.
2019-09-23 17:06:15 +02:00
Ghommie
4795c60670
Reduces holy water message spam for blood/clock cultists.
2019-09-23 16:48:21 +02:00
Poojawa
f57bdc39a2
I still fucking hate components.
2019-09-23 02:03:37 -05:00
Linzolle
a2007dc20f
oops
2019-09-22 20:30:16 -05:00
Ghommie
4b70a9cf67
Makes abandoned crates less prone to explosions.
2019-09-23 03:09:15 +02:00
XDTM
947bb8cc69
port muscled veins too why not
2019-09-22 19:59:17 -05:00
Linzolle
6f4ba5a1b8
make it actually work lol
2019-09-22 19:47:41 -05:00
Linzolle
81bb4b4c31
fix
2019-09-22 19:20:05 -05:00
Jack Edge
4b36e6263e
ABDUCTOR SHIT I GUESS
2019-09-22 18:36:27 -05:00
moo
3c526d9dbd
Dissection Examine + Logic Fix + Ayy ( #45807 )
...
clDissectby
add: Examining a dissected body will provide insight on the highest tier performed.
fix: You can do ayy dissection now if you get the tech
fix: FINALLY fixed the surgery logic correctly
/cl
2019-09-22 18:31:13 -05:00