Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cherry picks 6 (#486)

Browse Source 
* inital

* force them to WRITE

* b

* new system

* aaaa

* b

* bbbb

* translations

* add tts support for evacuation reason

* PaddedStool_Sprite&Prototype

8 colors of pudded stool.

* PaddedStool_Crafting

* ComfyChair_Sprites&Prototype

* ComfyChair_Crafting

* Sofa_Sprites&Prototype

* Sofa_Crafting

* Sofa_SpriteFix

* Sofa_RemoveSomeSprites

* Revert "Sofa_RemoveSomeSprites"

This reverts commit b110e9bda9a75cf6337c4efacd4888967d0e1fe6.

* Revert "Sofa_SpriteFix"

This reverts commit bfa8a17c16c57d2f70d64eb8dd54ae94ac48b248.

* Revert "Sofa_Crafting"

This reverts commit 89daadcb1e9d45a84281a5fdf998ab6c6f6b0f9b.

* Revert "Sofa_Sprites&Prototype"

This reverts commit 73cd0be403e03b1852a4632e1b6a8ca7526c5622.

* Revert "ComfyChair_Crafting"

This reverts commit 940f9665dd998090b43bca596ef3800c0c6ba89b.

* Revert "ComfyChair_Sprites&Prototype"

This reverts commit 2c909de5d3e3f4ab5efa1cbef6b5feda32d05a80.

* Revert "PaddedStool_Crafting"

This reverts commit 82040ba82c0190f2a52614fd3573e77586d73802.

* Revert "PaddedStool_Sprite&Prototype"

This reverts commit c5241a03ffeccbb4a18ab0f108d05c4fe1e047ba.

* Sprites&Meta

* Crafting

* Tweaks

* PaddedStool_tweaks

* Add Random Spawners

* remove old colored chairs

* Sprites&Meta

* Changing prototypes

* Adding to Theater vend

* Sprite_Change

* Sprite_Change

* Prototype_Changes

Is this exactly how it should be?...

* add bouquet

* Not very useful functionality has been removed

* Update toys.yml

* Now you need cloth to made bouquet

* Update toys.yml

* I hope. I done right

* Update toys.yml

* Update bouquet.yml

* Update toys.yml

* Update Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* add musician jumpskirt to loadouts

* better bouquet

* pAIs can now be inserted into plushies.

* No more bad bleed

* More Tourniquets, hopefully fixed YML check.

* deals a bit of bloodloss

* Reduce Stack Count.

* fix tourniquet

* add migrations for old chair types and add few new

---------

Co-authored-by: Mr. 27 <koolthunder019@gmail.com>
Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>
Co-authored-by: Green resomi <135062489+Yeah-I-listening-Hollywood-undead@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Moomoobeef <moomoobeef@protonmail.com>
Co-authored-by: PoorMansDreams <andyroblox14@gmail.com>
This commit is contained in:
ThereDrD0
2024-07-23 20:37:15 +03:00
committed by GitHub
parent 5a1f7baaa4
commit 1acc84c21c
40 changed files with 1375 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.Chat;
using Content.Shared.Communications;
using Robust.Shared.Configuration;
using Robust.Shared.Timing;
using Robust.Shared.Prototypes;
namespace Content.Client.Communications.UI
{

19
Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
View File

@@ -1,7 +1,9 @@
using Content.Client.UserInterface.Controls;
using System.Threading;
using Content.Shared.CCVar;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Configuration;
using Robust.Shared.Utility;
using Timer = Robust.Shared.Timing.Timer;
@@ -13,6 +15,8 @@ namespace Content.Client.Communications.UI
private CommunicationsConsoleBoundUserInterface Owner { get; set; }
private readonly CancellationTokenSource _timerCancelTokenSource = new();
[Dependency] private readonly IConfigurationManager _cfg = default!;
public CommunicationsConsoleMenu(CommunicationsConsoleBoundUserInterface owner)
{
IoCManager.InjectDependencies(this);
@@ -23,6 +27,21 @@ namespace Content.Client.Communications.UI
var loc = IoCManager.Resolve<ILocalizationManager>();
MessageInput.Placeholder = new Rope.Leaf(loc.GetString("comms-console-menu-announcement-placeholder"));
var maxAnnounceLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength);
MessageInput.OnTextChanged += (args) =>
{
if (args.Control.TextLength > maxAnnounceLength)
{
AnnounceButton.Disabled = true;
AnnounceButton.ToolTip = Loc.GetString("comms-console-message-too-long");
}
else
{
AnnounceButton.Disabled = !owner.CanAnnounce;
AnnounceButton.ToolTip = null;
}
};
AnnounceButton.OnPressed += (_) => Owner.AnnounceButtonPressed(Rope.Collapse(MessageInput.TextRope));
AnnounceButton.Disabled = !owner.CanAnnounce;

28
Content.Server/Communications/CommunicationsConsoleSystem.cs
View File

@@ -9,7 +9,7 @@ using Content.Server.DeviceNetwork.Systems;
using Content.Server.Interaction;
using Content.Server.Popups;
using Content.Server.RoundEnd;
using Content.Server.Screens;
using Robust.Shared.Player;
using Content.Server.Screens.Components;
using Content.Server.Shuttles.Systems;
using Content.Server.Station.Components;
@@ -27,6 +27,7 @@ using Content.Shared.Popups;
using Content.Shared._White;
using Robust.Server.GameObjects;
using Robust.Shared.Configuration;
using Content.Server.Administration;
namespace Content.Server.Communications
{
@@ -45,6 +46,7 @@ namespace Content.Server.Communications
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly QuickDialogSystem _quickDialog = default!;
private const float UIUpdateInterval = 5.0f;
@@ -332,7 +334,7 @@ namespace Content.Server.Communications
if (!CanUse(mob, uid))
{
_popupSystem.PopupEntity(Loc.GetString("comms-console-permission-denied"), uid, message.Session);
_popupSystem.PopupEntity(Loc.GetString("comms-console-permission-denied"), uid, mob);
return;
}
@@ -340,12 +342,30 @@ namespace Content.Server.Communications
RaiseLocalEvent(ref ev);
if (ev.Cancelled)
{
_popupSystem.PopupEntity(ev.Reason ?? Loc.GetString("comms-console-shuttle-unavailable"), uid, message.Session);
_popupSystem.PopupEntity(ev.Reason ?? Loc.GetString("comms-console-shuttle-unavailable"), uid, mob);
return;
}
_roundEndSystem.RequestRoundEnd(uid);
if (!TryComp<ActorComponent>(mob, out var actor))
return;
_quickDialog.OpenDialog(actor.PlayerSession, Loc.GetString("comms-console-window-text"), "Reason", (LongString message) =>
{
if (!CanUse(mob, uid))
{
_popupSystem.PopupEntity(Loc.GetString("comms-console-permission-denied"), uid, mob);
return;
}
_roundEndSystem.RequestRoundEnd(uid, text: "round-end-system-shuttle-called-announcement-reason", reason: message);
//WD-start
var ttsEv = new TTSAnnouncementEvent(message, comp.TtsVoiceId, uid, comp.Global);
RaiseLocalEvent(ttsEv);
//WD-end
_adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(mob):player} has called the shuttle.");
});
}
private void OnRecallShuttleMessage(EntityUid uid, CommunicationsConsoleComponent comp, CommunicationsConsoleRecallEmergencyShuttleMessage message)

18
Content.Server/RoundEnd/RoundEndSystem.cs
View File

@@ -141,7 +141,8 @@ namespace Content.Server.RoundEnd
EntityUid? requester = null,
bool checkCooldown = true,
string text = "round-end-system-shuttle-called-announcement",
string name = "Station")
string name = "Station",
string? reason = null)
{
var duration = DefaultCountdownDuration;
@@ -156,7 +157,7 @@ namespace Content.Server.RoundEnd
}
}
RequestRoundEnd(duration, requester, checkCooldown, text, name);
RequestRoundEnd(duration, requester, checkCooldown, text, name, reason);
}
public void RequestRoundEnd(
@@ -164,7 +165,8 @@ namespace Content.Server.RoundEnd
EntityUid? requester = null,
bool checkCooldown = true,
string text = "round-end-system-shuttle-called-announcement",
string name = "Station")
string name = "Station",
string? reason = null)
{
if (_gameTicker.RunLevel != GameRunLevel.InRound)
return;
@@ -202,6 +204,7 @@ namespace Content.Server.RoundEnd
units = "eta-units-minutes";
}
if (reason == null)
_chatSystem.DispatchGlobalAnnouncement(Loc.GetString(text,
("time", time),
("units", Loc.GetString(units))),
@@ -209,6 +212,15 @@ namespace Content.Server.RoundEnd
false,
null,
Color.Gold);
else
_chatSystem.DispatchGlobalAnnouncement(Loc.GetString(text,
("time", time),
("units", Loc.GetString(units)),
("reason", reason)),
name,
false,
null,
Color.Gold);
_audio.PlayGlobal("/Audio/Announcements/shuttlecalled.ogg", Filter.Broadcast(), true);

2
Resources/Locale/en-US/communications/communications-console-component.ftl
View File

@@ -5,10 +5,12 @@ comms-console-menu-announcement-button = Announce
comms-console-menu-broadcast-button = Broadcast
comms-console-menu-call-shuttle = Call emergency shuttle
comms-console-menu-recall-shuttle = Recall emergency shuttle
comms-console-window-text = Enter the nature of emergency
# Popup
comms-console-permission-denied = Permission denied
comms-console-shuttle-unavailable = Shuttle is currently unavailable
comms-console-message-too-long = Message is too long
# Placeholder values
comms-console-announcement-sent-by = Sent by

4
Resources/Locale/en-US/round-end/round-end-system.ftl
View File

@@ -1,6 +1,10 @@
## RoundEndSystem
round-end-system-shuttle-called-announcement = An emergency shuttle has been sent. ETA: {$time} {$units}.
round-end-system-shuttle-called-announcement-reason =
An emergency shuttle has been sent. ETA: {$time} {$units}.
Nature of emergency: {$reason}
round-end-system-shuttle-already-called-announcement = An emergency shuttle has already been sent.
round-end-system-shuttle-auto-called-announcement = An automatic crew shift change shuttle has been sent. ETA: {$time} {$units}. Recall the shuttle to extend the shift.
round-end-system-shuttle-recalled-announcement = The emergency shuttle has been recalled.

2
Resources/Locale/ru-RU/_white/communications/communications-console-component.ftl Normal file
View File

@@ -0,0 +1,2 @@
comms-console-window-text = Введите причину вызова эвакуации
comms-console-message-too-long = Сообщение слишком длинное

5
Resources/Locale/ru-RU/_white/round-end/round-end-system.ftl Normal file
View File

@@ -0,0 +1,5 @@
round-end-system-shuttle-called-announcement = Эвакуационный шаттл был вызван. Он прибудет через: {$time} {$units}.
round-end-system-shuttle-called-announcement-reason =
Эвакуационный шаттл был вызван. Он прибудет через: {$time} {$units}.
Причина: {$reason}

1
Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
View File

@@ -6,6 +6,7 @@
Ointment: 2
Bloodpack: 2
Gauze: 2
Tourniquet: 5
EpinephrineChemistryBottle: 1
Syringe: 2
EmergencyMedipen: 2

11
Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
View File

@@ -788,3 +788,14 @@
sprite: Clothing/Uniforms/Jumpskirt/inspectorformal.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/inspectorformal.rsi
- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtMusician
name: musician's skirt
description: A fancy skirt for the musically inclined. Perfect for any lounge act!
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/musician.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/musician.rsi

41
Resources/Prototypes/Entities/Markers/Spawners/Random/furniture.yml Normal file
View File

@@ -0,0 +1,41 @@
- type: entity
name: random comfy spawner
id: RandomComfySpawner
parent: MarkerBase
components:
- type: Sprite
layers:
- sprite: Structures/Furniture/chairs.rsi
state: comfy-random
- type: RandomSpawner
prototypes:
- BlackComfyChair
- BlueComfyChair
- GreenComfyChair
- OrangeComfyChair
- PinkComfyChair
- PurpleComfyChair
- RedComfyChair
- WhiteComfyChair
chance: 1
- type: entity
name: random padded stool spawner
id: RandomPaddedStoolSpawner
parent: MarkerBase
components:
- type: Sprite
layers:
- sprite: Structures/Furniture/chairs.rsi
state: pufi-box-random
- type: RandomSpawner
prototypes:
- BlackPaddedStool
- BluePaddedStool
- GreenPaddedStool
- OrangePaddedStool
- PinkPaddedStool
- PurplePaddedStool
- RedPaddedStool
- WhitePaddedStool
chance: 1

11
Resources/Prototypes/Entities/Objects/Fun/toys.yml
View File

@@ -52,6 +52,17 @@
reagents:
- ReagentId: Fiber
Quantity: 10
- type: ItemSlots
slots:
item:
ejectSound:
collection: storageRustle
insertSound:
collection: storageRustle
#name: plushie-inserted-pai
whitelist:
components:
- PAI
- type: entity
parent: BasePlushie

54
Resources/Prototypes/Entities/Objects/Misc/bouquet.yml Normal file
View File

@@ -0,0 +1,54 @@
- type: entity
name: PoppyBouquet
parent: FoodProduceBase
id: PoppyBouquet
description: It's a great way to honor the memory of an assistant who was killed through your fault.
components:
- type: Sprite
sprite: Objects/Misc/poppybouquet.rsi
state: icon
scale: 1.15,1.15
- type: Item
sprite: Objects/Misc/poppybouquet.rsi
- type: Construction
graph: PoppyBouquet
node: PoppyBouquet
- type: BadFood
- type: SolutionContainerManager # 4 flowers
solutions:
food:
maxVol: 66
reagents:
- ReagentId: Nutriment
Quantity: 4
- ReagentId: Bicaridine
Quantity: 40
- ReagentId: Fiber
Quantity: 8
- type: FlavorProfile
flavors:
- medicine
- type: Flammable
fireSpread: true
alwaysCombustible: true
damage:
types:
Heat: 1
- type: FireVisuals
sprite: Effects/fire.rsi
normalState: fire
- type: Damageable
damageModifierSet: Web
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 15
behaviors:
- !type:SpawnEntitiesBehavior
spawn:
Ash:
min: 1
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]

15
Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
View File

@@ -242,20 +242,29 @@
- SecBeltEquip
- type: Sprite
state: tourniquet
- type: Item
size: Tiny
- type: Healing
damageContainers:
- Biological
damage:
groups:
Brute: 5 # Tourniquets HURT!
Brute: -1
types:
Asphyxiation: 5 # Essentially Stopping all blood reaching a part of your body
bloodlossModifier: -10 # Tourniquets stop bleeding
Bloodloss: 2
Asphyxiation: 2 # Essentially Stopping all blood reaching a part of your body
bloodlossModifier: -10
delay: 0.5
healingBeginSound:
path: "/Audio/Items/Medical/brutepack_begin.ogg"
healingEndSound:
path: "/Audio/Items/Medical/brutepack_end.ogg"
- type: Stack
stackType: Tourniquet
count: 1
- type: StackPrice
price: 10
- type: entity
name: roll of gauze

279
Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
View File

@@ -4,7 +4,7 @@
abstract: true
description: You sit in this. Either by will or force.
placement:
mode: PlaceFree
mode: SnapgridCenter
components:
- type: Clickable
- type: InteractionOutline
@@ -34,7 +34,7 @@
buckleOffset: "0,-0.05"
- type: Pullable
- type: Damageable
damageContainer: StructuralInorganic
damageContainer: Inorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
@@ -128,7 +128,7 @@
- type: entity
name: stool
id: Stool
parent: UnanchoredChairBase
parent: ChairBase
description: Apply butt.
components:
- type: Sprite
@@ -181,6 +181,148 @@
graph: Seat
node: chairOfficeDark
- type: entity
name: black comfy chair
id: BlackComfyChair
parent: ChairBase
description: It looks comfy.
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#23242c"
- type: Construction
graph: Seat
node: blackChairComfy
- type: entity
name: blue comfy chair
id: BlueComfyChair
parent: ChairBase
description: It looks comfy.
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#356287"
- type: Construction
graph: Seat
node: blueChairComfy
- type: entity
name: green comfy chair
id: GreenComfyChair
parent: ChairBase
description: It looks comfy.
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#2a6e47"
- type: Construction
graph: Seat
node: greenChairComfy
- type: entity
name: orange comfy chair
id: OrangeComfyChair
parent: ChairBase
description: It looks comfy.
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#9d480c"
- type: Construction
graph: Seat
node: orangeChairComfy
- type: entity
name: pink comfy chair
id: PinkComfyChair
parent: ChairBase
description: It looks comfy.
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#91265e"
- type: Construction
graph: Seat
node: pinkChairComfy
- type: entity
name: purple comfy chair
id: PurpleComfyChair
parent: ChairBase
description: It looks comfy.
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#563968"
- type: Construction
graph: Seat
node: purpleChairComfyf
- type: entity
name: red comfy chair
id: RedComfyChair
parent: ChairBase
description: It looks comfy.
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#872222"
- type: Construction
graph: Seat
node: redChairComfy
- type: entity
name: white comfy chair
id: WhiteComfyChair
parent: ChairBase
description: It looks comfy.
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#dcdcdc"
- type: Construction
graph: Seat
node: whiteChairComfy
# WD edit start
- type: entity
name: brown comfy chair
id: BrownComfyChair
parent: ChairBase
description: It looks comfy.
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#AE6716"
- type: Construction
graph: Seat
node: brownChairComfy
- type: entity
name: light blue comfy chair
id: LightBlueComfyChair
parent: ChairBase
description: It looks comfy.
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#52B4E9"
- type: Construction
graph: Seat
node: lightBlueChairComfy
- type: entity
name: comfy chair
id: ComfyChair
@@ -188,11 +330,14 @@
description: It looks comfy.
components:
- type: Sprite
state: comfy
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
- type: Construction
graph: Seat
node: chairComfy
# WD edit end
- type: entity
name: pilot seat
id: ChairPilotSeat
@@ -253,7 +398,7 @@
- type: entity
id: ChairMeat
parent: UnanchoredChairBase
parent: ChairBase
name: meat chair
description: Uncomfortably sweaty.
components:
@@ -298,7 +443,7 @@
name: web chair
id: ChairWeb
description: For true web developers.
parent: UnanchoredChairBase
parent: ChairBase
components:
- type: Sprite
sprite: Structures/Web/chair.rsi
@@ -314,12 +459,6 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 300 #excess damage (nuke?). avoid computational cost of spawning entities. # WD edit start
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger # WD edit end
damage: 50
behaviors:
- !type:DoActsBehavior
@@ -368,6 +507,8 @@
parent: ChairFolding
id: ChairFoldingSpawnFolded
suffix: folded
placement:
mode: PlaceFree
components:
- type: Foldable
folded: true
@@ -384,6 +525,7 @@
graph: Seat
node: chairSteelBench
# WD edit start
- type: entity
name: wooden bench
id: WoodenBench
@@ -413,3 +555,116 @@
max: 4
- type: StaticPrice
price: 20
# WD edit end
- type: entity
name: black padded stool
id: BlackPaddedStool
parent: ChairBase
description: Soft bag chair, comfortable!
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
color: "#23242c"
- type: Construction
graph: Seat
node: blackPaddedStool
- type: entity
name: blue padded stool
id: BluePaddedStool
parent: ChairBase
description: Soft bag chair, comfortable!
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
color: "#356287"
- type: Construction
graph: Seat
node: bluePaddedStool
- type: entity
name: green padded stool
id: GreenPaddedStool
parent: ChairBase
description: Soft bag chair, comfortable!
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
color: "#2a6e47"
- type: Construction
graph: Seat
node: greenPaddedStool
- type: entity
name: orange padded stool
id: OrangePaddedStool
parent: ChairBase
description: Soft bag chair, comfortable!
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
color: "#9d480c"
- type: Construction
graph: Seat
node: orangePaddedStool
- type: entity
name: pink padded stool
id: PinkPaddedStool
parent: ChairBase
description: Soft bag chair, comfortable!
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
color: "#91265e"
- type: Construction
graph: Seat
node: pinkPaddedStool
- type: entity
name: purple padded stool
id: PurplePaddedStool
parent: ChairBase
description: Soft bag chair, comfortable!
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
color: "#563968"
- type: Construction
graph: Seat
node: purplePaddedStool
- type: entity
name: red padded stool
id: RedPaddedStool
parent: ChairBase
description: Soft bag chair, comfortable!
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
color: "#872222"
- type: Construction
graph: Seat
node: redPaddedStool
- type: entity
name: white padded stool
id: WhitePaddedStool
parent: ChairBase
description: Soft bag chair, comfortable!
components:
- type: Sprite
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
color: "#dcdcdc"
- type: Construction
graph: Seat
node: whitePaddedStool

8
Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml
View File

@@ -36,6 +36,14 @@
equipment:
jumpsuit: ClothingUniformJumpsuitMusician
- type: itemLoadout # WD
id: MusicianJumpskirt
equipment: MusicianJumpskirt
- type: startingGear
id: MusicianJumpskirt
equipment:
jumpsuit: ClothingUniformJumpskirtMusician
# Outerclothing
- type: itemLoadout
id: MusicianWintercoat

1
Resources/Prototypes/Loadouts/loadout_groups.yml
View File

@@ -634,6 +634,7 @@
name: loadout-group-jumpsuit
loadouts:
- MusicianJumpsuit
- MusicianJumpskirt
- JumpsuitFamily
- JumpsuitLoungewear

345
Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
View File

@@ -36,7 +36,42 @@
- material: Steel
amount: 2
doAfter: 1
- to: chairComfy
- to: blackChairComfy
steps:
- material: Steel
amount: 2
doAfter: 1
- to: blueChairComfy
steps:
- material: Steel
amount: 2
doAfter: 1
- to: greenChairComfy
steps:
- material: Steel
amount: 2
doAfter: 1
- to: orangeChairComfy
steps:
- material: Steel
amount: 2
doAfter: 1
- to: pinkChairComfy
steps:
- material: Steel
amount: 2
doAfter: 1
- to: purpleChairComfy
steps:
- material: Steel
amount: 2
doAfter: 1
- to: redChairComfy
steps:
- material: Steel
amount: 2
doAfter: 1
- to: whiteChairComfy
steps:
- material: Steel
amount: 2
@@ -87,6 +122,70 @@
doAfter: 1
- material: Cloth
amount: 1
- to: blackPaddedStool
steps:
- material: Cloth
amount: 3
doAfter: 1
- material: WoodPlank
amount: 1
doAfter: 1
- to: bluePaddedStool
steps:
- material: Cloth
amount: 3
doAfter: 1
- material: WoodPlank
amount: 1
doAfter: 1
- to: greenPaddedStool
steps:
- material: Cloth
amount: 3
doAfter: 1
- material: WoodPlank
amount: 1
doAfter: 1
- to: orangePaddedStool
steps:
- material: Cloth
amount: 3
doAfter: 1
- material: WoodPlank
amount: 1
doAfter: 1
- to: pinkPaddedStool
steps:
- material: Cloth
amount: 3
doAfter: 1
- material: WoodPlank
amount: 1
doAfter: 1
- to: purplePaddedStool
steps:
- material: Cloth
amount: 3
doAfter: 1
- material: WoodPlank
amount: 1
doAfter: 1
- to: redPaddedStool
steps:
- material: Cloth
amount: 3
doAfter: 1
- material: WoodPlank
amount: 1
doAfter: 1
- to: whitePaddedStool
steps:
- material: Cloth
amount: 3
doAfter: 1
- material: WoodPlank
amount: 1
doAfter: 1
- node: chair
entity: Chair
@@ -156,6 +255,128 @@
- tool: Screwing
doAfter: 1
- node: blackChairComfy
entity: BlackComfyChair
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Screwing
doAfter: 1
- node: blueChairComfy
entity: BlueComfyChair
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Screwing
doAfter: 1
- node: greenChairComfy
entity: GreenComfyChair
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Screwing
doAfter: 1
- node: orangeChairComfy
entity: OrangeComfyChair
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Screwing
doAfter: 1
- node: pinkChairComfy
entity: PinkComfyChair
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Screwing
doAfter: 1
- node: purpleChairComfy
entity: PurpleComfyChair
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Screwing
doAfter: 1
- node: redChairComfy
entity: RedComfyChair
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Screwing
doAfter: 1
- node: whiteChairComfy
entity: WhiteComfyChair
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Screwing
doAfter: 1
# WD edit starts
- node: brownChairComfy
entity: BrownComfyChair
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Screwing
doAfter: 1
- node: lightBlueChairComfy
entity: LightBlueComfyChair
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetSteel1
amount: 2
steps:
- tool: Screwing
doAfter: 1
- node: chairComfy
entity: ComfyChair
edges:
@@ -168,6 +389,8 @@
- tool: Screwing
doAfter: 1
# WD edit end
- node: chairPilotSeat
entity: ChairPilotSeat
edges:
@@ -276,3 +499,123 @@
doAfter: 1
- tool: Screwing
doAfter: 1
- node: blackPaddedStool
entity: BlackPaddedStool
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialCloth1
amount: 3
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: bluePaddedStool
entity: BluePaddedStool
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialCloth1
amount: 3
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: greenPaddedStool
entity: GreenPaddedStool
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialCloth1
amount: 3
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: orangePaddedStool
entity: OrangePaddedStool
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialCloth1
amount: 3
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: pinkPaddedStool
entity: PinkPaddedStool
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialCloth1
amount: 3
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: purplePaddedStool
entity: PurplePaddedStool
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialCloth1
amount: 3
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: redPaddedStool
entity: RedPaddedStool
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialCloth1
amount: 3
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 1
steps:
- tool: Cutting
doAfter: 1
- node: whitePaddedStool
entity: WhitePaddedStool
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialCloth1
amount: 3
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 1
steps:
- tool: Cutting
doAfter: 1

324
Resources/Prototypes/Recipes/Construction/furniture.yml
View File

@@ -102,25 +102,201 @@
- !type:TileNotBlocked
- type: construction
name: comfy chair
id: ComfyChair
name: black comfy chair
id: BlackChairComfy
graph: Seat
startNode: start
targetNode: chairComfy
targetNode: blackChairComfy
category: construction-category-furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/chairs.rsi
state: comfy
state: comfy-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: blue comfy chair
id: BlueChairComfy
graph: Seat
startNode: start
targetNode: blueChairComfy
category: construction-category-furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: green comfy chair
id: GreenChairComfy
graph: Seat
startNode: start
targetNode: greenChairComfy
category: construction-category-furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: orange comfy chair
id: OrangeChairComfy
graph: Seat
startNode: start
targetNode: orangeChairComfy
category: construction-category-furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: pink comfy chair
id: PinkChairComfy
graph: Seat
startNode: start
targetNode: pinkChairComfy
category: construction-category-furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: purple comfy chair
id: PurpleChairComfy
graph: Seat
startNode: start
targetNode: purpleChairComfy
category: construction-category-furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: red comfy chair
id: RedChairComfy
graph: Seat
startNode: start
targetNode: redChairComfy
category: construction-category-furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: white comfy chair
id: WhiteChairComfy
graph: Seat
startNode: start
targetNode: whiteChairComfy
category: construction-category-furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
# WD edit start
- type: construction
name: brown comfy chair
id: BrownChairComfy
graph: Seat
startNode: start
targetNode: brownChairComfy
category: construction-category-furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#AE6716"
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: light blue comfy chair
id: LightBlueChairComfy
graph: Seat
startNode: start
targetNode: lightBlueChairComfy
category: construction-category-furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
color: "#52B4E9"
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: comfy chair
id: ChairComfy
graph: Seat
startNode: start
targetNode: chairComfy
category: construction-category-furniture
description: It looks comfy.
icon:
sprite: Structures/Furniture/chairs.rsi
state: comfy-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
# WD edit end
- type: construction
name: pilots chair
id: ChairPilotSeat
id: chairPilotSeat
graph: Seat
startNode: start
targetNode: chairPilotSeat
@@ -271,6 +447,142 @@
conditions:
- !type:TileNotBlocked
- type: construction
name: black padded stool
id: BlackPaddedStool
graph: Seat
startNode: start
targetNode: blackPaddedStool
category: construction-category-furniture
description: Soft bag chair, comfortable!
icon:
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: blue padded stool
id: BluePaddedStool
graph: Seat
startNode: start
targetNode: bluePaddedStool
category: construction-category-furniture
description: Soft bag chair, comfortable!
icon:
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: green padded stool
id: GreenPaddedStool
graph: Seat
startNode: start
targetNode: greenPaddedStool
category: construction-category-furniture
description: Soft bag chair, comfortable!
icon:
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: orange padded stool
id: OrangePaddedStool
graph: Seat
startNode: start
targetNode: orangePaddedStool
category: construction-category-furniture
description: Soft bag chair, comfortable!
icon:
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: pink padded stool
id: PinkPaddedStool
graph: Seat
startNode: start
targetNode: pinkPaddedStool
category: construction-category-furniture
description: Soft bag chair, comfortable!
icon:
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: purple padded stool
id: PurplePaddedStool
graph: Seat
startNode: start
targetNode: purplePaddedStool
category: construction-category-furniture
description: Soft bag chair, comfortable!
icon:
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: red padded stool
id: RedPaddedStool
graph: Seat
startNode: start
targetNode: redPaddedStool
category: construction-category-furniture
description: Soft bag chair, comfortable!
icon:
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
- type: construction
name: white padded stool
id: WhitePaddedStool
graph: Seat
startNode: start
targetNode: whitePaddedStool
category: construction-category-furniture
description: Soft bag chair, comfortable!
icon:
sprite: Structures/Furniture/chairs.rsi
state: pufi-box-greyscale
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
#tables
- type: construction
name: steel table
@@ -885,6 +1197,7 @@
conditions:
- !type:TileNotBlocked
# WD edit start
- type: construction
id: NoticeBoard
name: notice board
@@ -920,3 +1233,4 @@
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
# WD edit end

39
Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml
View File

@@ -36,3 +36,42 @@
doAfter: 5
- node: suit
entity: ClothingOuterSuitIan
- type: constructionGraph
id: PoppyBouquet
start: start
graph:
- node: start
edges:
- to: PoppyBouquet
steps:
- tag: Flower
name: flower
icon:
sprite: Objects/Specific/Hydroponics/poppy.rsi
state: produce
- tag: Flower
name: flower
icon:
sprite: Objects/Specific/Hydroponics/poppy.rsi
state: produce
- tag: Flower
name: flower
icon:
sprite: Objects/Specific/Hydroponics/poppy.rsi
state: produce
- tag: Flower
name: flower
icon:
sprite: Objects/Specific/Hydroponics/poppy.rsi
state: produce
- tag: Flower
name: flower
icon:
sprite: Objects/Specific/Hydroponics/poppy.rsi
state: produce
- material: Cotton
amount: 1
doAfter: 10
- node: PoppyBouquet
entity: PoppyBouquet

11
Resources/Prototypes/Recipes/Crafting/toys.yml
View File

@@ -23,3 +23,14 @@
icon:
sprite: Clothing/OuterClothing/Suits/iansuit.rsi
state: icon
- type: construction
name: PoppyBouquet
id: PoppyBouquet
graph: PoppyBouquet
startNode: start
targetNode: PoppyBouquet
category: construction-category-misc
description: A bouquet of the best flowers that you could grow. At least you tried...
icon: { sprite: Objects/Misc/poppybouquet.rsi, state: icon }
objectType: Item

8
Resources/Prototypes/Stacks/medical_stacks.yml
View File

@@ -33,6 +33,14 @@
spawn: Bloodpack
maxCount: 10
- type: stack
id: Tourniquet
name: tourniquet
icon: { sprite: "/Textures/Objects/Specific/Medical/medical.rsi", state: tourniquet }
spawn: Tourniquet
maxCount: 3 # WD
itemSize: 1
- type: stack
id: MedicatedSuture
name: medicated-suture

83
Resources/Prototypes/_White/Object/colored_armchairs.yml
View File

@@ -1,82 +1 @@
# black - #808080
# brown - #AE6716
# command - #4B709C
# security - #DE3A3A
# medical - #52B4E9
# engineering - #FFA647
# science - #F98AFF
# cargo - #D69949
# service - #9FED58
- type: entity
id: ComfyChairBlack
suffix: Black
parent: ComfyChair
components:
- type: Sprite
color: "#808080"
- type: entity
id: ComfyChairBrown
suffix: Brown
parent: ComfyChair
components:
- type: Sprite
color: "#AE6716"
- type: entity
id: ComfyChairCommand
suffix: Command
parent: ComfyChair
components:
- type: Sprite
color: "#4B709C"
- type: entity
id: ComfyChairSecurity
suffix: Security
parent: ComfyChair
components:
- type: Sprite
color: "#DE3A3A"
- type: entity
id: ComfyChairMedical
suffix: Medical
parent: ComfyChair
components:
- type: Sprite
color: "#52B4E9"
- type: entity
id: ComfyChairEngineering
suffix: Engineering
parent: ComfyChair
components:
- type: Sprite
color: "#FFA647"
- type: entity
id: ComfyChairScience
suffix: Science
parent: ComfyChair
components:
- type: Sprite
color: "#F98AFF"
- type: entity
id: ComfyChairCargo
suffix: Cargo
parent: ComfyChair
components:
- type: Sprite
color: "#D69949"
- type: entity
id: ComfyChairService
suffix: Service
parent: ComfyChair
components:
- type: Sprite
color: "#9FED58"

BIN
Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 451 B

BIN
Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 658 B

BIN
Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 646 B

26
Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json Normal file
View File

@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by github:DreamlyJack(624946166152298517)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

BIN
Resources/Textures/Objects/Misc/poppybouquet.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
Resources/Textures/Objects/Misc/poppybouquet.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
Resources/Textures/Objects/Misc/poppybouquet.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

22
Resources/Textures/Objects/Misc/poppybouquet.rsi/meta.json Normal file
View File

@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprite taked from TG station.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

BIN
Resources/Textures/Structures/Furniture/chairs.rsi/comfy-greyscale.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Resources/Textures/Structures/Furniture/chairs.rsi/comfy-overlay.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 567 B

BIN
Resources/Textures/Structures/Furniture/chairs.rsi/comfy-random.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
Resources/Textures/Structures/Furniture/chairs.rsi/comfy.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

31
Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, wooden bench by Ko4erga (discord)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png, steel-bench.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002, steel by SonicHDC, brass chair.png taken from tgstation at https://github.com/tgstation/tgstation/blob/b7e7779c19b76449c290aaf2150fb93545b1a79a/icons/obj/chairs.dmi, pufi-greyscale pufi-greyscale-overlay comfy-greyscale comfy-overlay-greyscale sprited by github:DreamlyJack(624946166152298517)",
"size": {
"x": 32,
"y": 32
@@ -31,14 +31,6 @@
"name": "chair-greyscale-knocked",
"directions": 4
},
{
"name": "comfy",
"directions": 4
},
{
"name": "comfy-overlay",
"directions": 4
},
{
"name": "meat",
"directions": 4
@@ -71,10 +63,6 @@
"name": "wooden",
"directions": 4
},
{
"name": "wooden-bench",
"directions": 4
},
{
"name": "wooden-wings",
"directions": 4
@@ -98,6 +86,23 @@
{
"name": "brass_chair",
"directions": 4
},
{
"name": "pufi-box-greyscale"
},
{
"name": "comfy-greyscale",
"directions": 4
},
{
"name": "comfy-random"
},
{
"name": "pufi-box-random"
},
{
"name": "wooden-bench",
"directions": 4
}
]
}

BIN
Resources/Textures/Structures/Furniture/chairs.rsi/pufi-box-greyscale.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 346 B

BIN
Resources/Textures/Structures/Furniture/chairs.rsi/pufi-box-random.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 862 B

11
Resources/migration.yml
View File

@@ -256,3 +256,14 @@ BodyBag_Folded: BodyBagFolded
# 2024-04-14
BookSpaceLaws: null
NewsReadCartridge: null
# 2024-07-23 WD
ComfyChairBlack: BlackComfyChair
ComfyChairBrown: BrownComfyChair
ComfyChairCommand: BlueComfyChair
ComfyChairSecurity: RedComfyChair
ComfyChairMedical: LightBlueComfyChair
ComfyChairEngineering: OrangeComfyChair
ComfyChairScience: PurpleComfyChair
ComfyChairCargo: BrownComfyChair
ComfyChairService: GreenComfyChair