Skip to content

Commit 3ee8e4e

Browse files
1.0
1 parent 3fb9996 commit 3ee8e4e

7 files changed

Lines changed: 66 additions & 52 deletions

File tree

Content.Server/_Starlight/Atmos/Reactions/NitriumProductionReaction.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ public ReactionResult React(GasMixture mixture, IGasMixtureHolder? holder, Atmos
2626
var volume = mixture.Volume;
2727
var temperature = mixture.Temperature;
2828

29-
var catalyze = initBZ / 100f ;
29+
var catalyze = 1f + (initBZ / 100f) ;
3030

3131
/// Check what ingredient is smallest relative to its un-catalyzed demand. Use it as a limiter.
3232

3333
var limit = Math.Min(initTritium / 2f, Math.Min(initNitrogen * catalyze / 3f, initPluox));
3434

3535
/// Produces faster with higher temperature, lower pressure, and higher concetrations of BZ. BZ also magnifies the nitrogen consumption so watch out.
3636

37-
var tempRate = temperature/ 500f ;
37+
var tempRate = temperature / 500f ;
3838

39-
var pressureRate = (100f / pressure) * 2f ;
39+
var pressureRate = (10f / pressure) * 2f ;
4040

41-
var rate = Math.Min(1F * tempRate * pressureRate * catalyze, limit);
41+
var rate = Math.Min(0.5F * tempRate * pressureRate * catalyze, limit);
4242

4343
var tritiumRemoved = 2f * rate;
4444
var nitrogenRemoved = 3f * rate * catalyze;

Resources/Prototypes/_Funkystation/Atmospherics/gases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
specificHeat: 10
1919
heatCapacityRatio: 1.4
2020
gasOverlaySprite: /Textures/_Funkystation/Effects/atmospherics.rsi
21-
gasOverlayState: nitrium
21+
gasOverlayState: healium # Starlight: Nitrium gets healium's old color.
2222
molarMass: 8
2323
color: fa8072
2424
reagent: Nitrium

Resources/Prototypes/_Funkystation/Reagents/gases.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
conditions:
128128
- !type:ReagentCondition
129129
reagent: Nitrium
130-
min: 1
130+
min: .1
131131
max: 5
132132
reagent: NitrosylPlasmide
133133
amount: .5
@@ -137,8 +137,8 @@
137137
conditions:
138138
- !type:ReagentCondition
139139
reagent: Nitrium
140-
min: 5
141-
max: 10
140+
min: .5
141+
max: 1
142142
reagent: NitrosylPlasmide
143143
amount: 1
144144
maxScale: 2
@@ -147,7 +147,7 @@
147147
conditions:
148148
- !type:ReagentCondition
149149
reagent: Nitrium
150-
min: 10
150+
min: 1
151151
reagent: NitrosylPlasmide
152152
amount: 1.5
153153
maxScale: 2

Resources/Prototypes/_Funkystation/Reagents/narcotics.yml

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Funky atmos - /tg/ gases
2-
- type: reagent
2+
- type: reagent # Starlight START: Basically this whole reagant has been edited
33
id: NitrosylPlasmide
44
name: reagent-name-nitrosyl-plasmide
55
group: Narcotics
@@ -8,22 +8,26 @@
88
flavor: sour
99
color: "#e1a116"
1010
metabolisms:
11-
Respiration: # Starlight
11+
Respiration:
1212
effects:
1313
- !type:Jitter
14-
Bloodstream: # Starlight
14+
Bloodstream:
1515
effects:
1616
- !type:Jitter
17+
conditions:
18+
- !type:ReagentCondition
19+
reagent: NitrosylPlasmide
20+
min: 5
1721
- !type:ModifyStatusEffect
1822
effectProto: StatusEffectStunned
19-
time: 0.3 # Starlight
23+
time: 0.3
2024
type: Remove
2125
conditions:
2226
- !type:ReagentCondition
2327
reagent: NitrosylPlasmide
2428
min: 5
2529
- !type:ModifyKnockdown
26-
time: 0.3 # Starlight
30+
time: 0.3
2731
type: Remove
2832
conditions:
2933
- !type:ReagentCondition
@@ -62,10 +66,18 @@
6266
- !type:EvenHealthChange # Level 2 effectiveness
6367
ignoreResistances: true
6468
damage:
65-
Brute: -1.0
66-
Burn: -1.0
67-
Toxin: -1.0
68-
Genetic: 0.09
69+
Brute: -1.5
70+
Burn: -1.5
71+
Toxin: -1.5
72+
conditions:
73+
- !type:ReagentCondition
74+
reagent: NitrosylPlasmide
75+
min: 5
76+
max: 10
77+
- !type:HealthChange
78+
damage:
79+
types:
80+
Cellular: 0.6
6981
conditions:
7082
- !type:ReagentCondition
7183
reagent: NitrosylPlasmide
@@ -77,23 +89,30 @@
7789
conditions:
7890
- !type:ReagentCondition
7991
reagent: NitrosylPlasmide
80-
min: 5
81-
max: 10
92+
min: 4.5
93+
max: 9.5
8294
- !type:AdjustReagent
8395
reagent: NitrosylPlasmide
8496
amount: -1.5
8597
conditions:
8698
- !type:ReagentCondition
8799
reagent: NitrosylPlasmide
88-
min: 5
89-
max: 10
100+
min: 4.5
101+
max: 9.5
90102
- !type:EvenHealthChange # Level 3 effectiveness
91103
ignoreResistances: true
92104
damage:
93-
Brute: -2.0
94-
Burn: -2.0
95-
Toxin: -2.0
96-
Genetic: 0.18
105+
Brute: -2.5
106+
Burn: -2.5
107+
Toxin: -2.5
108+
conditions:
109+
- !type:ReagentCondition
110+
reagent: NitrosylPlasmide
111+
min: 10
112+
- !type:HealthChange
113+
damage:
114+
types:
115+
Cellular: 0.12
97116
conditions:
98117
- !type:ReagentCondition
99118
reagent: NitrosylPlasmide
@@ -112,10 +131,9 @@
112131
- !type:ReagentCondition
113132
reagent: NitrosylPlasmide
114133
min: 10
115-
# Starlight END
116134
- !type:ResetNarcolepsy
117135
conditions:
118136
- !type:ReagentCondition
119137
reagent: NitrosylPlasmide
120138
min: 0.1
121-
139+
# Starlight END

Resources/Prototypes/_Starlight/Catalog/Fills/Items/gas_tanks.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
parent: AirTank
44
suffix: Empty
55
name: stimpack tank
6-
description: Contains a mixture of performance enhancing nitrium and respirating gasses.
6+
description: A tank containing a performance enhancing mixture of gasses designed to boost physical capabilities. Typically issued to those who get into heavy combat.
77
components:
88
- type: Sprite
99
sprite: _Starlight/Objects/Tanks/anesthetic2.rsi
@@ -22,13 +22,14 @@
2222
suffix: Filled
2323
components:
2424
- type: GasTank
25-
outputPressure: 22
25+
outputPressure: 25
2626
air:
2727
volume: 5
2828
moles:
29-
Pluoxium: 0.4861768349 # 23.7% Pluoxium, so voxes don't get poisoned
30-
Ulnitranium: 0.4861768349 # 23.7% Ulnitranium
31-
Nitrium: 0.3737682167 # 4.3 kPa (18.22%)
29+
Pluoxium: 0.3
30+
Ulnitranium: 0.3
31+
Nitrium: 0.8
32+
ZXA: 0.2
3233
temperature: 293.15
3334

3435
- type: entity

Resources/Prototypes/_Starlight/Reagents/gases.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,13 @@
3232
conditions:
3333
- !type:ReagentCondition
3434
reagent: ZXA
35-
min: 0.2
35+
min: 0.5
3636
emote: Cough
3737
showInChat: true
3838
probability: 0.05
3939

40-
- !type:HealthChange
41-
conditions:
42-
- !type:ReagentCondition
43-
reagent: ZXA
44-
min: 1
45-
ignoreResistances: true
46-
maxScale: 5
47-
damage:
48-
types:
49-
Cellular: -0.1 # It can heal you a *tiny* amount, if you wanna sleep it off.
50-
51-
5240
- !type:ModifyStatusEffect
53-
minScale: 0.6
41+
minScale: 1.0
5442
effectProto: StatusEffectSeeingRainbow
5543
type: Add
5644
time: 5
@@ -59,7 +47,7 @@
5947
conditions:
6048
- !type:ReagentCondition
6149
reagent: ZXA
62-
min: 0.2
50+
min: 0.5
6351
emote: Laugh
6452
showInChat: true
6553
probability: 0.05
@@ -68,7 +56,7 @@
6856
conditions:
6957
- !type:ReagentCondition
7058
reagent: ZXA
71-
min: 0.2
59+
min: 1.0
7260
emote: Scream
7361
showInChat: true
7462
probability: 0.005
@@ -86,7 +74,6 @@
8674
messages: [ "effect-sleepy" ]
8775
probability: 0.1
8876

89-
9077
- !type:MovementSpeedModifier
9178
minScale: 1
9279
conditions:
@@ -112,6 +99,7 @@
11299
conditions:
113100
- !type:ReagentCondition
114101
reagent: ZXA
115-
min: 0.1
102+
min: 0.01
116103
reagent: ZXAMetabolites
117-
amount: 1.8
104+
amount: 5
105+
maxScale: 2

Resources/Prototypes/_Starlight/Reagents/toxins.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@
3434
flavor: bitter
3535
color: "#869ea3"
3636
physicalDesc: reagent-physical-desc-nondescript
37+
metabolisms:
38+
Bloodstream:
39+
effects:
40+
- !type:HealthChange
41+
damage:
42+
types:
43+
Cellular: -0.1
3744
# Just as BZ Metabolites don't actually function right now, neither do ZXA Metabolites. Maybe we could make it hurt vampires too or something.
3845
# metabolisms:
3946
# Poison:

0 commit comments

Comments
 (0)