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.

Sign up for GitHub

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

Port Arachne & Oniro from EE, with some DV changes along the way #2199

Closed
wants to merge 19 commits into from
Closed

Port Arachne & Oniro from EE, with some DV changes along the way #2199

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
729ed02
meow
Lyndomen Nov 15, 2024
b29be67
Merge branch 'master' into spiderwife
Lyndomen Nov 15, 2024
86c35bc
Merge branch 'DeltaV-Station:master' into spiderwife
Lyndomen Jan 14, 2025
ea42b14
sppoder
Lyndomen Jan 14, 2025
cd019ae
Merge branch 'DeltaV-Station:master' into spiderwife
Lyndomen Jan 14, 2025
3db2afc
spoder
Lyndomen Jan 15, 2025
d425c5d
spoder
Lyndomen Jan 16, 2025
6ed40ee
Merge branch 'DeltaV-Station:master' into spiderwife
Lyndomen Jan 20, 2025
5c995eb
arachne real
Lyndomen Jan 20, 2025
433f86e
aaaaaaaaa
Lyndomen Jan 23, 2025
916a37e
spider
Lyndomen Jan 29, 2025
87c969f
Merge branch 'DeltaV-Station:master' into spiderwife
Lyndomen Jan 29, 2025
e2af2b4
take 10
Lyndomen Jan 29, 2025
e140b5b
aaaa
Lyndomen Jan 29, 2025
e9e070e
succ to suck, not funny
Lyndomen Jan 29, 2025
dc44811
removesucc 2
Lyndomen Jan 29, 2025
7260355
refactor gaming
Lyndomen Jan 29, 2025
b15e4a6
spider real
Lyndomen Jan 29, 2025
a54bc84
Merge branch 'master' into spiderwife
Lyndomen Jan 29, 2025
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
Prev Previous commit
Next Next commit
removesucc 2
@Lyndomen
Lyndomen committed Jan 29, 2025
commit dc448112f42808cdbfb3f1b9f867d54aec47948f
2 changes: 1 addition & 1 deletion Content.Server/_EE/Vampire/Injector/BloodSuckerGlandInjectorSystem.cs
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ private void OnAfterInteract(EntityUid uid, BloodSuckerGlandInjectorComponent co
if (bloodSuckerComponent.InjectWhenSuck)
return;

bloodSuckerComponent.InjectWhenSucc = true;
bloodSuckerComponent.InjectWhenSuck = true;
bloodSuckerComponent.InjectReagent = component.InjectReagent;
bloodSuckerComponent.UnitsToInject = component.UnitsToInject;
component.Used = true;
4 changes: 2 additions & 2 deletions Resources/Prototypes/_DV/Entities/Mobs/NPCs/glimmer_creatures.yml
View file
Original file line number Diff line number Diff line change
@@ -235,8 +235,8 @@
- ReagentId: Nocturine
Quantity: 0.15
- type: BloodSucker
unitsToSucc: 35
injectWhenSucc: true
unitsToSuck: 35
injectWhenSuck: true
injectReagent: Cryptobiolin
unitsToInject: 10
webRequired: true