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.

Sign up for GitHub

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

Map update and med #77

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Map update and med #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions Content.Client/_Starlight/Medical/Surgery/CustomLimbVisualizerSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,15 @@ private void OnChanged(Entity<CustomLimbVisualizerComponent> ent, bool repeat =
offset = new Vector2(0, -0.34375f);
break;
}
var index = sprite.LayerMapReserveBlank($"custom-{item.Key}");
if (layerSprite?.BaseRSI?.TryGetState(state, out var rsiState) ?? false)
{
var index = sprite.LayerMapReserveBlank($"custom-{item.Key}");

sprite.LayerSetState(index, state, layerSprite.BaseRSI);
sprite.LayerSetOffset(index, offset);
sprite.LayerSetVisible(index, true);
ent.Comp.CachedLayers.Add(item.Key);
sprite.LayerSetState(index, rsiState.StateId, layerSprite.BaseRSI);
sprite.LayerSetOffset(index, offset);
sprite.LayerSetVisible(index, true);
ent.Comp.CachedLayers.Add(item.Key);
}

//if (ent.Comp.Displacements.TryGetValue(item.Key, out var displacementData) && !ent.Comp.CachedLayers.Contains($"{item.Key}-displacement"))
//{
Expand Down
6 changes: 3 additions & 3 deletions Content.Server/build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"engine_version": "237.1.0",
"fork_id": "Starlight",
"version": "1731918521",
"hash": "80DAB8C2692A130CC613A896EC1C942B344DAAEEBD483FA0D2CDA8B6C3F5F3DE",
"download": "http://193.33.195.164/builds/1731918521/SS14.Client.zip"
"version": "1732131340",
"hash": "6F1003C28A8F84306ABD1ABCDA61E9572C86C5ECAE83268314F1573FBCD30A11",
"download": "https://ss14-starlight.online/builds/1732131340/SS14.Client.zip"
}
4 changes: 3 additions & 1 deletion Resources/Locale/en-US/_Starlight/store/categories.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
store-category-plushies = Plushies
store-category-plushie-species = Species

store-category-medical-chemistry = Chemistry
store-category-medical-chemistry = Chemistry
store-category-medical-medical = Medical
store-category-medical-surgery = Surgery
174,522 changes: 174,522 additions & 0 deletions Resources/Maps/_Starlight/Box.yml
View file
Open in desktop

Large diffs are not rendered by default.

203,509 changes: 203,509 additions & 0 deletions Resources/Maps/_Starlight/Cog.yml
View file
Open in desktop

Large diffs are not rendered by default.

226,923 changes: 226,923 additions & 0 deletions Resources/Maps/_Starlight/Fland.yml
View file
Open in desktop

Large diffs are not rendered by default.

142,688 changes: 142,688 additions & 0 deletions Resources/Maps/_Starlight/Marathon.yml
View file
Open in desktop

Large diffs are not rendered by default.

169,194 changes: 169,194 additions & 0 deletions Resources/Maps/_Starlight/Meta.yml
View file
Open in desktop

Large diffs are not rendered by default.

190,482 changes: 190,482 additions & 0 deletions Resources/Maps/_Starlight/Oasis.yml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
tags:
- Trash
- CentrifugeCompatible
- Vial
- type: PhysicalComposition
materialComposition:
Glass: 25
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: gameMap
id: Box
mapName: 'Box Station'
mapPath: /Maps/SL_box.yml
mapPath: /Maps/_Starlight/Box.yml
minPlayers: 50
stations:
Boxstation:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/cog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: gameMap
id: Cog
mapName: 'Cog'
mapPath: /Maps/cog.yml
mapPath: /Maps/_Starlight/Cog.yml
minPlayers: 40
maxPlayers: 80 #big map
stations:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/fland.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: gameMap
id: Fland
mapName: 'Fland Installation'
mapPath: /Maps/fland.yml
mapPath: /Maps/_Starlight/Fland.yml
minPlayers: 70
stations:
Fland:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/marathon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: gameMap
id: Marathon
mapName: 'Marathon Station'
mapPath: /Maps/marathon.yml
mapPath: /Maps/_Starlight/Marathon.yml
minPlayers: 35
maxPlayers: 70
stations:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/meta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: gameMap
id: Meta
mapName: 'Meta Station'
mapPath: /Maps/meta.yml
mapPath: /Maps/_Starlight/Meta.yml
minPlayers: 50
stations:
Meta:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Maps/oasis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- type: gameMap
id: Oasis
mapName: 'Oasis'
mapPath: /Maps/oasis.yml
mapPath: /Maps/_Starlight/Oasis.yml
minPlayers: 70
stations:
Oasis:
Expand Down
143 changes: 143 additions & 0 deletions Resources/Prototypes/_StarLight/Catalog/medical.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,146 @@
conditions:
- !type:ListingLimitedStockCondition
stock: 2

- type: listing
id: VendorVialCase
productEntity: VialCase
cost:
NTCredit: 37
categories:
- SLChemistry
conditions:
- !type:ListingLimitedStockCondition
stock: 6

- type: listing
id: VendorCleanerGrenade
productEntity: CleanerGrenade
cost:
NTCredit: 13
categories:
- SLChemistry
conditions:
- !type:ListingLimitedStockCondition
stock: 5

- type: listing
id: VendorBluebrutepack20
productEntity: Bluebrutepack20
cost:
NTCredit: 34
categories:
- SLMedical
conditions:
- !type:ListingLimitedStockCondition
stock: 4

- type: listing
id: VendorBlueointment20
productEntity: Blueointment20
cost:
NTCredit: 34
categories:
- SLMedical
conditions:
- !type:ListingLimitedStockCondition
stock: 4

- type: listing
id: VendorMobTrueDoctorbot
productEntity: MobTrueDoctorbot
cost:
NTCredit: 999
categories:
- SLMedical
conditions:
- !type:ListingLimitedStockCondition
stock: 1

- type: listing
id: VendorMobOrganHumanHeart
productEntity: OrganHumanHeart
cost:
NTCredit: 331
categories:
- SLSurgery

- type: listing
id: VendorMobOrganHumanStomach
productEntity: OrganHumanStomach
cost:
NTCredit: 124
categories:
- SLSurgery

- type: listing
id: VendorMobOrganHumanLiver
productEntity: OrganHumanLiver
cost:
NTCredit: 143
categories:
- SLSurgery

- type: listing
id: VendorMobOrganHumanKidneys
productEntity: OrganHumanKidneys
cost:
NTCredit: 265
categories:
- SLSurgery

- type: listing
id: VendorMobOrganHumanLungs
productEntity: OrganHumanLungs
cost:
NTCredit: 297
categories:
- SLSurgery

- type: listing
id: VendorMobOrganHumanTongue
productEntity: OrganHumanTongue
cost:
NTCredit: 48
categories:
- SLSurgery

- type: listing
id: VendorMobOrganHumanEyes
productEntity: OrganHumanEyes
cost:
NTCredit: 233
categories:
- SLSurgery

- type: listing
id: VendorLeftLegHuman
productEntity: LeftLegHuman
cost:
NTCredit: 153
categories:
- SLSurgery

- type: listing
id: VendorRightLegHuman
productEntity: RightLegHuman
cost:
NTCredit: 153
categories:
- SLSurgery

- type: listing
id: VendorLeftFootHuman
productEntity: LeftFootHuman
cost:
NTCredit: 37
categories:
- SLSurgery

- type: listing
id: VendorRightFootHuman
productEntity: RightFootHuman
cost:
NTCredit: 37
categories:
- SLSurgery
59 changes: 58 additions & 1 deletion Resources/Prototypes/_StarLight/Entities/Objects/Specific/chemistry.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,61 @@
- type: SolutionContainerManager
solutions:
beaker:
maxVol: 200
maxVol: 200

- type: entity
id: VialCase
parent: [ BaseStorageItem, BaseBagOpenClose ]
name: vial case
description: A convenient, compact box with 6 empty vials.
components:
- type: Sprite
sprite: _Starlight/Objects/Specific/Chemistry/vial_case.rsi
layers:
- state: closed
map: ["closeLayer"]
- state: open
map: ["openLayer"]
- state: vial1
map: ["vial1"]
visible: false
- state: vial2
map: ["vial2"]
visible: false
- state: vial3
map: ["vial3"]
visible: false
- state: vial4
map: ["vial4"]
visible: false
- state: vial5
map: ["vial5"]
visible: false
- state: vial6
map: ["vial6"]
visible: false
- type: Storage
grid:
- 0,0,2,1
- type: Item
sprite: Objects/Consumable/Smokeables/vials/case.rsi
size: Small
shape:
- 0,0,1,1
storedRotation: 90
- type: StorageFill
contents:
- id: BaseChemistryEmptyVial
amount: 6
- type: ItemCounter
count:
tags: [Vial]
composite: true
layerStates:
- vial1
- vial2
- vial3
- vial4
- vial5
- vial6
- type: Appearance
Loading
Loading