 BurgerLua
|
5bd2f28d69
|
Removed #C8A5DC
|
2019-07-12 01:02:43 -07:00 |
|
|
Ghommie
|
d36bae06a7
|
Ports the Chem Master choose your pill PR plus post-improvements
|
2019-07-12 07:39:17 +02:00 |
|
|
Trilbyspaceclone
|
27a8876e99
|
I dont care anymore, It works in testing to function fine
I dont see a problem is this, kinda would like citation on were Clockies will get added in the last else claim.
|
2019-07-11 01:15:39 -04:00 |
|
|
Trilbyspaceclone
|
146276014c
|
Update other_reagents.dm
|
2019-07-10 20:42:12 -04:00 |
|
|
Trilbyspaceclone
|
48e15307c5
|
Update other_reagents.dm
|
2019-07-10 19:14:57 -04:00 |
|
|
Trilbyspaceclone
|
ac9c672fa8
|
I guess this is better
|
2019-07-10 18:56:32 -04:00 |
|
|
Trilbyspaceclone
|
ed89ac874b
|
this was fine
|
2019-07-10 18:44:14 -04:00 |
|
|
Trilbyspaceclone
|
baf4529e52
|
Update other_reagents.dm
|
2019-07-10 18:32:10 -04:00 |
|
|
Trilbyspaceclone
|
d53d11de6b
|
Apply suggestions from code review
Grammer and such
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-07-10 18:21:03 -04:00 |
|
|
Fermi
|
8f555b0fdd
|
Reworked Astral, doubled lung damage, fixed lung damage oopsie.
|
2019-07-10 21:35:47 +01:00 |
|
|
Trilbyspaceclone
|
c9e13f8d62
|
better wording*
|
2019-07-10 02:43:18 -04:00 |
|
|
TrilbySpaceClone
|
54c28b19af
|
Zelus indeed
|
2019-07-10 02:29:42 -04:00 |
|
|
Trilbyspaceclone
|
e1ed96f419
|
Update other_reagents.dm
|
2019-07-09 23:08:11 -04:00 |
|
|
Trilbyspaceclone
|
b03c197d0e
|
forgot the var
|
2019-07-09 22:58:13 -04:00 |
|
|
Trilbyspaceclone
|
6240222ed7
|
Update other_reagents.dm
|
2019-07-09 21:58:22 -04:00 |
|
|
Thalpy
|
c418312cc6
|
Merge branch 'master' into master
|
2019-07-09 05:33:09 +01:00 |
|
|
deathride58
|
42cee552fe
|
Merge pull request #8709 from Trilbyspaceclone/Fel_port_1
Ports "Fixes every issue in the slimes milestone. #44450"
|
2019-07-08 18:10:46 -04:00 |
|
|
kevinz000
|
6944725cfb
|
Merge pull request #8824 from Ghommie/Ghommie-cit109
Ports "Fixes damp rag not smothering people"
|
2019-07-07 02:31:26 -07:00 |
|
|
Thalpy
|
cc39c9f896
|
Merge branch 'master' into master
|
2019-07-06 16:03:17 +01:00 |
|
|
BurgerLua
|
f4307f919b
|
Nerfed changeling transformation string by making it temporary.
|
2019-07-05 16:49:02 -07:00 |
|
|
Fermi
|
a915821d1a
|
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
|
2019-07-04 23:24:39 +01:00 |
|
|
Fermi
|
ad37ec08b2
|
Removing slimejelly req from feedback.
|
2019-07-04 23:24:18 +01:00 |
|
|
Ghommie
|
3c2e03c247
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit58
|
2019-07-04 23:46:04 +02:00 |
|
|
Ghommie
|
37cf41a3bb
|
Ports "Fixes damp rag not smothering people"
|
2019-07-04 22:06:16 +02:00 |
|
|
Thalpy
|
8a6e669060
|
Merge branch 'master' into master
|
2019-07-04 03:14:29 +01:00 |
|
|
kevinz000
|
bce4ce31ab
|
Merge pull request #8778 from Ghommie/Ghommie-cit97
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-07-03 13:47:04 -07:00 |
|
|
Ghommie
|
1fd50cc15a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96
|
2019-07-03 04:52:57 +02: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
|
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
|
d876b20a0b
|
Quickfix for botany and removed message_admins that I thought I pushed.
|
2019-07-01 22:32:42 +01:00 |
|
|
Fermi
|
326bae2109
|
pH? More like Pretty HARGH.
|
2019-07-01 21:04:17 +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
|
f8a93a035f
|
Tweaking pH based on user feedback.
|
2019-06-29 07:32:00 +01:00 |
|
|
Ghommie
|
ad3b709c40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97
|
2019-06-29 06:39:21 +02:00 |
|
|
Ghommie
|
0371a5513a
|
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-06-29 06:03:57 +02:00 |
|
|
kevinz000
|
c495a2aa47
|
Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
|
2019-06-28 20:32:15 -07:00 |
|
|
kevinz000
|
a6caf4c63f
|
Merge pull request #8729 from Ghommie/Ghommie-cit79
Ports "Removes SSreligion"
|
2019-06-28 20:30:44 -07:00 |
|
|
Thalpy
|
b6309d5a31
|
Fixes explosion bug, tweaks hypo and fiddles pH.
|
2019-06-29 02:47:32 +01:00 |
|
|
Ghommie
|
3291b9c47a
|
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
|
2019-06-28 23:17:12 +02:00 |
|
|
Thalpy
|
a4edb0b69a
|
Trying alternative fix for pH.
|
2019-06-28 18:50:28 +01:00 |
|
|
kevinz000
|
d4b9b52f10
|
Merge pull request #8728 from Sishen1542/JESUSFUCKFIXDISPENSERSALREADYGODDAMN
Dispensers now act like tg counterparts! Tweak to available chems in chem/soda/booze dispensers.
|
2019-06-28 10:16:25 -07:00 |
|
|
Thalpy
|
b8028242c0
|
Compile fixes
|
2019-06-28 17:16:21 +01:00 |
|
|
Thalpy
|
9ee17e4045
|
[TEST] redo pH on reaction.
|
2019-06-28 16:58:08 +01:00 |
|
|
Thalpy
|
4b7ac0be79
|
More fun ssblackbox tallies.
|
2019-06-28 16:50:48 +01:00 |
|
|
Sishen
|
92f530eed1
|
left the , for diethyl when i removed saltpetre whoops
|
2019-06-28 08:34:35 -04:00 |
|