diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 8b269ad83a..a280d51072 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -24,10 +24,10 @@ - id: WeaponShotgunDoubleBarreled - id: BoxShotgunFlare amount: 2 + - id: GrenadeFlashBang + amount: 2 - id: PillRomerol amount: 5 - - id: GrenadeFlash - amount: 2 - type: entity parent: ClothingBackpackDuffelSyndicateMedical diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index d2054848d5..adc8dbb7d4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -634,13 +634,28 @@ state: pda-syndi - type: entity - parent: HoSPDA + parent: BasePDA id: ERTLeaderPDA name: ERT PDA description: Red for firepower. components: - type: PDA id: ERTLeaderIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-ert + - type: Icon + state: pda-ert + +- type: entity + parent: ERTLeaderPDA + id: CBURNPDA + name: CBURN PDA + description: Smells like rotten flesh. + components: + - type: PDA + id: CBURNIDcard - type: entity parent: BasePDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 4f3dbf6051..4283006322 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -536,3 +536,16 @@ - state: default - type: PresetIdCard job: Detective + +- type: entity + parent: CentcomIDCard + id: CBURNIDcard + name: CBURN ID card + components: + - type: Sprite + layers: + - state: gold + - state: idcentcom + - type: Item + heldPrefix: gold + diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 0ef41427e6..5e0b43005d 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -162,11 +162,11 @@ back: ClothingBackpackDuffelCBURN mask: ClothingMaskGas eyes: ClothingEyesGlassesSecurity - ears: ClothingHeadsetService + ears: ClothingHeadsetAltCommand gloves: ClothingHandsGlovesFingerless outerClothing: ClothingOuterHardsuitCBURN shoes: ClothingShoesBootsJack - id: CentcomPDA + id: CBURNPDA pocket1: CombatKnife pocket2: WeaponLaserGun suitstorage: YellowOxygenTankFilled diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index 6837ed5f77..ee383c3248 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -162,6 +162,9 @@ }, { "name": "pda-interntech" + }, + { + "name": "pda-ert" } ] } diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-ert.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-ert.png new file mode 100644 index 0000000000..4ac6961ee6 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-ert.png differ