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 73b52674252e780bfff2
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
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
DeltaFire
06cb91ca3d
updates all BODYPART_ORGANIC occurances
...
:)
2020-10-06 18:01:25 +02: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
Tupinambis
d2860b38c7
normalization
2020-10-01 18:46:31 -05:00
Tupinambis
f1bc1ccafb
Merge branch 'master' into spooder
...
# Conflicts:
# code/modules/surgery/organs/eyes.dm
I have no idea if this will work
2020-10-01 17:10:42 -05:00
Timothy Teakettle
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
silicons
1f82e8985c
Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort
...
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
2020-10-01 12:15:49 -07:00
Detective Google
98703e6ad6
Merge remote-tracking branch 'upstream/master' into arcade-carpets
2020-10-01 13:41:10 -05:00
Timothy Teakettle
e1123ad7fe
color define
2020-10-01 18:55:32 +01:00
silicons
f8bd6d3f49
Merge pull request #13458 from lolman360/plumbingfix3
...
smoke machine/autoharvest hydro tray fix
2020-10-01 03:06:19 -07:00
silicons
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Tupinambis
113b84ab50
Ports arachnids from WaspStation
2020-09-30 15:10:17 -05:00
Detective Google
643421bc23
adds arcade carpets
...
yay
2020-09-28 14:43:03 -05:00
lolman360
9860d296b8
what the fucjk
2020-09-28 14:05:53 +10:00
Timothy Teakettle
12bf3aebda
Merge remote-tracking branch 'upstream/master' into cool-ipcs
2020-09-16 05:12:20 +01:00
Timothy Teakettle
125b50d392
Merge branch 'master' into cool-ipcs
2020-09-16 05:09:02 +01:00
