Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

more chemistry #107

Merged
merged 34 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2dbb07d
some things
FlapstheMoth Oct 11, 2024
9bd0d4f
gunpowder recipe
FlapstheMoth Oct 11, 2024
b1640a6
saltpetre reaction
FlapstheMoth Oct 11, 2024
14f6e09
saltpetre description
FlapstheMoth Oct 11, 2024
5293b8a
saltpetre (again)
FlapstheMoth Oct 11, 2024
501da58
bath salts
FlapstheMoth Oct 11, 2024
6975503
Update narcotics.ftl
FlapstheMoth Oct 11, 2024
646d317
bath salts recipe
FlapstheMoth Oct 11, 2024
327a7c1
fix
FlapstheMoth Oct 11, 2024
2f48145
a
FlapstheMoth Oct 11, 2024
d7d1253
Update narcotics.yml
FlapstheMoth Oct 11, 2024
3d4e3f7
a2
FlapstheMoth Oct 11, 2024
73457a4
!type:ChemVomit
FlapstheMoth Oct 12, 2024
000041b
Update chemicals.yml
FlapstheMoth Oct 12, 2024
b2707b0
Update narcotics.yml
FlapstheMoth Oct 12, 2024
6516038
Update narcotics.yml
FlapstheMoth Oct 12, 2024
c3cbdcb
cyanide
FlapstheMoth Oct 12, 2024
39fc5bd
Update toxins.ftl
FlapstheMoth Oct 12, 2024
2fb0918
cyanide recipe
FlapstheMoth Oct 12, 2024
03d75a8
changes
FlapstheMoth Oct 12, 2024
c8ebdd4
cyanide, again
FlapstheMoth Oct 12, 2024
ccc9327
flake
FlapstheMoth Oct 12, 2024
8fd8aaa
maintenance flake reaction
FlapstheMoth Oct 12, 2024
ee98520
maintenance flake description
FlapstheMoth Oct 12, 2024
0cbeffd
maintenance flakes
FlapstheMoth Oct 12, 2024
ab5f1fb
Update narcotics.yml
FlapstheMoth Oct 13, 2024
7833f96
no
FlapstheMoth Oct 13, 2024
ab1ebc3
no
FlapstheMoth Oct 13, 2024
aacf8f0
Update narcotics.ftl
FlapstheMoth Oct 13, 2024
d91fdd8
bathsalts healing properties
FlapstheMoth Oct 13, 2024
487d237
cyanide rand. chems
FlapstheMoth Oct 13, 2024
b69f0a1
cyanide from apples
FlapstheMoth Oct 13, 2024
84b4a13
bath salts debuff
FlapstheMoth Oct 14, 2024
38ab9b8
cyanide debuff
FlapstheMoth Oct 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/reagents/meta/botany.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@ reagent-desc-diethylamine = A very potent fertilizer, treats plants with nutrien

reagent-name-sedin = sedin
reagent-desc-sedin = A modified version of diethylamine that can restore seeds on plants at the cost of potency.

reagent-name-saltpetre = saltpetre
reagent-desc-saltpetre = A commonly used fertilizer, used as an oxidizer in fireworks and rockets.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/reagents/meta/narcotics.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ reagent-desc-tear-gas = A chemical that causes severe irritation and crying, com

reagent-name-happiness = happiness
reagent-desc-happiness = Fills you with ecstatic numbness and causes minor brain damage. Highly addictive. If overdosed causes sudden mood swings.

reagent-name-bath-salts = bath salts
reagent-desc-bath-salts = A drug that is used to reduce inflammation and relax the user, though it is misused and is recreationally used by spessmen.
31 changes: 31 additions & 0 deletions Resources/Prototypes/Reagents/botany.yml
Original file line number Diff line number Diff line change
Expand Up @@ -303,3 +303,34 @@
damage:
types:
Caustic: 1

- type: reagent
id: Saltpetre
name: reagent-name-saltpetre
group: Botanical
desc: reagent-desc-saltpetre
physicalDesc: reagent-physical-desc-powdery
flavor: bitter
color: "white"
plantMetabolism:
- !type:PlantAdjustNutrition
amount: 1
- !type:PlantAdjustHealth
amount: 1.25
- !type:PlantAffectGrowth
probability: 0.1
amount: 1
metabolisms:
Poison:
effects:
- !type:HealthChange
damage:
types:
Poison: 0.5
Medicine:
effects:
- !type:ChemVomit
conditions:
- !type:ReagentThreshold
min: 5
probability: 0.2
51 changes: 51 additions & 0 deletions Resources/Prototypes/Reagents/narcotics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -461,3 +461,54 @@
type: Add
time: 5
refresh: false

- type: reagent
id: BathSalts
name: reagent-name-bath-salts
group: Narcotics
desc: reagent-desc-bath-salts
physicalDesc: reagent-physical-desc-powdery
flavor: bitter
color: "#FAFAFA"
metabolisms:
Poison:
effects:
- !type:HealthChange
conditions:
- !type:ReagentThreshold
max: 20
damage:
types:
Asphyxiation: 1.5
Poison: 0.5
Narcotic:
effects:
- !type:Jitter
- !type:MovespeedModifier
walkSpeedModifier: 1.2
sprintSpeedModifier: 1.2
- !type:Emote
emote: drools
showInChat: true
probability: 0.2
conditions:
- !type:ReagentThreshold
max: 20
- !type:GenericStatusEffect
key: Stun
time: 3
type: Remove
- !type:GenericStatusEffect
key: KnockedDown
time: 3
type: Remove
Medicine:
effects:
- !type:ResetNarcolepsy
conditions:
- !type:ReagentThreshold
min: 10
- !type:ChemVomit
probability: 0.2
- !type:ReagentThreshold
FlapstheMoth marked this conversation as resolved.
Show resolved Hide resolved
max: 20
12 changes: 12 additions & 0 deletions Resources/Prototypes/Recipes/Reactions/botany.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,15 @@
amount: 4
products:
PlantBGone: 5

- type: reaction
id: Saltpetre
reactants:
Oxygen:
amount: 3
Potassium:
amount: 1
Nitrogen:
amount: 1
products:
Saltpetre: 3
17 changes: 17 additions & 0 deletions Resources/Prototypes/Recipes/Reactions/chemicals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -526,3 +526,20 @@
products:
AmmoniatedMercury: 2
AmmoniatedSludge: 1

- type: reaction
id: BathSalts
minTemp: 374
reactants:
Saltpetre:
amount: 1
SpaceCleaner:
amount: 1
Enzyme:
amount: 1
Nutriment:
amount: 1
Mercury:
amount: 1
products:
BathSalts: 5
8 changes: 4 additions & 4 deletions Resources/Prototypes/Recipes/Reactions/fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,12 @@
quantized: true
minTemp: 374
reactants:
Potassium:
amount: 6
Sulfur:
amount: 2
Charcoal:
amount: 2
Sulfur:
amount: 2
Saltpetre:
amount: 3
effects:
- !type:CreateEntityReactionEffect
entity: MaterialGunpowder
Loading