 kevinz000andGitHub
|
994bfddc1b
|
Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
|
2019-10-16 12:44:34 -07:00 |
|
|
kevinz000andGitHub
|
3d5facdea5
|
Merge pull request #9502 from Putnam3145/pandemic-qol2
Makes beaker spawn on pandemic instead of on user when hands full
|
2019-10-15 22:53:44 -07:00 |
|
|
Putnam
|
ee20e23777
|
made beaker spawn on pandemic if hands are full
|
2019-10-14 19:48:20 -07:00 |
|
|
Thalpy
|
3b8ea30d9b
|
I did it
|
2019-10-12 20:06:46 +01:00 |
|
|
Thalpy
|
3f16c287a9
|
I'm big silly
|
2019-10-12 13:40:40 +01:00 |
|
|
Thalpy
|
82446681bf
|
Everything is pain
|
2019-10-12 13:22:05 +01:00 |
|
|
Thalpy
|
d94f796ffb
|
aaaa
|
2019-10-12 12:42:51 +01:00 |
|
|
FermiandFermi
|
2a6b84151e
|
Removed something I didn't mean to
|
2019-10-12 07:59:44 +01:00 |
|
|
FermiandFermi
|
2e03985696
|
aaaa
|
2019-10-12 07:55:19 +01:00 |
|
|
FermiandFermi
|
f922a3dda5
|
Fast!!
|
2019-10-12 07:18:39 +01:00 |
|
|
kevinz000andGitHub
|
2e74833e72
|
Merge pull request #9444 from Thalpy/Updates-holder
[Testmerge first] [Ready] Cleans up holder.dm code and fixes some of the cross bugs from shotgun PR merging.
|
2019-10-11 12:08:12 -07:00 |
|
|
FermiandFermi
|
f165b5e813
|
darn nutrients.
|
2019-10-11 18:58:53 +01:00 |
|
|
Thalpy
|
e517ece612
|
Darnit beaker
|
2019-10-11 08:41:08 +01:00 |
|
|
kevinz000andGitHub
|
fb028b7997
|
Merge pull request #9432 from Putnam3145/pandemic-qol
Made PanD.E.M.I.C beaker stuff more like ChemMaster
|
2019-10-10 02:12:41 -07:00 |
|
|
FermiandFermi
|
ad0f34cdf8
|
Tweaks wiki a lil
|
2019-10-09 06:04:06 +01:00 |
|
|
FermiandFermi
|
f5bc825ef0
|
Merge branch 'Wiki-fermi' into Updates-holder
|
2019-10-09 05:35:05 +01:00 |
|
|
FermiandFermi
|
b397c4868f
|
Theres a bit more limits now
|
2019-10-08 13:23:35 +01:00 |
|
|
FermiandFermi
|
db416defd6
|
Fixes/updates some chems.
|
2019-10-08 13:08:13 +01:00 |
|
|
FermiandFermi
|
bc118d5ead
|
Merge branch 'master' into Updates-holder
|
2019-10-08 12:21:56 +01:00 |
|
|
FermiandFermi
|
06ad17e539
|
More mild
|
2019-10-08 12:16:33 +01:00 |
|
|
FermiandFermi
|
b8c87a5f40
|
Spicy
|
2019-10-08 12:05:06 +01:00 |
|
|
kevinz000andGitHub
|
8aacedaefa
|
Merge pull request #9316 from Thalpy/Reagents_bitflats
[READY] [FermiChem] Turns reaction vars into bitflags and adds a few new procs related to that.
|
2019-10-08 00:33:21 -07:00 |
|
|
kevinz000andGitHub
|
76ede7a473
|
Merge pull request #9406 from Poojawa/carpet-colors
More Carpet colors and liquid carpet varients
|
2019-10-07 23:39:52 -07:00 |
|
|
kevinz000andGitHub
|
dcb37bfd0e
|
Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
|
2019-10-07 23:36:11 -07:00 |
|
|
ThalpyandGitHub
|
564c1fde9f
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-08 07:31:03 +01:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
Putnam
|
caf9bc56da
|
Make replacement update icon
|
2019-10-07 01:34:22 -07:00 |
|
|
Putnam
|
b452de12ff
|
Made PanD.E.M.I.C beaker stuff more like ChemMaster
|
2019-10-07 01:23:17 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
ThalpyandGitHub
|
27c2c89766
|
Merge branch 'master' into Reagents_bitflats
|
2019-10-05 23:43:19 +01:00 |
|
|
Ghommie
|
3d22f4ec60
|
Porting a load of disease/symptoms code updates.
|
2019-10-05 07:14:25 +02:00 |
|
|
Poojawa
|
e52652f8c8
|
Differing carpet reactions
|
2019-10-03 23:19:52 -05:00 |
|
|
FermiandFermi
|
7f74a98372
|
.9
|
2019-10-04 04:55:36 +01:00 |
|
|
FermiandFermi
|
62737884f0
|
lye was 13 oops
|
2019-10-04 04:55:16 +01:00 |
|
|
Poojawa
|
6d9aa8de70
|
More carpet options and ways to get them
|
2019-10-03 22:54:10 -05:00 |
|
|
FermiandFermi
|
10f5fc3b47
|
Buffer fix
|
2019-10-04 03:22:53 +01:00 |
|
|
FermiandFermi
|
2bbcc7f660
|
Fixes them sneaky nades
|
2019-10-01 06:48:15 +01:00 |
|
|
FermiandFermi
|
89f3a01bc0
|
Merge branch 'master' into tg-Organ-port
|
2019-10-01 06:17:58 +01:00 |
|
|
FermiandFermi
|
0762ed5265
|
oops, but also this shouldn't be able to be made.
|
2019-09-29 20:25:00 +01:00 |
|
|
FermiandFermi
|
f83de63124
|
Kev's scanner malarky
|
2019-09-28 17:51:55 +01:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
FermiandFermi
|
146219edf9
|
Merge branch 'master' into beakerpH_tweaks
|
2019-09-27 11:50:31 +01:00 |
|
|
nik707andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|