Skip to content

Commit

Permalink
Add more love to Dexler
Browse files Browse the repository at this point in the history
  • Loading branch information
Ady4ik committed Sep 1, 2024
1 parent cc36ac5 commit b684517
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 47 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public override void Initialize()
SubscribeLocalEvent<ExaminableSolutionComponent, ExaminedEvent>(OnExamineSolution);
SubscribeLocalEvent<ExaminableSolutionComponent, GetVerbsEvent<ExamineVerb>>(OnSolutionExaminableVerb);
SubscribeLocalEvent<SolutionContainerManagerComponent, MapInitEvent>(OnMapInit);
//SubscribeLocalEvent<ClothingSlotSolutionProviderComponent, TakeSolutionEvent>(OnGetSolution);
SubscribeLocalEvent<ClothingSlotSolutionProviderComponent, TakeSolutionEvent>(OnGetSolution);

if (NetManager.IsServer)
{
Expand Down Expand Up @@ -1224,12 +1224,12 @@ public FixedPoint2 ClampReagentAmountByConcentration(
}

// SS220 Refactor nuzzle begin
private void OnGetSolution(EntityUid uid, TakeSolutionEvent takeSolutionEvent)
private void OnGetSolution(Entity<SolutionProviderComponent> entity, ref TakeSolutionEvent takeSolutionEvent)
{
if (!TryGetSolution(uid, ClothingSlotSolutionProviderComponent.ContainmentSolutionName, out var soln, out var solution))
if (!TryGetSolution(entity, ClothingSlotSolutionProviderComponent.ContainmentSolutionName, out var entsoln, out var solution))
return;

SplitSolution(uid, FixedPoint2.Value, FixedPoint2.New(takeSolutionEvent.SolutionAmount));
var splitSolution = SplitSolution(entsoln, new FixedPoint2(10f));
}
// SS220 Refactor nuzzle end
}
43 changes: 0 additions & 43 deletions Resources/Prototypes/Entities/Objects/Tools/spraynozzle.yml

This file was deleted.

31 changes: 31 additions & 0 deletions Resources/Prototypes/SS220/Tools/spraynozzle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
- type: entity
id: SprayNozzle
parent: BaseItem
name: spray nozzle
description: A high-powered spray nozzle used in conjunction with a backpack-mounted water tank.
components:
- type: EmitSoundOnLand
sound:
path: /Audio/SS220/Effects/Drop/pistol.ogg ##new sound_drop effect, add MIXnikita
params:
volume: 2
- type: Sprite
sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi
state: icon
- type: Item
sprite: Objects/Weapons/Guns/Basic/spraynozzle.rsi
size: Normal
- type: Gun
cameraRecoilScalar: 0 #no recoil
fireRate: 4
selectedMode: FullAuto
availableModes:
- FullAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/water_spray.ogg
- type: Appearance
- type: ClothingSlotAmmoProvider
targetSlot: BACK
providerWhitelist:
tags:
- NozzleBackTank

0 comments on commit b684517

Please sign in to comment.