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

Перенос Drones & SpaceSEC #200

Merged
merged 35 commits into from
Aug 17, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e86db86
Дроны-антагонисты (ПОМОГИТЕ УМОЛЯЮ)
jungarikjan Mar 25, 2024
af8325e
Фикс спрайтов дронов (всё ещё не то, что нужно)
jungarikjan Mar 26, 2024
49b0dd8
ТРЕТЬЯ ПОПЫТКА ДРОНЫ-АНТАГИ (БЕЗУСПЕШНО)
jungarikjan Mar 30, 2024
04d6604
Исправление ошибок, успех
jungarikjan Apr 3, 2024
962a8a2
Спавнер дрона-антага КПБ
jungarikjan Apr 4, 2024
4392888
Фикс канала связи дронов-антагов
jungarikjan Apr 6, 2024
9977da6
Fix YAML Validator
Schrodinger71 Apr 6, 2024
e814911
Фикс цен у дронов
Schrodinger71 Apr 6, 2024
5a40f1d
Ставим пробную цену КПБ антагу
Schrodinger71 Apr 6, 2024
75ab831
Update DroneAntag.yml
Schrodinger71 Apr 6, 2024
0b4ed5c
Update DroneAntag_IPC.yml
Schrodinger71 Apr 6, 2024
6629bae
fix drones
Lonkuk Aug 7, 2024
0c94de1
fix drones x2
Lonkuk Aug 7, 2024
9d92f2e
fix drones x3
Lonkuk Aug 7, 2024
ddaf457
ЗАКАЗ SPACE SEC от ilja🤠 (#755)
Lonkuk Jul 3, 2024
0cdc61c
fix humanoid.yml bug?
Lonkuk Aug 7, 2024
d9c4b70
update humanoid.yml
Lonkuk Aug 7, 2024
5fb2722
fix humanoid.yml part 1
Lonkuk Aug 8, 2024
0d9f3c7
fix humanuid.yml part 2
Lonkuk Aug 8, 2024
c7f1954
Merge branch 'master' into Drone
Lonkuk Aug 8, 2024
019bd98
fix locale/path/duplicates
Lonkuk Aug 8, 2024
bd5eddd
fix SpaceSec
Lonkuk Aug 8, 2024
f466d4a
fix SpaceSec x2
Lonkuk Aug 8, 2024
fac18b8
fix SpaceSec x3
Lonkuk Aug 8, 2024
288d9b8
fix StacitPrice
Lonkuk Aug 8, 2024
37f7a23
Merge branch 'AdventureTimeSS14:master' into Drone
Lonkuk Aug 8, 2024
5822910
review fixes
Lonkuk Aug 10, 2024
88e810c
Merge branch 'Drone' of https://github.com/Lonkuk/space_station_ADT i…
Lonkuk Aug 10, 2024
e4080d2
Merge branch 'master' into Drone
Lonkuk Aug 10, 2024
e196295
Merge branch 'AdventureTimeSS14:master' into Drone
Lonkuk Aug 13, 2024
1c49d57
stepka fixes
Lonkuk Aug 14, 2024
b01ce32
Merge branch 'AdventureTimeSS14:master' into Drone
Lonkuk Aug 14, 2024
5b9b777
try fix tests
Lonkuk Aug 14, 2024
c42abf0
Merge branch 'Drone' of https://github.com/Lonkuk/space_station_ADT i…
Lonkuk Aug 14, 2024
b604abf
помогаем незеру
Darkiich Aug 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
735 changes: 735 additions & 0 deletions Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag.yml

Large diffs are not rendered by default.

86 changes: 86 additions & 0 deletions Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Body.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
- type: body
id: ADTDroneAntagBodyMiner
name: Antag Drone Body Miner
root: head
slots:
head:
part: LightHeadBorg
connections:
- hand 1
- hand 2
- hand 3
- hand 4
- hand 5
# - hand 6
hand 1:
part: LeftArmBorg
hand 2:
part: LeftArmBorg
hand 3:
part: LeftArmBorg
hand 4:
part: RightArmBorg
hand 5:
part: RightArmBorg
# hand 6:
# part: RightArmBorg

- type: body
id: ADTDroneAntagBodyEngineer
name: Antag Drone Body Engineer
root: head
slots:
head:
part: LightHeadBorg
connections:
- hand 1
- hand 2
- hand 3
- hand 4
- hand 5
- hand 6
- hand 7
- hand 8
hand 1:
part: LeftArmBorg
hand 2:
part: LeftArmBorg
hand 3:
part: LeftArmBorg
hand 4:
part: RightArmBorg
hand 5:
part: RightArmBorg
hand 6:
part: RightArmBorg
hand 7:
part: RightArmBorg
hand 8:
part: RightArmBorg

- type: body
id: ADTDroneAntagBodyCharger
name: Antag Drone Body Charger
root: head
slots:
head:
part: LightHeadBorg
connections:
- hand 1
- hand 2
- hand 3
- hand 4
# - hand 5
# - hand 6
hand 1:
part: LeftArmBorg
hand 2:
part: LeftArmBorg
hand 3:
part: LeftArmBorg
hand 4:
part: RightArmBorg
# hand 5:
# part: RightArmBorg
# hand 6:
# part: RightArmBorg
74 changes: 74 additions & 0 deletions Resources/Prototypes/ADT/Drones/Drone-Antags/DroneAntag_Core.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# core basic

- type: entity
id: ADTDroneAntagCoreBasic
parent: BaseItem
name: basic drone core
description: Это ядро продвинутого дрона. Лучше вернуть это Space SEC.
components:
- type: Sprite
sprite: ADT/Mobs/Silicon/AntagDrones/drone-core-basic.rsi
state: drone-core-basic
- type: StaticPrice
price: 1250
- type: PointLight
radius: 1.5
energy: 3
color: "#cc5500"

# core advanced

- type: entity
id: ADTDroneAntagCoreAdvanced
parent: BaseItem
name: advanced drone core
description: Это ядро продвинутого дрона. Лучше вернуть это Space SEC.
components:
- type: Sprite
sprite: ADT/Mobs/Silicon/AntagDrones/drone-core-advanced.rsi
state: drone-core-advanced
- type: StaticPrice
price: 2500
- type: PointLight
radius: 1.5
energy: 3
color: "#9ad67a"

# core elite

- type: entity
id: ADTDroneAntagCoreElite
parent: BaseItem
name: elite drone core
description: Это ядро продвинутого дрона. Лучше вернуть это Space SEC.
components:
- type: Sprite
sprite: ADT/Mobs/Silicon/AntagDrones/drone-core-elite.rsi
state: drone-core-elite
- type: StaticPrice
price: 5000
- type: PointLight
radius: 1.5
energy: 3
color: "#b93fc4"
# ff517a

# core command

- type: entity
id: ADTDroneAntagCoreCommand
parent: BaseItem
name: command drone core
description: Это ядро продвинутого дрона. Лучше вернуть это Space SEC.
components:
- type: Sprite
sprite: ADT/Mobs/Silicon/AntagDrones/drone-core-command.rsi
state: drone-core-command
- type: StaticPrice
price: 7500
- type: PointLight
radius: 1.5
energy: 3
color: "#2f8bd6"

# c351ff
Loading
Loading