Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rxup
Rxup committed Nov 5, 2023
1 parent d7f8b92 commit a66e88b
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ private void OnEmergencyRepealAll(EntityUid uid, EmergencyShuttleConsoleComponen
return;

_logger.Add(LogType.EmergencyShuttle, LogImpact.High, $"Emergency shuttle early launch REPEAL ALL by {args.Session:user}");
_chatSystem.DispatchGlobalAnnouncement(Loc.GetString("emergency-shuttle-console-auth-revoked", ("remaining", component.AuthorizationsRequired)));
_chatSystem.DispatchGlobalAnnouncement(Loc.GetString("emergency-shuttle-console-auth-revoked", ("remaining", component.AuthorizationsRequired)), playSound: false);
component.AuthorizedEntities.Clear();
UpdateAllEmergencyConsoles();
}
Expand All @@ -280,7 +280,7 @@ private void OnEmergencyRepeal(EntityUid uid, EmergencyShuttleConsoleComponent c

_logger.Add(LogType.EmergencyShuttle, LogImpact.High, $"Emergency shuttle early launch REPEAL by {args.Session:user}");
var remaining = component.AuthorizationsRequired - component.AuthorizedEntities.Count;
_chatSystem.DispatchGlobalAnnouncement(Loc.GetString("emergency-shuttle-console-auth-revoked", ("remaining", remaining)));
_chatSystem.DispatchGlobalAnnouncement(Loc.GetString("emergency-shuttle-console-auth-revoked", ("remaining", remaining)), playSound: false);
CheckForLaunch(component);
UpdateAllEmergencyConsoles();
}
Expand Down
41 changes: 41 additions & 0 deletions Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
- type: HitscanBatteryAmmoProvider
proto: RedLaser
fireCost: 50
- type: Wieldable
- type: UseDelay
delay: 1.5

Expand Down Expand Up @@ -135,6 +136,7 @@
- type: HitscanBatteryAmmoProvider
proto: RedLaser
fireCost: 50
- type: Wieldable
- type: UseDelay
delay: 2.5

Expand Down Expand Up @@ -181,6 +183,7 @@
- type: HitscanBatteryAmmoProvider
proto: RedLaser
fireCost: 50
- type: Wieldable
- type: UseDelay
delay: 0.5

Expand Down Expand Up @@ -682,6 +685,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.3

Expand Down Expand Up @@ -736,6 +740,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 0.5

Expand Down Expand Up @@ -794,6 +799,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.3

Expand Down Expand Up @@ -852,6 +858,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.3

Expand Down Expand Up @@ -910,6 +917,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.5

Expand Down Expand Up @@ -968,6 +976,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.3

Expand Down Expand Up @@ -1024,6 +1033,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.5

Expand Down Expand Up @@ -1080,6 +1090,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.5

Expand Down Expand Up @@ -1133,6 +1144,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 0.5

Expand Down Expand Up @@ -1186,6 +1198,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 0.5

Expand Down Expand Up @@ -1239,6 +1252,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 0.8

Expand Down Expand Up @@ -1339,6 +1353,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 0.8

Expand Down Expand Up @@ -1542,6 +1557,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.3

Expand Down Expand Up @@ -1591,6 +1607,7 @@
steps: 6
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 0.5

Expand Down Expand Up @@ -1636,6 +1653,7 @@
- type: HitscanBatteryAmmoProvider
proto: RedHeavyLaser
fireCost: 100
- type: Wieldable
- type: UseDelay
delay: 2.5

Expand Down Expand Up @@ -1680,6 +1698,7 @@
- type: HitscanBatteryAmmoProvider
proto: XrayLaser
fireCost: 100
- type: Wieldable
- type: UseDelay
delay: 2.5

Expand All @@ -1698,6 +1717,7 @@
sprite: Backmen/Objects/Weapons/Gunsx64/Shotguns/sh-39/tiny.rsi
- type: BallisticAmmoProvider
capacity: 10
- type: Wieldable
- type: UseDelay
delay: 1.3
- type: GunRequiresWield
Expand All @@ -1723,6 +1743,7 @@
sprite: Backmen/Objects/Weapons/Gunsx64/Shotguns/zauer/tiny.rsi
- type: Clothing
sprite: Backmen/Objects/Weapons/Gunsx64/Shotguns/zauer/tiny.rsi
- type: Wieldable
- type: UseDelay
delay: 1.3
- type: GunRequiresWield
Expand Down Expand Up @@ -1782,6 +1803,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.3

Expand Down Expand Up @@ -1926,6 +1948,7 @@
zeroVisible: true
- type: Appearance
- type: GunRequiresWield
- type: Wieldable
- type: UseDelay
delay: 1.3

Expand Down Expand Up @@ -2004,6 +2027,7 @@
path: /Audio/Weapons/Guns/MagOut/revolver_magout.ogg
soundInsert:
path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
- type: Wieldable
- type: UseDelay
delay: 1.3
- type: GunRequiresWield
Expand Down Expand Up @@ -2043,6 +2067,7 @@
steps: 2
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 0.8
- type: GunRequiresWield
Expand Down Expand Up @@ -2080,6 +2105,7 @@
sprite: Backmen/Objects/Weapons/Gunsx64/Snipers/mosin/tiny.rsi
- type: Gun
fireRate: 0.8
- type: Wieldable
- type: UseDelay
delay: 0.8
- type: GunRequiresWield
Expand All @@ -2103,6 +2129,7 @@
path: /Audio/Weapons/Guns64/Snipers/garand.ogg
soundEmpty:
path: /Audio/Weapons/Guns64/Snipers/sniper_empty.ogg
- type: Wieldable
- type: UseDelay
delay: 0.8
- type: GunRequiresWield
Expand All @@ -2124,6 +2151,7 @@
minAngle: 24
maxAngle: 45
fireRate: 0.8
- type: Wieldable
- type: UseDelay
delay: 0.8

Expand All @@ -2142,6 +2170,7 @@
sprite: Backmen/Objects/Weapons/Gunsx64/Snipers/mosin/tiny.rsi
- type: Gun
fireRate: 0.8
- type: Wieldable
- type: UseDelay
delay: 0.8

Expand Down Expand Up @@ -2198,6 +2227,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.3

Expand Down Expand Up @@ -2313,6 +2343,7 @@
path: /Audio/Weapons/Guns64/Shotguns/shotgun_cmb_pump.ogg
soundInsert:
path: /Audio/Weapons/Guns64/Shotguns/shotgun_cmb_insert.ogg
- type: Wieldable
- type: UseDelay
delay: 0.1
- type: GunRequiresWield
Expand Down Expand Up @@ -2342,6 +2373,7 @@
path: /Audio/Weapons/Guns64/Shotguns/trenchgun_pump.ogg
soundInsert:
path: /Audio/Weapons/Guns64/Shotguns/shotgun_cmb_insert.ogg
- type: Wieldable
- type: UseDelay
delay: 0.8
- type: GunRequiresWield
Expand Down Expand Up @@ -2412,6 +2444,7 @@
steps: 1
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.5

Expand Down Expand Up @@ -2554,6 +2587,7 @@
steps: 2
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.9

Expand Down Expand Up @@ -2607,6 +2641,7 @@
steps: 2
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.9
- type: GunRequiresWield
Expand Down Expand Up @@ -2701,6 +2736,7 @@
steps: 2
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.9
- type: GunRequiresWield
Expand Down Expand Up @@ -2755,6 +2791,7 @@
steps: 2
zeroVisible: true
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.9
- type: GunRequiresWield
Expand Down Expand Up @@ -2826,6 +2863,7 @@
sprite: Backmen/Objects/Weapons/Gunsx64/Shotguns/spas-16/tiny.rsi
- type: BallisticAmmoProvider
capacity: 13
- type: Wieldable
- type: UseDelay
delay: 1.3
- type: GunRequiresWield
Expand Down Expand Up @@ -2862,6 +2900,7 @@
tags:
- PowerpackRifle
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 2.3
- type: GunRequiresWield
Expand Down Expand Up @@ -2897,6 +2936,7 @@
tags:
- PowerpackFlame
- type: Appearance
- type: Wieldable
- type: UseDelay
delay: 1.5
- type: GunRequiresWield
Expand Down Expand Up @@ -2988,6 +3028,7 @@
containers:
gun_magazine: !type:ContainerSlot
gun_chamber: !type:ContainerSlot
- type: Wieldable
- type: UseDelay
delay: 1.5
- type: GunRequiresWield
Expand Down

0 comments on commit a66e88b

Please sign in to comment.