Skip to content

Commit

Permalink
Centcom intern (#230)
Browse files Browse the repository at this point in the history
* Uh1

* fixbaton
  • Loading branch information
Elst28 committed Aug 24, 2023
1 parent a0d80bd commit 5a0fe0d
Show file tree
Hide file tree
Showing 35 changed files with 313 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ ghost-role-information-death-squad-name = Офицер эскадрона сме
ghost-role-information-death-squad-description = Уничтожьте станцию, любыми доступными вам методами.
ghost-role-information-centcom-official-name = Представитель ЦентКом
ghost-role-information-centcom-official-description = Проинспектируйте станцию, запишите отзывы о работе глав отделов, прослушайте Капитана.
ghost-role-information-centcom-intern-name = Интерн ЦентКома
ghost-role-information-centcom-intern-description = Выполните положенную на вас задачу, и надейтесь что вас наконец-то покормят.
ghost-role-information-centcom-intern-leader-name = Старший Интерн ЦентКома
ghost-role-information-centcom-intern-leader-description = Управляйте интернами, чтобы те выполнили поставленную задачу, и не схватили себе еды.
ghost-role-information-behonker-name = Бехонкер
ghost-role-information-behonker-description = Вы - антагонист, сейте смерть и хонки тем, кто не следует за хонкоматерью.
ghost-role-information-taxibot-name = ТаксиБот
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,7 @@ ent-ClothingBackpackSatchelDrone = { ent-ClothingBackpackSatchel }
.suffix = { "" }
ent-ClothingBackpackSatchelCentcomFilled = { ent-ClothingBackpackSatchelCentcom }
.desc = { ent-ClothingBackpackSatchelCentcom.desc }
.suffix = { "" }
.suffix = { "" }
ent-ClothingBackpackSatchelCentcomInternFilled = { ent-ClothingBackpackSatchelCentcom }
.desc = { ent-ClothingBackpackSatchelCentcom.desc }
.suffix = { "" }
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ ent-ClothingHeadHatCardborg = шлем картонного борга
ent-ClothingHeadHatCentcom = фирменная шапка Центком
.desc = Хорошо быть императором.
.suffix = { "" }
ent-ClothingHeadHatCentcomintern = кепка интерна ЦентКома
.desc = Престижкая кепка которая предназначена для тех кто заслужил поесть.
.suffix = { "" }
ent-ClothingHeadHatCentcomcap = фуражка ЦентКома
.desc = Хорошо быть адмиралом.
.suffix = { "" }
ent-ClothingHeadHatChef = поварской колпак
.desc = Это колпак, который повара используют чтобы волосы не попадали в еду. Судя по еде они не работают.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ ent-ClothingUniformJumpsuitCentcomOfficial = костюм офицера Цен
ent-ClothingUniformJumpsuitCentcomOfficer = водолазка Центком
.desc = Повседневная, но элегантная водолазка зеленого цвета, используемая офицерами Центком. От неё веет алоэ.
.suffix = { "" }
ent-ClothingUniformJumpsuitCentcomIntern = комбинезон интерна ЦентКома
.desc = От него веет голодом.
.suffix = { "" }
ent-ClothingUniformJumpsuitChef = униформа шеф-повара
.desc = Без этого нельзя готовить.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ ent-RandomHumanoidSpawnerDeathSquadOfficer = офицер эскадрона с
ent-RandomHumanoidSpawnerCentcomOfficial = представитель ЦентКом
.desc = { "" }
.suffix = { "" }
ent-RandomHumanoidSpawnerCentcomIntern = интерн ЦентКома
.desc = { "" }
.suffix = { "" }
ent-RandomHumanoidSpawnerCentcomInternLeader = старший интерн ЦентКома
.desc = { "" }
.suffix = { "" }
ent-RandomHumanoidSpawnerSyndicateAgent = Агент Синдиката
.desc = { "" }
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ ent-SecurityPDA = КПК офицера СБ
ent-CentcomPDA = КПК Центком
.desc = Светло-зелёный знак ходячей бюрократии.
.suffix = { "" }
ent-CentcomInternPDA = КПК интерна ЦентКома
.desc = Очень вкусного цвета.
.suffix = { "" }
ent-CentcomPDAFake = { ent-CentcomPDA }
.suffix = Фальшивый
.desc = { ent-CentcomPDA.desc }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ ent-ERTLeaderIDCard = ID карта ОБР
ent-CentcomIDCardSyndie = ID карта представителя ЦентКом
.desc = { ent-IDCardStandard.desc }
.suffix = Фальшивая
ent-CentcomInternIDCard = ID карта интерна ЦентКома
.desc = { ent-IDCardStandard.desc }
.suffix = { "" }
ent-MusicianIDCard = ID карта музыканта
.desc = { ent-IDCardStandard.desc }
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ ent-TelescopicBaton = телескопическая дубинка
ent-Truncheon = дубинка с шипами
.desc = Жёсткая дубинка со стальными шипами, предназначена для нанесения вреда.
.suffix = { "" }
ent-Baton = дубинка
.desc = Обычная дубинка, с ней вы сможете вечно бить клоуна.
.suffix = { "" }
ent-Flash = вспышка
.desc = Сверхъяркая лампочка с кнопкой включения, вызывает оцепенение и кратковременную потерю зрения. Бесполезна, когда перегорает.
.suffix = { "" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,19 @@
- id: Paper
amount: 4

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelCentcom
id: ClothingBackpackSatchelCentcomInternFilled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: WeaponSniperMosin
- id: SpeedLoaderLightRifle
- id: MagazineBoxLightRifle
- id: Handcuffs

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelEngineering
Expand Down
22 changes: 22 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,28 @@
- type: Clothing
sprite: Clothing/Head/Hats/centcom.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCentcomcap
name: CentCom brand hat
description: "Good centcom cap"
components:
- type: Sprite
sprite: Clothing/Head/Hats/centcomcap.rsi
- type: Clothing
sprite: Clothing/Head/Hats/centcomcap.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatCentcomintern
name: CentCom brand hat
description: "It's bad to be an intern."
components:
- type: Sprite
sprite: Clothing/Head/Hats/centcominterncap.rsi
- type: Clothing
sprite: Clothing/Head/Hats/centcominterncap.rsi

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatChef
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,17 @@
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitCentcomIntern
name: CentCom intern jumpsuit
description: It's a jumpsuit worn by CentCom's intern.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/centcom_intern.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/centcom_intern.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitChef
Expand Down
44 changes: 44 additions & 0 deletions Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,50 @@
- type: Loadout
prototypes: [ CentcomGear ]

## Central Command Interns

- type: entity
id: RandomHumanoidSpawnerCentcomIntern
name: Centcom Intert
components:
- type: Sprite
netsync: false
sprite: Markers/jobs.rsi
state: centcom
- type: RandomHumanoidSpawner
settings: CentcomIntern

- type: randomHumanoidSettings
id: CentcomIntern
components:
- type: Loadout
prototypes: [ CentcomInternGear ]
- type: GhostRole
name: ghost-role-information-centcom-intern-name
description: ghost-role-information-centcom-intern-description
- type: GhostTakeoverAvailable

- type: entity
id: RandomHumanoidSpawnerCentcomInternLeader
name: Centcom Intert Leader
components:
- type: Sprite
netsync: false
sprite: Markers/jobs.rsi
state: centcom
- type: RandomHumanoidSpawner
settings: CentcomInternLeader

- type: randomHumanoidSettings
id: CentcomInternLeader
components:
- type: Loadout
prototypes: [ CentcomInternLeaderGear ]
- type: GhostRole
name: ghost-role-information-centcom-intern-leader-name
description: ghost-role-information-centcom-intern-leader-description
- type: GhostTakeoverAvailable

## Syndicate

- type: entity
Expand Down
20 changes: 20 additions & 0 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -656,6 +656,26 @@
- type: Icon
state: pda-centcom

- type: entity
parent: BasePDA
id: CentcomInternPDA
name: CentCom Intern PDA
description: Light green sign of walking bureaucracy.
components:
- type: Pda
id: CentcomInternIDCard
state: pda-centcom
penSlot:
startingItem: PenCentcom
priority: -1
whitelist:
tags:
- Write
- type: PdaBorderColor
borderColor: "#00b62e"
- type: Icon
state: pda-centcom

- type: entity
parent: CentcomPDA
id: CentcomPDAFake
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,23 @@
groups:
- AllAccess

- type: entity
parent: IDCardStandard
id: CentcomInternIDCard
name: centcom intern ID card
components:
- type: Sprite
layers:
- state: centcom
- state: idpassenger
- type: Item
heldPrefix: blue
- type: IdCard
jobTitle: Centcom Intern
- type: Access
groups:
- AllAccess

- type: entity
parent: IDCardStandard
id: MusicianIDCard
Expand Down
29 changes: 29 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,35 @@
guides:
- Security

- type: entity
name: baton
parent: BaseItem
id: Baton
description: A rigid, steel-studded baton, meant to harm.
components:
- type: Sprite
sprite: Objects/Weapons/Melee/baton.rsi
state: icon
- type: MeleeWeapon
damage:
types:
Blunt: 5
bluntStaminaDamageFactor: 2.0
- type: StaminaDamageOnHit
damage: 18
- type: Item
size: 20
- type: Clothing
sprite: Objects/Weapons/Melee/baton.rsi
quickEquip: false
slots:
- Belt
- type: DisarmMalus
malus: 0.225
- type: Appearance
- type: StaticPrice
price: 100

- type: entity
name: flash
parent: BaseItem
Expand Down
25 changes: 25 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,31 @@
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled

#CentCom Interns
- type: startingGear
id: CentcomInternGear
equipment:
jumpsuit: ClothingUniformJumpsuitCentcomIntern
back: ClothingBackpackSatchelCentcomInternFilled
eyes: ClothingEyesGlassesSunglasses
ears: ClothingHeadsetAltCentCom
shoes: ClothingShoesColorBlack
id: CentcomInternPDA
belt: Baton

- type: startingGear
id: CentcomInternLeaderGear
equipment:
head: ClothingHeadHatCentcomintern
jumpsuit: ClothingUniformJumpsuitCentcomIntern
back: ClothingBackpackSatchelCentcomInternFilled
eyes: ClothingEyesGlassesSunglasses
ears: ClothingHeadsetAltCentCom
outerClothing: ClothingOuterArmorBasicSlim
shoes: ClothingShoesColorBlack
id: CentcomInternPDA
belt: Stunbaton

#Deathsquad Outfit
- type: startingGear
id: DeathSquadGear
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions Resources/Textures/Clothing/Head/Hats/centcomcap.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/63029",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET-hamster",
"directions": 4
},
{
"name": "equipped-HELMET",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/63029",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5a0fe0d

Please sign in to comment.