 Thalpy
|
564c1fde9f
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-08 07:31:03 +01:00 |
|
|
kevinz000
|
0073d99a22
|
Merge pull request #9309 from Thalpy/tg-Organ-port
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
|
2019-10-07 23:29:19 -07:00 |
|
|
kevinz000
|
dd46509597
|
Merge pull request #9377 from Thalpy/Fixes_melting_grenades
[Mild urgency] Fixes melting cleaning grenades found in janitor/cargoboxes.
|
2019-10-06 21:37:50 -07:00 |
|
|
Thalpy
|
27c2c89766
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-05 23:43:19 +01:00 |
|
|
Fermi
|
7f74a98372
|
.9
|
2019-10-04 04:55:36 +01:00 |
|
|
Fermi
|
62737884f0
|
lye was 13 oops
|
2019-10-04 04:55:16 +01:00 |
|
|
Fermi
|
10f5fc3b47
|
Buffer fix
|
2019-10-04 03:22:53 +01:00 |
|
|
Fermi
|
2bbcc7f660
|
Fixes them sneaky nades
|
2019-10-01 06:48:15 +01:00 |
|
|
Fermi
|
89f3a01bc0
|
Merge branch 'master' into tg-Organ-port
|
2019-10-01 06:17:58 +01:00 |
|
|
Fermi
|
0762ed5265
|
oops, but also this shouldn't be able to be made.
|
2019-09-29 20:25:00 +01:00 |
|
|
Fermi
|
f83de63124
|
Kev's scanner malarky
|
2019-09-28 17:51:55 +01: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
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
Fermi
|
bbe6b4ab15
|
Okay! Should be good.
|
2019-09-22 02:43:12 +01:00 |
|
|
Fermi
|
0dcdede8fa
|
In response to poll and feedback.
|
2019-09-22 02:28:59 +01:00 |
|
|
Fermi
|
97fa05f446
|
Merge branch 'master' into tg-Organ-port
|
2019-09-21 14:01:52 +01:00 |
|
|
Fermi
|
f8dfb1e3aa
|
Okay.
|
2019-09-21 12:45:10 +01:00 |
|
|
Fermi
|
a3ae942c1d
|
Okay.. I think this fixes it all.
|
2019-09-21 11:13:20 +01:00 |
|
|
Fermi
|
f0ea842c17
|
lil tweaks.
|
2019-09-21 09:58:37 +01:00 |
|
|
kevinz000
|
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
|
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
|
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 |
|
|
Fermi
|
a08c1229d6
|
OKAY now I'm done I think.
|
2019-09-21 09:31:53 +01:00 |
|
|
Fermi
|
4b44b31aa3
|
Okay, feature done
|
2019-09-21 08:24:46 +01:00 |
|
|
Fermi
|
2b80998f64
|
Adds: cybernetic_heart_u and VV viewer.
|
2019-09-21 04:19:34 +01:00 |
|
|
Fermi
|
13cf5a7822
|
Updates
|
2019-09-20 22:51:14 +01:00 |
|
|
Fermi
|
59c82894a1
|
Sprinkles!
|
2019-09-20 22:15:55 +01:00 |
|
|
Fermi
|
55c3a48026
|
Oops
|
2019-09-20 21:56:39 +01:00 |
|
|
Fermi
|
d12fd72ebf
|
Updates a buncha stuff.
|
2019-09-20 21:11:20 +01:00 |
|
|
Fermi
|
e6a5530363
|
Fixes
|
2019-09-20 20:06:38 +01:00 |
|
|
Fermi
|
9cca272986
|
Fixes quant errors, I hope.
|
2019-09-20 19:54:21 +01:00 |
|
|
Fermi
|
79b1d33008
|
classic oops
|
2019-09-20 19:46:53 +01:00 |
|
|
Fermi
|
9b2f67d67d
|
reagent_flags is used elsewhere, renamed to chemical_flags
|
2019-09-20 19:43:37 +01:00 |
|
|
Ghommie
|
ec9bf9ed17
|
Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene.
|
2019-09-20 19:04:28 +02:00 |
|
|
Fermi
|
3f2933adbf
|
Ghommies' requests.
|
2019-09-19 23:31:36 +01:00 |
|
|
Thalpy
|
79011190c1
|
Merge branch 'master' into tg-Organ-port
|
2019-09-19 21:26:42 +01:00 |
|
|
Fermi
|
b8190552f1
|
Update defines, and vars, and created new procs
|
2019-09-19 21:24:50 +01:00 |
|
|
Fermi
|
d2c49d7987
|
On_mob_dead!
|
2019-09-19 20:30:35 +01:00 |
|
|
Fermi
|
70098f8bc8
|
Merge branch 'master' into Reagents_bitflats
|
2019-09-19 20:04:10 +01:00 |
|
|
Fermi
|
7ef5ab0332
|
TO TEST - also needs #9099 merging.
|
2019-09-19 17:52:45 +01:00 |
|
|
Fermi
|
08eeda97f5
|
Heck
|
2019-09-19 01:45:21 +01:00 |
|