diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs index 45a990be80..bca0f39404 100644 --- a/Content.Server/Paper/PaperSystem.cs +++ b/Content.Server/Paper/PaperSystem.cs @@ -11,6 +11,7 @@ using Robust.Server.GameObjects; using Robust.Server.Player; using Robust.Shared.Player; using Robust.Shared.Utility; +using Robust.Shared.Audio; using static Content.Shared.Paper.SharedPaperComponent; namespace Content.Server.Paper diff --git a/Content.Shared/Paper/StampComponent.cs b/Content.Shared/Paper/StampComponent.cs index 1c2df18dbb..977540df86 100644 --- a/Content.Shared/Paper/StampComponent.cs +++ b/Content.Shared/Paper/StampComponent.cs @@ -17,6 +17,9 @@ namespace Content.Shared.Paper public string StampState { get; set; } = "paper_stamp-generic"; [DataField("sound")] - public SoundSpecifier? Sound; + public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/Items/Stamp/thick_stamp_sub.ogg") + { + Params = AudioParams.Default.WithVolume(-2f).WithMaxDistance(5f) + }; } } diff --git a/Resources/Audio/Items/Stamp/attributions.yml b/Resources/Audio/Items/Stamp/attributions.yml index be38d4d067..944699e90b 100644 --- a/Resources/Audio/Items/Stamp/attributions.yml +++ b/Resources/Audio/Items/Stamp/attributions.yml @@ -1,9 +1,9 @@ - files: ["thick_stamp_sub.ogg"] license: "CC-BY-4.0" - copyright: "Created by newagesoup. Converted from WAV to OGG." + copyright: "Created by newagesoup. Converted from WAV to OGG by Lomcastar, then to mono by crazybrain23." source: "https://freesound.org/people/newagesoup/sounds/347323/" - + - files: ["automatic_stamp.ogg"] license: "CC-BY-4.0" - copyright: "Created by kermite607. Converted from WAV to OGG." - source: "https://freesound.org/people/kermite607/sounds/362624/" \ No newline at end of file + copyright: "Created by kermite607. Converted from WAV to OGG by Lomcastar, then to mono by crazybrain23." + source: "https://freesound.org/people/kermite607/sounds/362624/" diff --git a/Resources/Audio/Items/Stamp/automatic_stamp.ogg b/Resources/Audio/Items/Stamp/automatic_stamp.ogg index 56c00b9dd7..4e4b85514e 100644 Binary files a/Resources/Audio/Items/Stamp/automatic_stamp.ogg and b/Resources/Audio/Items/Stamp/automatic_stamp.ogg differ diff --git a/Resources/Audio/Items/Stamp/thick_stamp_sub.ogg b/Resources/Audio/Items/Stamp/thick_stamp_sub.ogg index 1257336fe9..9dd2fb1d4b 100644 Binary files a/Resources/Audio/Items/Stamp/thick_stamp_sub.ogg and b/Resources/Audio/Items/Stamp/thick_stamp_sub.ogg differ diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index be7a7c7d7e..b985cb14d9 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -380,25 +380,46 @@ color: "#3f3f3f" - state: folder-base +# Stamps - type: entity - name: mime's rubber stamp + name: generic rubber stamp parent: BaseItem - id: RubberStampMime + id: RubberStampBase description: A rubber stamp for stamping important documents. + abstract: true components: - type: Stamp - stampedName: stamp-component-stamped-name-mime - stampState: "paper_stamp-mime" - sound: /Audio/Items/Stamp/thick_stamp_sub.ogg + stampedName: stamp-component-stamped-name-default + stampState: "paper_stamp-generic" + sound: + path: /Audio/Items/Stamp/thick_stamp_sub.ogg + params: + volume: -2 + maxdistance: 5 - type: Sprite sprite: Objects/Misc/bureaucracy.rsi state: stamp-mime - type: Item size: 3 +- type: entity + name: alternate rubber stamp + parent: RubberStampBase + id: RubberStampBaseAlt + abstract: true + components: + - type: Stamp + stampedName: stamp-component-stamped-name-default + stampState: "paper_stamp-generic" + sound: + path: /Audio/Items/Stamp/automatic_stamp.ogg + params: + volume: -2 + maxdistance: 5 + - type: entity name: captain's rubber stamp - parent: RubberStampMime + parent: RubberStampBase id: RubberStampCaptain components: - type: Stamp @@ -410,7 +431,7 @@ - type: entity name: CentCom rubber stamp - parent: RubberStampMime + parent: RubberStampBase id: RubberStampCentcom components: - type: Stamp @@ -422,7 +443,7 @@ - type: entity name: chaplain's rubber stamp - parent: RubberStampMime + parent: RubberStampBase id: RubberStampChaplain components: - type: Stamp @@ -434,7 +455,7 @@ - type: entity name: clown's rubber stamp - parent: RubberStampMime + parent: RubberStampBase id: RubberStampClown components: - type: Stamp @@ -447,9 +468,21 @@ tags: - ClownRubberStamp +- type: entity + name: chief engineer's rubber stamp + parent: RubberStampBase + id: RubberStampCE + components: + - type: Stamp + stampedName: stamp-component-stamped-name-ce + stampState: "paper_stamp-ce" + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + state: stamp-ce + - type: entity name: chief medical officer's rubber stamp - parent: RubberStampMime + parent: RubberStampBase id: RubberStampCMO components: - type: Stamp @@ -459,35 +492,9 @@ sprite: Objects/Misc/bureaucracy.rsi state: stamp-cmo -- type: entity - name: DENIED rubber stamp - parent: RubberStampMime - id: RubberStampDenied - components: - - type: Stamp - stampedName: stamp-component-stamped-name-denied - stampState: "paper_stamp-deny" - sound: /Audio/Items/Stamp/automatic_stamp.ogg - - type: Sprite - sprite: Objects/Misc/bureaucracy.rsi - state: stamp-deny - -- type: entity - name: APPROVED rubber stamp - parent: RubberStampMime - id: RubberStampApproved - components: - - type: Stamp - stampedName: stamp-component-stamped-name-approved - stampState: "paper_stamp-iaa" - sound: /Audio/Items/Stamp/automatic_stamp.ogg - - type: Sprite - sprite: Objects/Misc/bureaucracy.rsi - state: stamp-iaa - - type: entity name: head of personnel's rubber stamp - parent: RubberStampMime + parent: RubberStampBase id: RubberStampHop components: - type: Stamp @@ -499,7 +506,7 @@ - type: entity name: head of security's rubber stamp - parent: RubberStampMime + parent: RubberStampBase id: RubberStampHos components: - type: Stamp @@ -509,9 +516,22 @@ sprite: Objects/Misc/bureaucracy.rsi state: stamp-hos +- type: entity + name: mime's rubber stamp + parent: RubberStampBase + id: RubberStampMime + components: + - type: Stamp + stampedName: stamp-component-stamped-name-mime + stampState: "paper_stamp-mime" + # TODO remove sound from mime's rubber stamp + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + state: stamp-mime + - type: entity name: quartermaster's rubber stamp - parent: RubberStampMime + parent: RubberStampBase id: RubberStampQm components: - type: Stamp @@ -523,7 +543,7 @@ - type: entity name: research director's rubber stamp - parent: RubberStampMime + parent: RubberStampBase id: RubberStampRd components: - type: Stamp @@ -533,21 +553,9 @@ sprite: Objects/Misc/bureaucracy.rsi state: stamp-rd -- type: entity - name: warden's rubber stamp - parent: RubberStampMime - id: RubberStampWarden - components: - - type: Stamp - stampedName: stamp-component-stamped-name-warden - stampState: "paper_stamp-warden" - - type: Sprite - sprite: Objects/Misc/bureaucracy.rsi - state: stamp-warden - - type: entity name: trader's rubber stamp - parent: RubberStampMime + parent: RubberStampBase id: RubberStampTrader components: - type: Stamp @@ -559,7 +567,7 @@ - type: entity name: syndicate rubber stamp - parent: RubberStampMime + parent: RubberStampBase id: RubberStampSyndicate components: - type: Stamp @@ -570,13 +578,37 @@ state: stamp-syndicate - type: entity - name: chief engineer's rubber stamp - parent: RubberStampMime - id: RubberStampCE + name: warden's rubber stamp + parent: RubberStampBase + id: RubberStampWarden components: - type: Stamp - stampedName: stamp-component-stamped-name-ce - stampState: "paper_stamp-ce" + stampedName: stamp-component-stamped-name-warden + stampState: "paper_stamp-warden" - type: Sprite sprite: Objects/Misc/bureaucracy.rsi - state: stamp-ce + state: stamp-warden + +- type: entity + name: APPROVED rubber stamp + parent: RubberStampBaseAlt + id: RubberStampApproved + components: + - type: Stamp + stampedName: stamp-component-stamped-name-approved + stampState: "paper_stamp-iaa" + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + state: stamp-iaa + +- type: entity + name: DENIED rubber stamp + parent: RubberStampBaseAlt + id: RubberStampDenied + components: + - type: Stamp + stampedName: stamp-component-stamped-name-denied + stampState: "paper_stamp-deny" + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + state: stamp-deny