diff --git a/Content.Shared/CCVar/CCVars.Shuttle.cs b/Content.Shared/CCVar/CCVars.Shuttle.cs index bfe5a6630d..78e210b6db 100644 --- a/Content.Shared/CCVar/CCVars.Shuttle.cs +++ b/Content.Shared/CCVar/CCVars.Shuttle.cs @@ -258,7 +258,7 @@ public sealed partial class CCVars /// [CVarControl(AdminFlags.VarEdit)] public static readonly CVarDef ImpactSlowdown = - CVarDef.Create("shuttle.impact.slowdown", 4f, CVar.SERVERONLY); //Sunrise-Edit + CVarDef.Create("shuttle.impact.slowdown", 8f, CVar.SERVERONLY); /// /// Minimum velocity change from impact for special throw effects (e.g. stuns, beakers breaking) to occur diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Circuitboards/Machine/production.yml index b41ef6a5bc..b31214d64b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -67,4 +67,15 @@ Manipulator: 3 Steel: 5 Glass: 2 - Cable: 4 \ No newline at end of file + Cable: 4 + +- type: entity + id: ThrusterSyndicateMachineCircuitboard + parent: BaseMachineCircuitboard + name: thruster syndie machine board + components: + - type: MachineBoard + prototype: ThrusterSyndicate + stackRequirements: + Manipulator: 4 + Steel: 5 diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Shuttles/thrusters.yml index 840d0a85dd..6a223bd91b 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Shuttles/thrusters.yml @@ -1,65 +1,89 @@ +- type: entity + id: ThrusterSyndicate + parent: [ BaseThruster, ConstructibleMachine ] + components: + - type: Thruster + baseThrust: 150 + - type: Machine + board: ThrusterSyndicateMachineCircuitboard + - type: Sprite + sprite: _Sunrise/Structures/Shuttles/syndicate_thruster.rsi + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: red_thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: red_thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + offset: 0, 1 + - type: entity id: BigThruster name: big thruster - parent: [ BaseThruster ] + parent: [ BaseThruster] + placement: + mode: AlignTileAny components: - - type: Anchorable - flags: - - Anchorable - - type: Sprite - sprite: _Sunrise/Structures/Shuttles/big_thruster.rsi - layers: - - state: base - map: ["enum.ThrusterVisualLayers.Base"] - offset: 0.5,0.5 - - state: thrust - map: ["enum.ThrusterVisualLayers.ThrustOn"] - shader: unshaded - visible: false - offset: 0.5,0.5 - - state: thrust_burn_unshaded - map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] - shader: unshaded - visible: false - offset: 0.5, 2.5 - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeAabb - bounds: "-0.35,-0.35,1.30,1.30" - density: 60 - mask: - - MachineMask - layer: - - MachineLayer - - type: Thruster - thrust: 400 - requireSpace: false - damage: - types: - Heat: 80 - - type: Machine - board: ThrusterMachineCircuitboard - type: Destructible thresholds: - trigger: !type:DamageTrigger - damage: 1500 + damage: 1800 behaviors: - !type:DoActsBehavior acts: ["Destruction"] - trigger: !type:DamageTrigger - damage: 1450 + damage: 900 behaviors: - !type:DoActsBehavior acts: ["Destruction"] - !type:PlaySoundBehavior sound: collection: MetalBreak - - !type:ChangeConstructionNodeBehavior - node: machineFrame + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-1.45,1.45,0.45" + density: 1750 + mask: + - MachineMask + layer: + - MachineLayer + - type: ApcPowerReceiver + powerLoad: 10000 + - type: Thruster + thrust: 1600 + burnShape: ["-0.3,0.5", "0.2,2.25", "0.8,2.25", "1.3,0.5"] + damage: + types: + Heat: 120 + - type: Sprite + sprite: _Sunrise/Structures/Shuttles/big_thruster.rsi + offset: 0.5,-0.5 + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + offset: 0, 2 + - type: Anchorable + flags: + - Anchorable + - type: StaticPrice + price: 1500 - type: entity id: BigRedThruster @@ -68,20 +92,19 @@ components: - type: Sprite sprite: _Sunrise/Structures/Shuttles/big_thruster.rsi + offset: 0.5,-0.5 layers: - state: base map: ["enum.ThrusterVisualLayers.Base"] - offset: 0.5,0.5 - state: red_thrust map: ["enum.ThrusterVisualLayers.ThrustOn"] shader: unshaded visible: false - offset: 0.5,0.5 - state: red_thrust_burn_unshaded map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] shader: unshaded visible: false - offset: 0.5, 2.5 + offset: 0, 2 - type: entity id: HugeThruster @@ -112,18 +135,20 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.20,-0.25,2.20,2.20" - density: 60 + bounds: "-0.4,-0.4,2.4,2.25" + density: 4000 mask: - MachineMask layer: - MachineLayer + - type: ApcPowerReceiver + powerLoad: 25000 - type: Thruster - thrust: 800 - requireSpace: false + thrust: 8000 + burnShape: ["-0.2,2.3", "0.2,5", "1.8,5", "2.2,2.3"] damage: types: - Heat: 160 + Heat: 800 - type: Machine board: ThrusterMachineCircuitboard - type: Destructible diff --git a/Resources/Prototypes/_Sunrise/Structures/thruster_syndicate.yml b/Resources/Prototypes/_Sunrise/Structures/thruster_syndicate.yml deleted file mode 100644 index d85031bfdf..0000000000 --- a/Resources/Prototypes/_Sunrise/Structures/thruster_syndicate.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: entity - id: ThrusterSyndicate - parent: [ BaseThruster, ConstructibleMachine ] - components: - - type: Thruster - baseThrust: 150 - - type: Machine - board: ThrusterSyndicateMachineCircuitboard - - type: Sprite - sprite: _Sunrise/Structures/Shuttles/syndicate_thruster.rsi - layers: - - state: base - map: ["enum.ThrusterVisualLayers.Base"] - - state: red_thrust - map: ["enum.ThrusterVisualLayers.ThrustOn"] - shader: unshaded - visible: false - - state: red_thrust_burn_unshaded - map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] - shader: unshaded - visible: false - offset: 0, 1 - -- type: entity - id: ThrusterSyndicateMachineCircuitboard - parent: BaseMachineCircuitboard - name: thruster syndie machine board - components: - - type: MachineBoard - prototype: ThrusterSyndicate - stackRequirements: - Manipulator: 4 - Steel: 5