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 |
|
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 |
|
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 |
|
Poojawa
|
ee5155bdbb
|
fixes oddities
|
2019-10-06 04:27:46 -05:00 |
|
Thalpy
|
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
|
4edfbd1dfa
|
clarifying grammar
|
2019-10-04 17:23:41 -05:00 |
|
Poojawa
|
0c574fb62a
|
Update medicine_reagents.dm
|
2019-10-04 16:53:32 -05:00 |
|
Poojawa
|
26c7a0ddb7
|
Promotes more chemical variety
|
2019-10-04 16:45:25 -05:00 |
|
Poojawa
|
9f88a72142
|
Makes Medsprays align with patches
Also ensures you can't spray it on ghosts, ai eyes, etc.
|
2019-10-04 16:06:07 -05:00 |
|
Poojawa
|
e52652f8c8
|
Differing carpet reactions
|
2019-10-03 23:19:52 -05: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 |
|
Poojawa
|
6d9aa8de70
|
More carpet options and ways to get them
|
2019-10-03 22:54:10 -05:00 |
|
Fermi
|
10f5fc3b47
|
Buffer fix
|
2019-10-04 03:22:53 +01:00 |
|
Ghommie
|
6dbac16c74
|
Sanitizing the fermis code biohazard.
|
2019-10-03 04:31:11 +02: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 |
|
Poojawa
|
117e5a409d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 00:05:44 -05: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 |
|
Poojawa
|
f14272e445
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-27 23:30:05 -05: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 |
|
Poojawa
|
f57bdc39a2
|
I still fucking hate components.
|
2019-09-23 02:03:37 -05:00 |
|
XDTM
|
947bb8cc69
|
port muscled veins too why not
|
2019-09-22 19:59:17 -05:00 |
|
Poojawa
|
5876a235c2
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-22 00:22:18 -05: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
|
13c28933c6
|
There we are
|
2019-09-21 13:51:27 +01:00 |
|
Fermi
|
4aca2c1b31
|
Breakout
|
2019-09-21 13:23:28 +01:00 |
|
Fermi
|
f8dfb1e3aa
|
Okay.
|
2019-09-21 12:45:10 +01:00 |
|
TrilbySpaceClone
|
45a5b4974d
|
Merge branch 'master' into unmodular_2
|
2019-09-21 06:21:06 -04: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 |
|