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

Salvage update & maps changes #2738

Merged
merged 10 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-SalvageShuttleConsoleCircuitboard = консоль управления утилизаторским шаттлом (консольная плата)
.desc = Консольная плата для консоли управления утилизаторским шаттлом.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-ComputerShuttleSalvage = консоль управления утилизаторским шаттлом
.desc = Используется для пилотирования утилизаторского шаттла.
2,774 changes: 280 additions & 2,494 deletions Resources/Maps/Shuttles/corvax_mining.yml

Large diffs are not rendered by default.

7,407 changes: 1,278 additions & 6,129 deletions Resources/Maps/corvax_astra.yml

Large diffs are not rendered by default.

4,627 changes: 948 additions & 3,679 deletions Resources/Maps/corvax_avrite.yml

Large diffs are not rendered by default.

9,647 changes: 1,073 additions & 8,574 deletions Resources/Maps/corvax_awesome.yml

Large diffs are not rendered by default.

2,543 changes: 54 additions & 2,489 deletions Resources/Maps/corvax_delta.yml

Large diffs are not rendered by default.

7,032 changes: 1,548 additions & 5,484 deletions Resources/Maps/corvax_maus.yml

Large diffs are not rendered by default.

12,021 changes: 2,812 additions & 9,209 deletions Resources/Maps/corvax_paper.yml

Large diffs are not rendered by default.

8,835 changes: 2,961 additions & 5,874 deletions Resources/Maps/corvax_pearl.yml

Large diffs are not rendered by default.

6,135 changes: 1,639 additions & 4,496 deletions Resources/Maps/corvax_pilgrim.yml

Large diffs are not rendered by default.

58,604 changes: 23,081 additions & 35,523 deletions Resources/Maps/corvax_silly.yml

Large diffs are not rendered by default.

6,947 changes: 1,180 additions & 5,767 deletions Resources/Maps/corvax_tushkan.yml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
- type: entity
parent: BaseComputerCircuitboard
id: SalvageShuttleConsoleCircuitboard
Ko4ergaPunk marked this conversation as resolved.
Show resolved Hide resolved
name: salvage shuttle console board
description: A computer printed circuit board for a salvage shuttle console.
components:
- type: ComputerBoard
prototype: ComputerShuttleSalvage
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,31 @@
path: /Audio/Corvax/Announcements/centcomm.ogg
params:
volume: -4

- type: entity
parent: BaseComputerShuttle
id: ComputerShuttleSalvage
name: salvage shuttle console
description: Used to pilot the salvage shuttle.
components:
- type: Sprite
layers:
- map: ["computerLayerBody"]
state: computer
- map: ["computerLayerKeyboard"]
state: generic_keyboard
- map: ["computerLayerScreen"]
state: shuttle
- map: ["computerLayerKeys"]
state: generic_keys
- type: DroneConsole
components:
- type: SalvageShuttle
- type: RadarConsole
maxRange: 256
- type: PointLight
radius: 1.5
energy: 1.6
color: "#c94242"
- type: Computer
board: SalvageShuttleConsoleCircuitboard
5 changes: 5 additions & 0 deletions Resources/Prototypes/Entities/Stations/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@
inherent: true
protos:
- VGRoid
# Corvax-start
mining: !type:GridSpawnGroup
paths:
- /Maps/Shuttles/corvax_mining.yml
# Corvax-end

- type: entity
id: BaseStationCentcomm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github). 'court', 'janitor', 'law' & 'psychology' changed for corvax by netwy (discord, 583844759429316618) and updated by github:lapatison; Job signs localized by kaiserGans (github), 'direction_atmos' made by SlamBamActionman. voxcross taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi",
"copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github). 'court', 'janitor', 'law' & 'psychology' changed for corvax by netwy (discord, 583844759429316618) and updated by github:lapatison; Job signs localized by kaiserGans (github), 'direction_atmos' made by SlamBamActionman. voxcross taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'ntmining' modified by Ko4erga",
"states": [
{
"name": "ai"
Expand Down
Binary file modified Resources/Textures/Structures/Wallmounts/signs.rsi/ntmining.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Resources/migration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -425,9 +425,9 @@ ClothingBeltSuspenders: ClothingBeltSuspendersRed
ClothingNeckShockCollar: ClothingBackpackElectropack

# 2024-08-22
ComputerShuttleSalvage: null
SalvageShuttleConsoleCircuitboard: null
SalvageShuttleCircuitboardStealObjective: null
# ComputerShuttleSalvage: null # Corvax reverted
# SalvageShuttleConsoleCircuitboard: null
# SalvageShuttleCircuitboardStealObjective: null

# 2024-08-28
ClothingBackpackDuffelSyndicateCostumeCentcom: null
Expand Down
Loading