Commit Graph

2033 Commits

Author SHA1 Message Date
Artur
19f27f2f59 Somehow forgot this very important detail 2021-01-14 10:57:46 +02:00
Hatterhat
cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06:00
Artur
df825b4441 deltafire's suggested fixes 2021-01-12 00:23:39 +02:00
Lin
5e08df700f Merge pull request #13939 from silicons/reagentlogs
low level reagent logging additions
2021-01-09 16:24:40 +00:00
silicons
0d781aa71e Update chem_dispenser.dm 2021-01-08 01:17:56 -07:00
Artur
ffe20839fe tweaks loss numbers 2021-01-04 23:46:48 +02:00
Artur
6388c3cf55 Blood bag delays 2021-01-04 23:43:33 +02:00
Fermi
619490b040 oops 2021-01-04 16:32:06 +00:00
Fermi
5b703e84a4 Merge branch 'master' into Dispencer-UI-change 2021-01-04 16:21:06 +00:00
Fermi
d9047e458c Testing and bugfixes 2021-01-04 15:47:35 +00:00
Fermi
57cd698994 Tweaks and fixes. Should be freature complete now. 2021-01-04 13:40:26 +00:00
Fermi
c7965d3b4a Pushing to review diff 2021-01-04 10:53:21 +00:00
Fermi
37c3bbbd9c Fixing things and gui 2021-01-04 01:48:35 +00:00
Chiirno
da5ea18c9a OK, compiling did something funky to the dm code? 2021-01-01 04:04:39 -04:00
Chiirno
bbeed2b8f0 I've done it, I've edited TgUI! 2021-01-01 04:00:35 -04:00
silicons
8a471d6984 logs 2020-12-31 12:35:45 -08:00
silicons
251bd3e06b logging 2020-12-31 12:33:05 -08:00
silicons
3ad65d9b76 Merge pull request #13911 from raspy-on-osu/salicyclic-acid
salicyclic acid
2020-12-30 14:46:04 -07:00
raspy-on-osu
d2c0e1ba41 salicyclic acid 2020-12-29 02:35:42 -05:00
silicons
c4de817870 Update drink_reagents.dm 2020-12-27 12:48:02 -07:00
silicons
94b3f03b24 Update drug_reagents.dm 2020-12-27 12:45:57 -07:00
silicons
952f5f8716 Update drug_reagents.dm 2020-12-27 12:32:14 -07:00
DeltaFire
219470e8c6 Merge pull request #13815 from YakumoChen/no-ezchem
Removes slime blood to jelly conversion
2020-12-22 06:17:41 +01:00
YakumoChen
3bdf4bacdc removes slime blood conversion 2020-12-19 10:28:56 +00:00
BlackMajor
e50760f641 Lilly please that's not funny 2020-12-19 00:59:50 +13:00
BlackMajor
8f30d5a686 Update borghydro.dm 2020-12-19 00:46:04 +13:00
MrJWhit
d10c9db8b2 Update reagent_dispenser.dm 2020-12-11 10:31:42 -05:00
MrJWhit
477330197c Huh we already had this 2020-12-10 01:14:43 -05:00
DeltaFire
69127ebec6 e 2020-11-25 18:06:08 +01:00
DeltaFire
24b712c71e better way to do this 2020-11-25 15:42:43 +01:00
DeltaFire
282a5d6ab2 aaactually lets just make robots immune in general 2020-11-24 20:32:42 +01:00
DeltaFire
a3208d1ac8 synth alcohol immunity 2020-11-24 20:27:34 +01:00
silicons
f8d43b7544 Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
2020-11-18 22:54:51 -07:00
silicons
5b03f5b0ec more 2020-11-12 23:36:18 -07:00
DeltaFire
78da9f0578 system cleaner is now creatable
recipe:
2 iron
2 oil
2 calomel
2 acetone
outcome:
4 system cleaner
2020-11-13 04:21:00 +01:00
DeltaFire
dee77e2183 unneeded arg 2020-11-13 03:07:21 +01:00
DeltaFire
2927a387a4 typo 2020-11-13 03:06:20 +01:00
DeltaFire
cfa8d17ef1 adds a corruption healing reagent
title. Slowly purges corruption, and causes light toxins damage to nonrobots. Inverts its positive effect on overdose / becomes more toxic to nonrobots
2020-11-13 03:05:55 +01:00
silicons
a13765b7c9 Merge pull request #13521 from DeltaFire15/zeolites-tweaking
[READY] Rebalances zeolites and their reaction
2020-11-07 00:16:29 -07:00
Timothy Teakettle
db87297536 fix (#13632) 2020-11-01 22:03:43 +01:00
BlueWildrose
86d15d8fb3 Fixed species-specific drinks not giving a mood boost if right species (#13585)
* Species drink moodboost fix

* code cleanup

* Revert "code cleanup"

This reverts commit fa308a2acd213b085308ebf3595d08463cbcd7be.

* code cleanup

* meant to make this 26 not 30

* Committing Putnam's suggestion

Co-authored-by: Putnam3145 <putnam3145@gmail.com>

Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-19 11:46:36 +02:00
Putnam3145
099a82b936 Made fermichem displays work correctly. (#13577) 2020-10-16 22:27:37 +02:00
silicons
29b7b49fe9 Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
Robotic limbs 2 : Threshhold Boogaloo
2020-10-11 17:33:00 -07:00
Tupinambis
3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05:00
DeltaFire
a5fce4b6ed Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2 2020-10-11 15:39:41 +02:00
silicons
737b6460af Merge pull request #13497 from Zandario/species-refactor
Refactors some defines for easier Species Development
2020-10-10 22:00:49 -07:00
DeltaFire
4ccf40f775 Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
This reverts commit 27a099c6bf.
2020-10-11 00:53:18 +02:00
DeltaFire
27a099c6bf Revert "Merge branch 'master' into robotic-limbs-PT2"
This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
2020-10-11 00:51:39 +02:00
DeltaFire
73b5267425 Merge branch 'master' into robotic-limbs-PT2 2020-10-11 00:44:28 +02:00
DeltaFire
2d684c88be readds a accidentally removed thing
Apparently, someone accidentally removed the functionality of being able to inject beakers in heaters without having to remove them, which is pretty required fore more complex reactions. This readds that.
Also tweaks the Ion release of the zeolite reaction a bit (-0.2 > -0.15)
2020-10-09 00:06:01 +02:00