Skip to content
This repository was archived by the owner on Dec 23, 2025. It is now read-only.

Commit f7a0624

Browse files
MerrokitsuneMerrokitsune
committed
2 parents 6d64942 + de47290 commit f7a0624

20 files changed

Lines changed: 45035 additions & 44602 deletions

File tree

‎Resources/Locale/en-US/_Ronstation/reagents/meta/medicine.ftl‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,5 @@ reagent-desc-pentetic-acid = Reduces toxin and radiation damage while purging ot
77
reagent-name-cordrazine = cordrazine
88
reagent-desc-cordrazine = Reduces brute, toxin and airloss damage while in critical condition. Overdose causes cellular scrambling and possible delirium.
99
10-
reagent-name-salicylic-acid = salicylic acid
11-
reagent-desc-salicylic-acid = Stimulates the healing of severe bruises. Extremely rapidly heals severe bruising and slowly heals minor ones. Overdose will worsen existing bruising.
12-
1310
reagent-name-spaceacillin = spaceacillin
1411
reagent-desc-spaceacillin = Provides limited resistance against disease and parasites. Not used as much due to the extinction of most pathogens.

‎Resources/Maps/_Ronstation/cluster-2.yml‎

Lines changed: 10037 additions & 8707 deletions
Large diffs are not rendered by default.

‎Resources/Maps/_Ronstation/saltern-2.yml‎

Lines changed: 34815 additions & 35699 deletions
Large diffs are not rendered by default.

‎Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,11 @@
256256
children:
257257
- id: JetpackBlueFilled
258258
- id: JetpackBlackFilled
259-
- !type:GroupSelector
260-
children:
261-
- id: PKAUpgradeDamage
262-
- id: PKAUpgradeRange
263-
- id: PKAUpgradeFireRate
259+
# - !type:GroupSelector
260+
# children:
261+
# - id: PKAUpgradeDamage
262+
# - id: PKAUpgradeRange
263+
# - id: PKAUpgradeFireRate
264264

265265

266266
- type: entityTable

‎Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@
520520
name: golden apple streusel tart
521521
parent: FoodPieBase
522522
id: FoodTartGapple
523-
description: A tasty dessert that won't make it through a metal detector.
523+
description: A tasty dessert that won't make it through a metal detector. May contain real golden apples.
524524
components:
525525
- type: FlavorProfile
526526
flavors:

‎Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
parent: BaseSubdermalImplant
8080
id: TrackingImplant
8181
name: tracking implant
82-
description: This implant has a tracking device attached to the suit sensor network.
82+
description: This implant has a tracking device attached to the suit sensor network, as well as a condition monitor for the Security radio channel.
8383
categories: [ HideSpawnMenu ]
8484
components:
8585
- type: SubdermalImplant
@@ -97,6 +97,11 @@
9797
- type: StationLimitedNetwork
9898
- type: WirelessNetworkConnection
9999
range: 500
100+
- type: TriggerOnMobstateChange
101+
mobState:
102+
- Critical
103+
- type: Rattle
104+
radioChannel: "Security"
100105

101106
#Traitor implants
102107

‎Resources/Prototypes/Entities/Objects/Specific/chemistry.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
- type: SolutionContainerManager
2525
solutions:
2626
beaker:
27-
maxVol: 50
27+
maxVol: 60
2828
- type: MixableSolution
2929
solution: beaker
3030
- type: FitsInDispenser
@@ -98,7 +98,7 @@
9898
parent: BaseItem
9999
id: BorgBeaker
100100
name: integrated beaker
101-
description: An internal compartment installed into a cyborg. Rated for 50 units of any liquid.
101+
description: An internal compartment installed into a cyborg. Rated for 60 units of any liquid.
102102
components:
103103
# 3 morbillion components are to avoid inheriting breakable since borgs can't replace beakers.
104104
- type: Tag
@@ -122,7 +122,7 @@
122122
- type: SolutionContainerManager
123123
solutions:
124124
beaker:
125-
maxVol: 50
125+
maxVol: 60
126126
- type: MixableSolution
127127
solution: beaker
128128
- type: FitsInDispenser
@@ -269,7 +269,7 @@
269269
- type: SolutionContainerManager
270270
solutions:
271271
beaker:
272-
maxVol: 100
272+
maxVol: 120
273273
- type: Appearance
274274
- type: SolutionContainerVisuals
275275
maxFillLevels: 6

‎Resources/Prototypes/Entities/Objects/Tools/pka_upgrade.yml‎

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
1-
- type: entity
2-
id: BasePKAUpgrade
3-
parent: BaseItem
4-
name: PKA modkit
5-
description: A modkit for a proto-kinetic accelerator.
6-
abstract: true
7-
components:
8-
- type: Sprite
9-
sprite: Objects/Tools/upgrade.rsi
10-
- type: Item
11-
size: Small
12-
- type: GunUpgrade
13-
- type: StaticPrice
14-
price: 750
15-
- type: Tag
16-
tags:
17-
- PKAUpgrade
1+
# - type: entity
2+
# id: BasePKAUpgrade
3+
# parent: BaseItem
4+
# name: PKA modkit
5+
# description: A modkit for a proto-kinetic accelerator.
6+
# abstract: true
7+
# components:
8+
# - type: Sprite
9+
# sprite: Objects/Tools/upgrade.rsi
10+
# - type: Item
11+
# size: Small
12+
# - type: GunUpgrade
13+
# - type: StaticPrice
14+
# price: 750
15+
# - type: Tag
16+
# tags:
17+
# - PKAUpgrade
1818

19-
- type: entity
20-
id: PKAUpgradeDamage
21-
parent: BasePKAUpgrade
22-
name: PKA modkit (damage)
23-
components:
24-
- type: Sprite
25-
layers:
26-
- state: base
27-
- state: overlay-1
28-
color: "#ec9b2d"
29-
- state: overlay-2
30-
color: "#a71010"
31-
- state: overlay-3
32-
color: "#eb4c13"
33-
- type: GunUpgrade
34-
tags: [ GunUpgradeDamage ]
35-
examineText: gun-upgrade-examine-text-damage
36-
- type: GunUpgradeDamage
37-
damage:
38-
types:
39-
Blunt: 10
40-
Structural: 15
19+
# - type: entity
20+
# id: PKAUpgradeDamage
21+
# parent: BasePKAUpgrade
22+
# name: PKA modkit (damage)
23+
# components:
24+
# - type: Sprite
25+
# layers:
26+
# - state: base
27+
# - state: overlay-1
28+
# color: "#ec9b2d"
29+
# - state: overlay-2
30+
# color: "#a71010"
31+
# - state: overlay-3
32+
# color: "#eb4c13"
33+
# - type: GunUpgrade
34+
# tags: [ GunUpgradeDamage ]
35+
# examineText: gun-upgrade-examine-text-damage
36+
# - type: GunUpgradeDamage
37+
# damage:
38+
# types:
39+
# Blunt: 10
40+
# Structural: 15
4141

42-
- type: entity
43-
id: PKAUpgradeRange
44-
parent: BasePKAUpgrade
45-
name: PKA modkit (range)
46-
components:
47-
- type: Sprite
48-
layers:
49-
- state: base
50-
- state: overlay-1
51-
color: "#2decec"
52-
- state: overlay-2
53-
color: "#1012a7"
54-
- state: overlay-3
55-
color: "#1373eb"
56-
- type: GunUpgrade
57-
tags: [ GunUpgradeRange ]
58-
examineText: gun-upgrade-examine-text-range
59-
- type: GunUpgradeSpeed
60-
coefficient: 1.5
42+
# - type: entity
43+
# id: PKAUpgradeRange
44+
# parent: BasePKAUpgrade
45+
# name: PKA modkit (range)
46+
# components:
47+
# - type: Sprite
48+
# layers:
49+
# - state: base
50+
# - state: overlay-1
51+
# color: "#2decec"
52+
# - state: overlay-2
53+
# color: "#1012a7"
54+
# - state: overlay-3
55+
# color: "#1373eb"
56+
# - type: GunUpgrade
57+
# tags: [ GunUpgradeRange ]
58+
# examineText: gun-upgrade-examine-text-range
59+
# - type: GunUpgradeSpeed
60+
# coefficient: 1.5
6161

62-
- type: entity
63-
id: PKAUpgradeFireRate
64-
parent: BasePKAUpgrade
65-
name: PKA modkit (fire rate)
66-
components:
67-
- type: Sprite
68-
layers:
69-
- state: base
70-
- state: overlay-1
71-
color: "#bbf134"
72-
- state: overlay-2
73-
color: "#07901b"
74-
- state: overlay-3
75-
color: "#9bf134"
76-
- type: GunUpgrade
77-
tags: [ GunUpgradeReloadSpeed ]
78-
examineText: gun-upgrade-examine-text-reload
79-
- type: GunUpgradeFireRate
80-
coefficient: 1.5
62+
# - type: entity
63+
# id: PKAUpgradeFireRate
64+
# parent: BasePKAUpgrade
65+
# name: PKA modkit (fire rate)
66+
# components:
67+
# - type: Sprite
68+
# layers:
69+
# - state: base
70+
# - state: overlay-1
71+
# color: "#bbf134"
72+
# - state: overlay-2
73+
# color: "#07901b"
74+
# - state: overlay-3
75+
# color: "#9bf134"
76+
# - type: GunUpgrade
77+
# tags: [ GunUpgradeReloadSpeed ]
78+
# examineText: gun-upgrade-examine-text-reload
79+
# - type: GunUpgradeFireRate
80+
# coefficient: 1.5

‎Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
88
- type: Item
99
sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi
10-
size: Large
11-
shape:
12-
- 0,0,2,1
10+
size: Normal
1311
- type: GunWieldBonus
1412
minAngle: -43
1513
maxAngle: -43

‎Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
map: [ "empty-icon" ]
1414
# todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi
1515
# todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi
16-
- type: UpgradeableGun
17-
whitelist:
18-
tags:
19-
- PKAUpgrade
20-
- type: ContainerContainer
21-
containers:
22-
upgrades: !type:Container
16+
# - type: UpgradeableGun
17+
# whitelist:
18+
# tags:
19+
# - PKAUpgrade
20+
# - type: ContainerContainer
21+
# containers:
22+
# upgrades: !type:Container

0 commit comments

Comments
 (0)