Commit Graph

1557 Commits

Author SHA1 Message Date
Lin 2d3627b75c Merge pull request #13895 from Citadel-Station-13/silicons-patch-53
Restores speedup to meth and nuka cola
2021-01-31 23:35:37 -06:00
Putnam3145 8b9551b39c Merge pull request #14056 from Citadel-Station-13/silicons-patch-14
disables rotatium due to it being horifically bugged and unmaintained
2021-01-26 22:24:14 -08:00
silicons 72716068ba Merge pull request #14101 from Hatterhat/more-gauze-shit
some other gauze parity dogshit
2021-01-20 15:26:41 -07:00
silicons 9f50ea66c8 Merge pull request #14104 from LetterN/semi-sync
[s] semi sync- we forgot the anti ddos thing
2021-01-20 15:14:37 -07:00
Letter N 021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Hatterhat 90b85480e1 uuuuuuuuuuuuugh 2021-01-19 17:07:10 -06:00
Hatterhat 1445f448e9 uuuuuuuuuuuuuuuuuuugh 2021-01-19 17:04:59 -06:00
kittycat2002 b46caa77af Gives /datum/reagent/consumable/ethanol/species_drink a name
This fixes an issue that occurs when attempting to find Ethanol by name using get_chem_id.
2021-01-18 21:39:34 -05:00
silicons 0db94c5aa8 Update code/modules/reagents/chemistry/reagents/toxin_reagents.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-01-17 20:41:48 -07:00
silicons c0edfa729b Merge pull request #14070 from YakumoChen/distressingly-fuzzy
Makes Buzz Fuzz go on a diet
2021-01-17 20:40:22 -07:00
YakumoChen 693887487b I saw what had been wrought, and trembled 2021-01-16 08:29:14 +00:00
Hatterhat 798b25846d gauze parity 2021-01-14 20:53:55 -06:00
silicons 608465f1ed Update toxin_reagents.dm 2021-01-14 17:14:09 -07:00
Hatterhat cb40ad4764 atomization is cowardice actually 2021-01-12 16:08:17 -06: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
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
YakumoChen 3bdf4bacdc removes slime blood conversion 2020-12-19 10:28:56 +00: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
Tupinambis 3224533a7c Merge branch 'master' into spooder 2020-10-11 14:31:23 -05: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 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
silicons 3557f00316 Merge pull request #13498 from deathride58/lingbloodupgrade
Lingblood rework (Loudness is now an average, rather than a sum)
2020-10-06 17:04:38 -07:00
silicons 9faff5ecb6 Merge pull request #13461 from Detective-Google/arcade-carpets
adds arcade carpets
2020-10-03 18:07:44 -07:00
silicons 0393ffe0c3 Merge pull request #13489 from timothyteakettle/species-color-define
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
Zandario bc75c12080 Update other_reagents.dm 2020-10-02 21:08:06 -05:00
deathride58 cbe6178a11 reworks ling blood - loudness is now calculated via the average of your loud abilities rather than the sum 2020-10-02 19:21:30 -04:00
Zandario 1620e3887c Merge branch 'master' into species-refactor 2020-10-02 17:19:48 -05:00
Zandario bdd121cd81 Prep Work 2020-10-02 17:17:50 -05:00