* add headset component

* add basic headset logic

* fix formatting in listening component, add dependency to headset

* test function for headset

* implement headset as listener

* ANNIHILATES ListeningComponent, refactor of radio/listener sys

* basic headset functionality

* rename RadioComponent to HandheldRadioComponent

* change channel to list of channels

* basic headset implementation complete

* message now always excludes ';'

* add radio color; state channel freq. and source name

* undocumented game breaking bug commit (DO NOT RESEARCH)
actually just changes frequency from 1457 (what signalers are set to by default) to 1459, the actual frequency for common

* Add more sprites

* Reorganizes

* Added job headsets

* Adds headset as an ignored component

* Jobs now spawn with headsets

* remove system.tracing

* Catchup commits

* Add headset property serialization

* Turn GetChannels into a property

* ListenRange property and serializatioon

* Adjust interfaces

* Address reviews

* Cleanup

* Address reviews

* Update rsi

* Fix licenses and copyright

* Fix missing textures

* Merge fixes

* Move headset textures from objects/devices to clothing/ears

* Fix rsi state names and add equipped states

* Fix headsets not working

* Add missing brackets to channel number in chat

* heck

* Fix broken rsi

* Fix radio id and names

* Put quotes around headset messages

* Fix method names

* Fix handheld radios

* Fix capitalization when using radio channels and trim

* Remove unnecessary dependency

* Indent that

* Separate this part

* Goodbye icons

* Implement IActivate in HandheldRadioComponent

* Add examine tooltip to radios and headsets

* Rename IListen methods

Co-authored-by: Bright <nsmoak10@yahoo.com>
Co-authored-by: Swept <jamesurquhartwebb@gmail.com>
Co-authored-by: Bright0 <55061890+Bright0@users.noreply.github.com>
This commit is contained in:
DrSmugleaf
2020-10-07 14:02:12 +02:00
committed by GitHub
parent 20eac0de84
commit a984076574
104 changed files with 1313 additions and 172 deletions

View File

@@ -1,14 +0,0 @@
- type: entity
parent: Clothing
id: RadioHeadsetEars
name: headset radio
description: The radio to keep up to date in real time with fun onboard station activities
components:
- type: Sprite
sprite: Clothing/Earpieces/headset.rsi
state: headset
- type: Clothing
Slots:
- ears
sprite: Clothing/Earpieces/headset.rsi

View File

@@ -0,0 +1,123 @@
- type: entity
parent: Clothing
id: HeadsetBase
name: headset
abstract: true
description: An updated, modular intercom that fits over the head. Takes encryption keys.
components:
- type: Headset
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/base.rsi
- type: entity
parent: HeadsetBase
id: HeadsetCargo
name: cargo headset
description: A headset used by the QM and his slaves.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/cargo.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetCentCom
name: centcomm headset
description: A headset used by the upper echelons of Nanotrasen.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/centcom.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetCommand
name: command headset
description: A headset with a commanding channel.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/command.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetEngineering
name: engineering headset
description: When the engineers wish to chat like girls.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/engineering.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetMedical
name: medical headset
description: A headset for the trained staff of the medbay.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/medical.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetMedicalScience
name: medical research headset
description: A headset that is a result of the mating between medical and science.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/medicalscience.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetMining
name: mining headset
description: Headset used by shaft miners.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/mining.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetRobotics
name: robotics headset
description: Made specifically for the roboticists, who cannot decide between departments.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/robotics.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetScience
name: science headset
description: A sciency headset. Like usual.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/science.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetSecurity
name: security headset
description: This is used by your elite security force.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/security.rsi
state: icon
- type: entity
parent: HeadsetBase
id: HeadsetService
name: service headset
description: Headset used by the service staff, tasked with keeping the station full, happy and clean.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/service.rsi
state: icon

View File

@@ -0,0 +1,88 @@
- type: entity
parent: Clothing
id: HeadsetBaseAlt
name: headset
abstract: true
description: An updated, modular intercom that fits over the head. Takes encryption keys.
components:
- type: Headset
- type: entity
parent: HeadsetBaseAlt
id: HeadsetCargoAlt
name: cargo overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/cargo.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/cargo.rsi
- type: entity
parent: HeadsetBaseAlt
id: HeadsetCommandAlt
name: command overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/command.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/command.rsi
- type: entity
parent: HeadsetBaseAlt
id: HeadsetEngineeringAlt
name: engineering overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/engineering.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/engineering.rsi
- type: entity
parent: HeadsetBaseAlt
id: HeadsetMedicalAlt
name: medical overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/medical.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/medical.rsi
- type: entity
parent: HeadsetBaseAlt
id: HeadsetSecurityAlt
name: security overear-headset
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/security.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/security.rsi
- type: entity
parent: HeadsetBaseAlt
id: HeadsetSyndicateAlt
name: syndicate overear-headset
description: A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs.
components:
- type: Sprite
sprite: Clothing/Ears/Headsets/syndicate.rsi
state: icon_alt
- type: Clothing
Slots:
- ears
sprite: Clothing/Ears/Headsets/syndicate.rsi

View File

@@ -1,16 +1,19 @@
- type: entity
name: "baseradio"
name: radio
parent: BaseItem
id: BaseRadio
id: RadioBase
abstract: true
- type: entity
name: "Handheld Radio"
name: handheld radio
description: A handy handheld radio.
parent: BaseRadio
id: handrad
parent: RadioBase
id: RadioHandheld
components:
- type: Sprite
texture: Objects/Devices/radio.png
- type: Listening
- type: Radio
- type: Sprite
sprite: Objects/Devices/communication.rsi
state: walkietalkie
- type: Icon
sprite: Objects/Devices/communication.rsi
state: walkietalkie

View File

@@ -18,3 +18,4 @@
backpack: BackpackClothingFilled
shoes: ShoesBlack
idcard: CargoPDA
ears: HeadsetCargo

View File

@@ -16,3 +16,4 @@
backpack: BackpackClothingFilled
shoes: ShoesBlack
idcard: AssistantPDA
ears: HeadsetService

View File

@@ -18,3 +18,4 @@
backpack: BackpackClothingFilled
shoes: ShoesBlack
idcard: BartenderPDA
ears: HeadsetService

View File

@@ -17,3 +17,4 @@
backpack: BackpackClothingFilled
shoes: ShoesBlack
idcard: ChefPDA
ears: HeadsetService

View File

@@ -20,3 +20,4 @@
mask: MaskClown
pocket1: BikeHorn
idcard: ClownPDA
ears: HeadsetService

View File

@@ -18,3 +18,4 @@
shoes: ShoesGaloshes
head: HatPurplesoft
idcard: JanitorPDA
ears: HeadsetService

View File

@@ -23,3 +23,4 @@
pocket2: Paper
mask: MaskMime
idcard: MimePDA
ears: HeadsetService

View File

@@ -35,3 +35,4 @@
gloves: GlovesCaptain
outerclothing: OuterclothingCaparmor
idcard: CaptainPDA
ears: HeadsetCommand

View File

@@ -27,3 +27,4 @@
shoes: ShoesBrown
head: HatHopcap
idcard: HoPPDA
ears: HeadsetCommand

View File

@@ -23,3 +23,4 @@
shoes: ShoesBrown
idcard: CEPDA
belt: UtilityBeltClothingFilled
ears: HeadsetEngineeringAlt

View File

@@ -21,3 +21,4 @@
outerclothing: OuterclothingHazard
idcard: EngineerPDA
belt: UtilityBeltClothingFilled
ears: HeadsetEngineering

View File

@@ -23,3 +23,4 @@
shoes: ShoesBrown
outerclothing: OuterclothingLabcoatcmo
idcard: CMOPDA
ears: HeadsetMedicalAlt

View File

@@ -19,3 +19,4 @@
shoes: ShoesWhite
outerclothing: OuterclothingLabcoatmedspecopen
idcard: MedicalPDA
ears: HeadsetMedical

View File

@@ -22,3 +22,4 @@
shoes: ShoesBrown
outerclothing: OuterclothingLabcoatopen
idcard: RnDPDA
ears: HeadsetScienceAlt

View File

@@ -19,3 +19,4 @@
shoes: ShoesWhite
outerclothing: OuterclothingLabcoat
idcard: SciencePDA
ears: HeadsetScience

View File

@@ -24,3 +24,4 @@
eyes: SecGlasses
head: HatBeretHoS
idcard: HoSPDA
ears: HeadsetSecurityAlt

View File

@@ -21,3 +21,4 @@
eyes: SecGlasses
outerclothing: OuterclothingArmorVest
idcard: SecurityPDA
ears: HeadsetSecurity