diff --git a/Resources/Audio/RadioStation/ads/IdrisRadioAd.ogg b/Resources/Audio/RadioStation/ads/IdrisRadioAd.ogg new file mode 100644 index 00000000000..9c43d73af4d Binary files /dev/null and b/Resources/Audio/RadioStation/ads/IdrisRadioAd.ogg differ diff --git a/Resources/Audio/RadioStation/ads/attributions.yml b/Resources/Audio/RadioStation/ads/attributions.yml new file mode 100644 index 00000000000..6b9fbb03e70 --- /dev/null +++ b/Resources/Audio/RadioStation/ads/attributions.yml @@ -0,0 +1,4 @@ +- files: ["IdrisRadioAd.ogg"] + license: "CC-BY-ND-4.0" + copyright: "Made by Jam" + source: "Original work by Jamandbutter0" diff --git a/Resources/Audio/_Goobstation/RadioStation/ads/attributions.yml b/Resources/Audio/_Goobstation/RadioStation/ads/attributions.yml index 954df700506..6e206ebc8cc 100644 --- a/Resources/Audio/_Goobstation/RadioStation/ads/attributions.yml +++ b/Resources/Audio/_Goobstation/RadioStation/ads/attributions.yml @@ -5,4 +5,4 @@ - files: ["Syndicate.ogg", "Capstien.ogg", "JNE.ogg", "NextUp.ogg", "Ninja.ogg", "Number.ogg"] license: "CC-BY-ND-4.0" copyright: "Recorded by Jvne" - source: "https://juneialduncan21@gmail.com" \ No newline at end of file + source: "https://juneialduncan21@gmail.com" diff --git a/Resources/Prototypes/Entities/Objects/Fun/cds.yml b/Resources/Prototypes/Entities/Objects/Fun/cds.yml new file mode 100644 index 00000000000..a550a63f5fa --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/cds.yml @@ -0,0 +1,41 @@ +- type: entity + name: cd disk + description: A cd disk, usually contains ads. + id: BaseCdDisk + parent: BaseItem + abstract: true + components: + - type: Vinyl + - type: Sprite + sprite: _Goobstation/Objects/Misc/RadioStation/cds.rsi + state: icon + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 12 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Item + size: Tiny + - type: Tag + tags: + - CD + + +- type: entity + parent: BaseCdDisk + name: cd disk (Idris) + id: CdDiskIdris + components: + - type: Vinyl + song: + path: /Audio/RadioStation/ads/IdrisRadioAd.ogg + diff --git a/Resources/Prototypes/_Goobstation/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/_Goobstation/Catalog/Fills/Crates/service.yml index 2284e3ac2e9..0458c3d046c 100644 --- a/Resources/Prototypes/_Goobstation/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/_Goobstation/Catalog/Fills/Crates/service.yml @@ -135,7 +135,10 @@ weight: 0.1 - id: CdDiskXgOnboarding4 weight: 0.1 - +# Omu only + - id: CdDiskIdris + weight: 1 + - type: entityTable id: RandomVinylDisk table: !type:GroupSelector