and Fermi
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
and Fermi
0762ed5265
oops, but also this shouldn't be able to be made.
2019-09-29 20:25:00 +01:00
and Fermi
f83de63124
Kev's scanner malarky
2019-09-28 17:51:55 +01:00
kevinz000 and GitHub
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 and GitHub
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
and Fermi
3f7c657111
Plate and pH (pHlate)
2019-09-27 12:01:03 +01:00
and Fermi
146219edf9
Merge branch 'master' into beakerpH_tweaks
2019-09-27 11:50:31 +01:00
nik707 and GitHub
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 and GitHub
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
TrilbySpaceClone
41fbb759b2
Merge branch 'master' into more_cooking2
2019-09-25 14:56:11 -04:00
Ghommie
5a822d95a4
M to L
2019-09-23 18:20:45 +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
and Fermi
bbe6b4ab15
Okay! Should be good.
2019-09-22 02:43:12 +01:00
and Fermi
0dcdede8fa
In response to poll and feedback.
2019-09-22 02:28:59 +01:00
and Fermi
97fa05f446
Merge branch 'master' into tg-Organ-port
2019-09-21 14:01:52 +01:00
and Fermi
f8dfb1e3aa
Okay.
2019-09-21 12:45:10 +01:00
and Fermi
a3ae942c1d
Okay.. I think this fixes it all.
2019-09-21 11:13:20 +01:00
and Fermi
f0ea842c17
lil tweaks.
2019-09-21 09:58:37 +01:00
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
kevinz000 and GitHub
313956002b
Merge pull request #9269 from Thalpy/FermiGrenades
...
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
2019-09-21 01:46:22 -07:00
kevinz000 and GitHub
f898c99f62
Merge pull request #9304 from Trilbyspaceclone/bs_blood
...
Its a blood bath! A BlueSpace Blood Bath!
2019-09-21 01:39:29 -07:00
and Fermi
a08c1229d6
OKAY now I'm done I think.
2019-09-21 09:31:53 +01:00
and Fermi
4b44b31aa3
Okay, feature done
2019-09-21 08:24:46 +01:00
and Fermi
2b80998f64
Adds: cybernetic_heart_u and VV viewer.
2019-09-21 04:19:34 +01:00
and Fermi
13cf5a7822
Updates
2019-09-20 22:51:14 +01:00
and Fermi
e6a5530363
Fixes
2019-09-20 20:06:38 +01:00
Ghommie
ec9bf9ed17
Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene.
2019-09-20 19:04:28 +02:00
Thalpy and GitHub
79011190c1
Merge branch 'master' into tg-Organ-port
2019-09-19 21:26:42 +01:00
and Fermi
08eeda97f5
Heck
2019-09-19 01:45:21 +01:00
and Fermi
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
and Fermi
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
TrilbySpaceClone
5ecf68918b
tada
2019-09-18 03:47:52 -04:00
and Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
Poojawa
0faafe8deb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
2019-09-13 23:26:27 -05:00
Trilbyspaceclone and GitHub
5b2dba354a
Merge branch 'master' into fruit
2019-09-13 14:00:11 -04:00
Poojawa
9376bfb44d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
2019-09-13 12:56:57 -05:00
kevinz000 and GitHub
591a584785
Merge pull request #9275 from Thalpy/InitialD
...
Fixes analyse function on ChemMasters to correctly display purity and fixes the custom transfer for buffer to beaker button.
2019-09-13 10:43:22 -07: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
and Fermi
6b76b09449
Missed 2
2019-09-11 23:30:56 +01:00
and Fermi
c003352d35
Made it 2.5x
2019-09-11 19:08:57 +01:00
and Fermi
db8586950f
Made it 3x
2019-09-11 19:07:40 +01:00
and Fermi
c79c4aafa5
Cleans up var/test into targetReagent
2019-09-11 18:51:05 +01:00
and Fermi
409cbe876a
Okay ACTUALLY does what I want it to.
2019-09-11 18:46:32 +01:00
and Fermi
d59196f430
oops
2019-09-11 16:38:55 +01:00
Thalpy and GitHub
f50e84a20c
Merge branch 'master' into NeuroFix
2019-09-11 16:24:00 +01:00
and Fermi
29a6f12a4e
Alligns removal rate to be 2x instead of flat.
2019-09-11 15:00:58 +01:00
kevinz000 and GitHub
ff0c3ee844
Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining
...
The art of drunken captaining
2019-09-10 22:06:36 -07:00
a751a73113
Apply suggestions from code review
...
thx Ceb
Co-Authored-By: cebutris <cebutris2000@gmail.com >
2019-09-10 18:52:49 -04:00
