 Ghommie
|
1e1f8e627f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-07-15 17:33:41 +02:00 |
|
|
Thalpy
|
f77bcc9765
|
Merge branch 'master' into master
|
2019-07-14 15:10:32 +01:00 |
|
|
Fermi
|
7161870c8b
|
Astral Tweak.
|
2019-07-14 04:06:06 +01:00 |
|
|
Fermi
|
8d12d0f017
|
I am very smart
|
2019-07-13 20:02:53 +01:00 |
|
|
Fermi
|
6c9f37790b
|
Fixing bugs from merge conflicts.
|
2019-07-13 20:02:27 +01:00 |
|
|
Fermi
|
6a5d5fe494
|
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
|
2019-07-13 19:18:46 +01:00 |
|
|
Fermi
|
f2076ba276
|
Weird pushing error.
|
2019-07-13 19:18:42 +01:00 |
|
|
Fermi
|
110f0cbb83
|
Fixes and making a message clearer so people don't think it's admins.
|
2019-07-13 19:17:19 +01:00 |
|
|
CameronWoof
|
68c6aa4fa9
|
ghommie's suggestions
|
2019-07-12 22:34:25 -07:00 |
|
|
CameronWoof
|
067ec1ac92
|
Removes forced climax from hexacrocin overdose
|
2019-07-12 18:33:13 -07:00 |
|
|
Thalpy
|
751736ac09
|
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
|
2019-07-12 16:39:14 +01:00 |
|
|
Thalpy
|
63eb375b74
|
Decreased impossibility of catchem
|
2019-07-12 16:39:10 +01:00 |
|
|
Fermi
|
8f555b0fdd
|
Reworked Astral, doubled lung damage, fixed lung damage oopsie.
|
2019-07-10 21:35:47 +01:00 |
|
|
Fermi
|
3a2192ec2e
|
Hotfix for captain.
|
2019-07-09 20:36:16 +01:00 |
|
|
Fermi
|
1b3de620f9
|
BM requests.
|
2019-07-09 02:44:17 +01:00 |
|
|
Fermi
|
2c5839480c
|
AT LAST, SALVATION.
|
2019-07-07 18:05:57 +01:00 |
|
|
Fermi
|
b163f56eb3
|
Guess what it didn't work.
|
2019-07-07 16:16:02 +01:00 |
|
|
Fermi
|
30322f1163
|
TO BE TESTED
|
2019-07-07 06:29:55 +01:00 |
|
|
Fermi
|
9f843f299d
|
BUFFERSSSSSS ARGH
|
2019-07-07 06:02:34 +01:00 |
|
|
Fermi
|
e84fc73bed
|
Fixed buffers, SDGF, icons and spelling.
|
2019-07-07 05:59:21 +01:00 |
|
|
Fermi
|
6db1a1576d
|
Rewrote explosion code.
|
2019-07-06 18:08:07 +01:00 |
|
|
Fermi
|
d7ac87c99b
|
Tweaks
|
2019-07-06 17:04:24 +01:00 |
|
|
Fermi
|
ad37ec08b2
|
Removing slimejelly req from feedback.
|
2019-07-04 23:24:18 +01:00 |
|
|
Fermi
|
bccd3e42b6
|
Mild tweak
|
2019-07-03 19:53:38 +01:00 |
|
|
Ghommie
|
ffecca8c11
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-07-03 03:24:28 +02:00 |
|
|
Fermi
|
42edafc3e6
|
OOPS
|
2019-07-03 02:13:18 +01:00 |
|
|
Fermi
|
cd645626c0
|
expasion OD increase, corrected names and inverted listing of fermichems
|
2019-07-03 02:11:18 +01:00 |
|
|
Fermi
|
e34c6265e7
|
Tidying.
|
2019-07-02 23:46:58 +01:00 |
|
|
Fermi
|
e940cc7ab7
|
Mild concern over strength of chem.
|
2019-07-02 23:45:32 +01:00 |
|
|
Fermi
|
161c5955f2
|
Removed tastes in buffers.
|
2019-07-02 23:06:46 +01:00 |
|
|
Fermi
|
27aad8f117
|
Quick in case.
|
2019-07-02 22:42:07 +01:00 |
|
|
Fermi
|
946fbff999
|
+Yamerol, tweaked PE, tweaked CM3000, tweaked medpH.
|
2019-07-02 22:15:32 +01:00 |
|
|
Fermi
|
d83fe49556
|
+lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo
|
2019-07-02 15:03:19 +01:00 |
|
|
Fermi
|
0f2978d7fd
|
Updated Analysis meter's Analysis.
|
2019-07-01 14:47:32 +01:00 |
|
|
Fermi
|
04c3b0e66e
|
Oops.
|
2019-07-01 14:13:31 +01:00 |
|
|
Fermi
|
779830e6c7
|
Compile check. Ready for update.
|
2019-07-01 14:13:22 +01:00 |
|
|
Thalpy
|
3c8025c477
|
Moving computers
|
2019-07-01 13:56:37 +01:00 |
|
|
Thalpy
|
48ce61580e
|
Fixes viro oversight.
|
2019-07-01 12:36:24 +01:00 |
|
|
Thalpy
|
937d6467e6
|
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
|
2019-06-30 19:16:27 +01:00 |
|
|
Thalpy
|
e09f189895
|
WELCOME TO PH'S HELL RIDE
|
2019-06-30 01:56:10 +01:00 |
|
|
Thalpy
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
|
Thalpy
|
7be7f05228
|
Reduced pent, tweaked pH, tweaked MK, added beaker tally.
|
2019-06-29 08:50:20 +01:00 |
|
|
Thalpy
|
b6309d5a31
|
Fixes explosion bug, tweaks hypo and fiddles pH.
|
2019-06-29 02:47:32 +01:00 |
|
|
Thalpy
|
4b7ac0be79
|
More fun ssblackbox tallies.
|
2019-06-28 16:50:48 +01:00 |
|
|
Thalpy
|
a2a5bbdb11
|
Found the "the floor" message admin!
|
2019-06-26 19:40:46 +01:00 |
|
|
Fermi
|
afe43070a0
|
Improved logging and renamed buffer IDs
|
2019-06-26 12:20:10 +01:00 |
|
|
Fermi
|
0954f0f50c
|
This is why you always compile test before merging.
|
2019-06-26 12:07:21 +01:00 |
|
|
Fermi
|
fbf54cd560
|
Ninja fix.
|
2019-06-26 12:01:26 +01:00 |
|
|
Fermi
|
19b79b8232
|
The great botany purge of our time.
|
2019-06-26 01:29:34 +01:00 |
|
|
Fermi
|
a53ca38eb9
|
Lil fix
|
2019-06-25 23:54:23 +01:00 |
|