Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ОБР: Амбер, Гамма #1137

Merged
merged 15 commits into from
Jan 26, 2025
Next Next commit
SunRise ERT (Amber/Red/Gamma)
KaiserMaus committed Jan 18, 2025
commit f985ac58208ec8ba81bc6aa131bb304c46925fd7
Original file line number Diff line number Diff line change
@@ -16,3 +16,5 @@ ent-BoxClusterBangFull = ClusterBangFull box
.desc = WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.
ent-BoxMiniSyringe = Mini-Syringe box
.desc = A box full of MiniSyringe.
BoxErtLeaderKit = ERT Leader Kit
.desc = Base Leader Kit created for centcomm squad members.
Original file line number Diff line number Diff line change
@@ -16,3 +16,5 @@ ent-BoxClusterBangFull = Коробка кластерных светошумо
.desc = ВНИМАНИЕ: Эти устройства крайне опасны и могут вызвать слепоту или глухоту при многократном использовании.
ent-BoxMiniSyringe = Коробка мини-шприцов
.desc = Полная коробка мини-шприцов. Если не полная то кто-то уже забрал.
BoxErtLeaderKit = ERT Leader Kit
.desc = Base Leader Kit created for centcomm squad members.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -138,4 +138,57 @@
- type: Sprite
layers:
- state: box
- state: syringe
- state: syringe

- type: entity
name: ERT Leader kit box
parent: [BoxCardboard, BaseCentcommContraband]
id: BoxErtLeaderKit
description: Base Leader Kit created for centcomm squad members.
components:
- type: Sprite
layers:
- state: internals
- state: id
- type: Storage
grid:
- 0,0,5,2
- type: StorageFill
contents:
- id: PortableSurveillanceCameraMonitorUnpowered
- id: HandheldCriminalRecordsMonitorUnpowered
- id: PinpointerUniversal
- id: PinpointerNuclear
- id: CombatMedipen
- id: AntiPoisonMedipen
- id: FreedomImplant
- id: Implanter
- id: TrackingImplantErt
- id: MagazineMagnum
- id: Telebaton

- type: entity
name: ERT Security kit box
parent: [BoxCardboard, BaseCentcommContraband]
id: BoxErtSecurityKit
description: Base Security Kit created for centcomm squad members.
components:
- type: Sprite
layers:
- state: internals
- state: id
- type: Storage
grid:
- 0,0,5,2
- type: StorageFill
contents:
- id: PowerCellNanoTrasen
- id: PowerCellNanoTrasen
- id: Bloodpack
- id: CombatMedipen
- id: AntiPoisonMedipen
- id: FreedomImplant
- id: Implanter
- id: TrackingImplantErt
- id: FireExtinguisherMini
- id: PinpointerUniversal
14 changes: 14 additions & 0 deletions Resources/Prototypes/_Sunrise/Catalog/Fills/Items/misc.yml
Original file line number Diff line number Diff line change
@@ -32,3 +32,17 @@
containers:
item:
- CombatKnife

- type: entity
id: ClothingBeltSecurityFilledERT
parent: ClothingBeltSecurity
suffix: Filled, ERT
components:
- type: StorageFill
contents:
- id: Stunbaton
- id: Handcuffs
- id: HoloprojectorSecurity
- id: GrenadeFlashBang
- id: TearGasGrenade
- id: Truncheon
Original file line number Diff line number Diff line change
@@ -33,6 +33,28 @@
drawRate: 0
useRate: 20

- type: entity
name: NVD
id: ClothingEyesNVDSec
parent: [ClothingEyesNVD, ShowSecurityIcons]
description: Night vision device. Provides an image of the terrain in low-light conditions.
components:
- type: Item
- type: Sprite
sprite: _Sunrise/Clothing/Eyes/Glasses/nvd.rsi
layers:
- state: icon
- state: icon-unshaded
shader: unshaded
- state: light-overlay
visible: false
shader: unshaded
map: [ "enum.NVDVisuals.Light" ]
- type: NightVisionDevice
isPowered: true
displayColor: "#82eb6c"
displayShader: NVDDisplay

- type: entity
parent: [ClothingEyesNVD, ShowSecurityIcons]
id: ClothingEyesNVDSyndicate
477 changes: 477 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ghost_roles.yml

Large diffs are not rendered by default.

102 changes: 0 additions & 102 deletions Resources/Prototypes/_Sunrise/Entities/Mobs/Player/ussp.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -82,3 +82,22 @@
- type: DroneConsole
components:
- type: PrisonShuttle

- type: entity
parent: [DoorRemoteDefault, BaseCommandContraband]
id: DoorRemoteOmni
name: Omni door remote
suffix: Centcomm
components:
- type: Sprite
layers:
- state: door_remotebase
- state: door_remotelightscolour
color: "#2eba22"
- state: door_remotescreencolour
color: "#22871a"
- type: Access
groups:
- AllAccess
tags:
- CentralCommand
613 changes: 613 additions & 0 deletions Resources/Prototypes/_Sunrise/Roles/Jobs/USSP/ert.yml

Large diffs are not rendered by default.