Skip to content

Commit

Permalink
Add new pills inspired by IRL HRT pill designs
Browse files Browse the repository at this point in the history
  • Loading branch information
sowelipililimute committed Nov 24, 2024
1 parent 0f20142 commit e7d0a27
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ public ChemMasterWindow()
RobustXamlLoader.Load(this);
IoCManager.InjectDependencies(this);

// Pill type selection buttons, in total there are 20 pills.
// Pill type selection buttons, in total there are 23 pills.
// Pill rsi file should have states named as pill1, pill2, and so on.
var resourcePath = new ResPath(PillsRsiPath);
var pillTypeGroup = new ButtonGroup();
PillTypeButtons = new Button[20];
PillTypeButtons = new Button[23];
for (uint i = 0; i < PillTypeButtons.Length; i++)
{
// For every button decide which stylebase to have
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Chemistry/SharedChemMaster.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Content.Shared.Chemistry
/// </summary>
public sealed class SharedChemMaster
{
public const uint PillTypes = 20;
public const uint PillTypes = 23;
public const string BufferSolutionName = "buffer";
public const string InputSlotName = "beakerSlot";
public const string OutputSlotName = "outputSlot";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi",
"copyright": "Pills φ through 21 are taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi; pills 22 and 23 are copyright 2024 Janet Blackquill <[email protected]>",
"size": {
"x": 32,
"y": 32
Expand Down Expand Up @@ -73,6 +73,12 @@
{
"name": "pill17"
},
{
"name": "pill22"
},
{
"name": "pill23"
},
{
"name": "inhand-left",
"directions": 4
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.

0 comments on commit e7d0a27

Please sign in to comment.