diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs index 9161137a252..4ef55cd5631 100644 --- a/Content.Server/GameTicking/GameTicker.Player.cs +++ b/Content.Server/GameTicking/GameTicker.Player.cs @@ -51,6 +51,7 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar { var data = new PlayerData(session.UserId, args.Session.Name); data.Mind = mindId; + data.Whitelisted = await _db.GetWhitelistStatusAsync(session.UserId); // Nyanotrasen - Whitelist session.Data.ContentDataUncast = data; } @@ -127,9 +128,6 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar async void SpawnWaitDb() { await _userDb.WaitLoadComplete(session); - - session.ContentData()!.Whitelisted = await _db.GetWhitelistStatusAsync(session.UserId); // Nyanotrasen - Whitelist - SpawnPlayer(session, EntityUid.Invalid); } diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index b2c79ba4cc0..28fb2602653 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -468,3 +468,11 @@ Entries: message: mystagogue has a better hat now id: 71 time: '2023-10-21T23:42:51.0000000+00:00' +- author: rosieposieeee + changes: + - type: Add + message: >- + NT has ordered extra-comfortable seating for the crew as a reward in + lieu of a raise. + id: 72 + time: '2023-10-22T23:30:40.0000000+00:00' diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml index 3a01a54101e..5263ff09525 100644 --- a/Resources/Maps/edge.yml +++ b/Resources/Maps/edge.yml @@ -3542,6 +3542,9 @@ entities: 2489: 3,-8 2490: 2,-8 2494: 8,-8 + 2630: 5,-1 + 2631: 7,-1 + 2632: 9,-1 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale180 @@ -3875,6 +3878,7 @@ entities: 2455: 7,-12 2458: 8,-11 2462: 12,-11 + 2634: 15,-1 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale270 @@ -3913,6 +3917,7 @@ entities: id: QuarterTileOverlayGreyscale270 decals: 2463: 14,-11 + 2633: 10,-1 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale270 @@ -7476,6 +7481,9 @@ entities: - pos: -41.5,-15.5 parent: 2 type: Transform + - links: + - 1290 + type: DeviceLinkSink - uid: 10939 components: - pos: -44.5,-9.5 @@ -7506,6 +7514,9 @@ entities: - pos: -35.5,-16.5 parent: 2 type: Transform + - links: + - 1292 + type: DeviceLinkSink - uid: 10946 components: - pos: -44.5,-8.5 @@ -7516,11 +7527,17 @@ entities: - pos: -39.5,-16.5 parent: 2 type: Transform + - links: + - 1281 + type: DeviceLinkSink - uid: 10949 components: - pos: -41.5,-12.5 parent: 2 type: Transform + - links: + - 1278 + type: DeviceLinkSink - uid: 14216 components: - pos: -22.5,22.5 @@ -11392,21 +11409,53 @@ entities: - pos: -40.5,-10.5 parent: 2 type: Transform + - label: CEL-1 + type: SignalTimer + - linkedPorts: + 10949: + - Start: Close + - Timer: AutoClose + - Timer: Open + type: DeviceLinkSource - uid: 1281 components: - pos: -38.5,-16.5 parent: 2 type: Transform + - label: CEL-3 + type: SignalTimer + - linkedPorts: + 10947: + - Start: Close + - Timer: AutoClose + - Timer: Open + type: DeviceLinkSource - uid: 1290 components: - pos: -41.5,-13.5 parent: 2 type: Transform + - label: CEL-2 + type: SignalTimer + - linkedPorts: + 10938: + - Start: Close + - Timer: AutoClose + - Timer: Open + type: DeviceLinkSource - uid: 1292 components: - pos: -36.5,-16.5 parent: 2 type: Transform + - label: CEL-4 + type: SignalTimer + - linkedPorts: + 10944: + - Start: Close + - Timer: AutoClose + - Timer: Open + type: DeviceLinkSource - uid: 3064 components: - rot: 3.141592653589793 rad @@ -39514,9 +39563,9 @@ entities: type: Transform - proto: CrateFreezer entities: - - uid: 10677 + - uid: 659 components: - - pos: -10.5,14.5 + - pos: 31.5,-12.5 parent: 2 type: Transform - proto: CrateFunBoxing @@ -48462,7 +48511,7 @@ entities: - pos: -61.46964,-8.387285 parent: 2 type: Transform -- proto: FoodMealTaco +- proto: FoodMealSoftTaco entities: - uid: 1247 components: @@ -70853,6 +70902,11 @@ entities: type: Transform - proto: GeigerCounter entities: + - uid: 4178 + components: + - pos: -48.71885,34.98339 + parent: 2 + type: Transform - uid: 16657 components: - pos: -20.634808,-28.440205 @@ -76913,6 +76967,21 @@ entities: ReagentId: Oxygen Quantity: 200 type: SolutionContainerManager +- proto: KitchenDeepFryer + entities: + - uid: 16309 + components: + - rot: 3.141592653589793 rad + pos: -9.5,14.5 + parent: 2 + type: Transform +- proto: KitchenElectricGrill + entities: + - uid: 17045 + components: + - pos: -8.5,17.5 + parent: 2 + type: Transform - proto: KitchenMicrowave entities: - uid: 633 @@ -76945,11 +77014,6 @@ entities: - pos: 6.5,6.5 parent: 2 type: Transform - - uid: 17045 - components: - - pos: -9.5,14.5 - parent: 2 - type: Transform - uid: 17202 components: - pos: 30.5,-12.5 @@ -77253,11 +77317,6 @@ entities: - pos: -15.5,13.5 parent: 2 type: Transform - - uid: 4178 - components: - - pos: 31.5,-12.5 - parent: 2 - type: Transform - proto: LockerHeadOfPersonnelFilled entities: - uid: 3611 @@ -78129,6 +78188,13 @@ entities: - pos: 1.5,19.5 parent: 2 type: Transform +- proto: OilJarCorn + entities: + - uid: 17210 + components: + - pos: -10.322607,14.570831 + parent: 2 + type: Transform - proto: OperatingTable entities: - uid: 4524 @@ -89815,13 +89881,6 @@ entities: - pos: -40.5,41.5 parent: 2 type: Transform -- proto: SpawnPointBorg - entities: - - uid: 17063 - components: - - pos: 14.5,7.5 - parent: 2 - type: Transform - proto: SpawnPointBotanist entities: - uid: 15410 @@ -89836,11 +89895,6 @@ entities: type: Transform - proto: SpawnPointBoxer entities: - - uid: 1189 - components: - - pos: 16.5,23.5 - parent: 2 - type: Transform - uid: 5038 components: - pos: 34.5,7.5 @@ -89894,11 +89948,6 @@ entities: type: Transform - proto: SpawnPointChef entities: - - uid: 13983 - components: - - pos: -8.5,17.5 - parent: 2 - type: Transform - uid: 15212 components: - pos: -7.5,10.5 @@ -89914,6 +89963,11 @@ entities: - pos: -7.5,16.5 parent: 2 type: Transform + - uid: 16629 + components: + - pos: -8.5,16.5 + parent: 2 + type: Transform - proto: SpawnPointChemist entities: - uid: 13140 @@ -90547,9 +90601,9 @@ entities: pos: -62.70413,-7.8477774 parent: 2 type: Transform - - uid: 16629 + - uid: 17063 components: - - pos: -9.696774,16.591303 + - pos: -10.708023,14.570831 parent: 2 type: Transform - proto: SprayBottleSpaceCleaner @@ -92276,6 +92330,11 @@ entities: - pos: -36.5,-13.5 parent: 2 type: Transform + - uid: 1189 + components: + - pos: -8.5,17.5 + parent: 2 + type: Transform - uid: 1198 components: - pos: -19.5,6.5 @@ -92427,6 +92486,11 @@ entities: - pos: -50.5,47.5 parent: 2 type: Transform + - uid: 10677 + components: + - pos: -9.5,16.5 + parent: 2 + type: Transform - uid: 10690 components: - pos: 23.5,-18.5 @@ -92509,6 +92573,11 @@ entities: pos: -38.5,17.5 parent: 2 type: Transform + - uid: 13983 + components: + - pos: -9.5,17.5 + parent: 2 + type: Transform - uid: 15453 components: - pos: 34.5,12.5 @@ -92709,12 +92778,7 @@ entities: type: Transform - uid: 657 components: - - pos: -9.5,16.5 - parent: 2 - type: Transform - - uid: 659 - components: - - pos: -9.5,17.5 + - pos: -10.5,14.5 parent: 2 type: Transform - uid: 678 @@ -93093,11 +93157,6 @@ entities: - pos: 2.5,-7.5 parent: 2 type: Transform - - uid: 16309 - components: - - pos: -9.5,14.5 - parent: 2 - type: Transform - uid: 16319 components: - pos: -41.5,39.5 diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml new file mode 100644 index 00000000000..fdaa60b4d78 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml @@ -0,0 +1,21 @@ +- type: entity + id: WindowTintedDirectional + parent: WindowDirectional + name: directional tinted window + description: Don't smudge up the glass down there. + placement: + mode: SnapgridCenter + snap: + - Window + components: + - type: Sprite + sprite: Structures/Windows/directional.rsi + state: tinted_window + - type: Tag + tags: + - ForceNoFixRotations + - type: Icon + sprite: Structures/Windows/directional.rsi + state: tinted_window + - type: Occluder + boundingBox: "-0.5,-0.5,0.5,-0.3" diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml index 82ffcfc3aec..0d7c5543d6f 100644 --- a/Resources/Prototypes/Maps/edge.yml +++ b/Resources/Prototypes/Maps/edge.yml @@ -2,7 +2,7 @@ id: Edge mapName: 'Edge' mapPath: /Maps/edge.yml - minPlayers: 15 + minPlayers: 10 maxPlayers: 80 stations: Edge: diff --git a/Resources/Prototypes/SimpleStation14/benches.yml b/Resources/Prototypes/SimpleStation14/benches.yml new file mode 100644 index 00000000000..817d1fe1e3b --- /dev/null +++ b/Resources/Prototypes/SimpleStation14/benches.yml @@ -0,0 +1,255 @@ +# Base benches +- type: entity + name: bench + id: BenchBaseMiddle + suffix: Middle + abstract: true + parent: SeatBase + description: Multiple seats spanning a single object. Truly a marvel of science. + components: + - type: Physics + bodyType: Static + - type: Transform + anchored: true + - type: Rotatable + - type: Sprite + state: middle + +# Park benches +- type: entity + name: park bench + id: BenchParkMiddle + parent: BenchBaseMiddle + components: + - type: Sprite + sprite: SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi + +- type: entity + id: BenchParkLeft + suffix: Left + parent: BenchParkMiddle + components: + - type: Sprite + state: left + +- type: entity + id: BenchParkRight + suffix: Right + parent: BenchParkMiddle + components: + - type: Sprite + state: right + +# Bamboo benches +- type: entity + name: park bench + id: BenchParkBambooMiddle + parent: BenchBaseMiddle + components: + - type: Sprite + sprite: SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi + +- type: entity + id: BenchParkBambooLeft + suffix: Left + parent: BenchParkBambooMiddle + components: + - type: Sprite + state: left + +- type: entity + id: BenchParkBambooRight + suffix: Right + parent: BenchParkBambooMiddle + components: + - type: Sprite + state: right + +# Pews +- type: entity + name: pew + id: BenchPewMiddle + parent: BenchBaseMiddle + components: + - type: Sprite + sprite: SimpleStation14/Structures/Furniture/Benches/pews.rsi + +- type: entity + id: BenchPewLeft + suffix: Left + parent: BenchPewMiddle + components: + - type: Sprite + state: left + +- type: entity + id: BenchPewRight + suffix: Right + parent: BenchPewMiddle + components: + - type: Sprite + state: right + +# Steel benches +- type: entity + name: steel bench + id: BenchSteelMiddle + parent: BenchBaseMiddle + components: + - type: Sprite + sprite: SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi + +- type: entity + id: BenchSteelLeft + suffix: Left + parent: BenchSteelMiddle + components: + - type: Sprite + state: left + +- type: entity + id: BenchSteelRight + suffix: Right + parent: BenchSteelMiddle + components: + - type: Sprite + state: right + +# White steel benches +- type: entity + name: white steel bench + id: BenchSteelWhiteMiddle + parent: BenchBaseMiddle + components: + - type: Sprite + sprite: SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi + +- type: entity + id: BenchSteelWhiteLeft + suffix: Left + parent: BenchSteelWhiteMiddle + components: + - type: Sprite + state: left + +- type: entity + id: BenchSteelWhiteRight + suffix: Right + parent: BenchSteelWhiteMiddle + components: + - type: Sprite + state: right + +# Standard sofa +- type: entity + name: sofa + id: BenchSofaMiddle + parent: BenchBaseMiddle + components: + - type: Sprite + sprite: SimpleStation14/Structures/Furniture/Benches/sofa.rsi + +- type: entity + id: BenchSofaLeft + suffix: Left + parent: BenchSofaMiddle + components: + - type: Sprite + state: left + +- type: entity + id: BenchSofaRight + suffix: Right + parent: BenchSofaMiddle + components: + - type: Sprite + state: right + +- type: entity + name: sofa + id: BenchSofaCorner + suffix: Corner +# parent: BenchSofaMiddle + placement: + mode: SnapgridCenter + components: + - type: Transform + anchored: true + - type: Rotatable + - type: Sprite + sprite: SimpleStation14/Structures/Furniture/Benches/sofa.rsi + state: corner + - type: Clickable + - type: InteractionOutline + - type: Pullable + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg + +# Corp sofa +- type: entity + name: grey sofa + id: BenchSofaCorpMiddle + parent: BenchBaseMiddle + components: + - type: Sprite + sprite: SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi + +- type: entity + id: BenchSofaCorpLeft + suffix: Left + parent: BenchSofaCorpMiddle + components: + - type: Sprite + state: left + +- type: entity + id: BenchSofaCorpRight + suffix: Right + parent: BenchSofaCorpMiddle + components: + - type: Sprite + state: right + +- type: entity + name: grey sofa + id: BenchSofaCorpCorner + suffix: Corner +# parent: BenchSofaCorpMiddle + placement: + mode: SnapgridCenter + components: + - type: Transform + anchored: true + - type: Rotatable + - type: Sprite + sprite: SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi + state: corner + - type: Clickable + - type: InteractionOutline + - type: Pullable + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/left.png new file mode 100644 index 00000000000..8122a89be08 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/left.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/meta.json b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/meta.json new file mode 100644 index 00000000000..9e46cf47f5e --- /dev/null +++ b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGStation at https://github.com/lessthnthree/tgstation/blob/2ca948b578cdb46b60d19e029782483b1218004e/icons/obj/sofa.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + }, + { + "name": "middle", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/middle.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/middle.png new file mode 100644 index 00000000000..249972dec8f Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/middle.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/right.png new file mode 100644 index 00000000000..e91037826f8 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_bamboo.rsi/right.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/left.png new file mode 100644 index 00000000000..b2e4e6650bd Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/left.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/meta.json b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/meta.json new file mode 100644 index 00000000000..9e46cf47f5e --- /dev/null +++ b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGStation at https://github.com/lessthnthree/tgstation/blob/2ca948b578cdb46b60d19e029782483b1218004e/icons/obj/sofa.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + }, + { + "name": "middle", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/middle.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/middle.png new file mode 100644 index 00000000000..31ba1d8e2dd Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/middle.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/right.png new file mode 100644 index 00000000000..35965a297e5 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/parkbench_wooden.rsi/right.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/arm_left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/arm_left.png new file mode 100644 index 00000000000..50931020c57 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/arm_left.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/arm_right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/arm_right.png new file mode 100644 index 00000000000..6be992bd27f Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/arm_right.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/left.png new file mode 100644 index 00000000000..9631b4b1714 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/left.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/meta.json b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/meta.json new file mode 100644 index 00000000000..4c2c748e3ab --- /dev/null +++ b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGStation at https://github.com/lessthnthree/tgstation/blob/2ca948b578cdb46b60d19e029782483b1218004e/icons/obj/sofa.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + }, + { + "name": "middle", + "directions": 4 + }, + { + "name": "arm_left", + "directions": 4 + }, + { + "name": "arm_right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/middle.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/middle.png new file mode 100644 index 00000000000..09939795dd1 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/middle.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/right.png new file mode 100644 index 00000000000..ea0922930fe Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/pews.rsi/right.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/arm_left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/arm_left.png new file mode 100644 index 00000000000..0c5ea7ab8f4 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/arm_left.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/arm_right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/arm_right.png new file mode 100644 index 00000000000..8989852c209 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/arm_right.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/corner.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/corner.png new file mode 100644 index 00000000000..d18237d23ab Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/corner.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/left.png new file mode 100644 index 00000000000..dd4dd8e8009 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/left.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/meta.json b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/meta.json new file mode 100644 index 00000000000..94d6013eeb5 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "TGStation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + }, + { + "name": "middle", + "directions": 4 + }, + { + "name": "corner", + "directions": 4 + }, + { + "name": "arm_left", + "directions": 4 + }, + { + "name": "arm_right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/middle.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/middle.png new file mode 100644 index 00000000000..589526aa751 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/middle.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/right.png new file mode 100644 index 00000000000..fd1d1142702 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa.rsi/right.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/arm_left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/arm_left.png new file mode 100644 index 00000000000..17debb44c06 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/arm_left.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/arm_right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/arm_right.png new file mode 100644 index 00000000000..2434e680c15 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/arm_right.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/corner.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/corner.png new file mode 100644 index 00000000000..306d354e2ce Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/corner.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/left.png new file mode 100644 index 00000000000..181e9e53de9 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/left.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/meta.json b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/meta.json new file mode 100644 index 00000000000..ad13615da13 --- /dev/null +++ b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "TGStation", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + }, + { + "name": "middle", + "directions": 4 + }, + { + "name": "corner", + "directions": 4 + }, + { + "name": "arm_left", + "directions": 4 + }, + { + "name": "arm_right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/middle.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/middle.png new file mode 100644 index 00000000000..b12c5e3a726 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/middle.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/right.png new file mode 100644 index 00000000000..78abf84955d Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/sofa_corp.rsi/right.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/left.png new file mode 100644 index 00000000000..260c7298f77 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/left.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/meta.json b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/meta.json new file mode 100644 index 00000000000..9e46cf47f5e --- /dev/null +++ b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGStation at https://github.com/lessthnthree/tgstation/blob/2ca948b578cdb46b60d19e029782483b1218004e/icons/obj/sofa.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + }, + { + "name": "middle", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/middle.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/middle.png new file mode 100644 index 00000000000..949a1e5cee3 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/middle.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/right.png new file mode 100644 index 00000000000..b6c1ef00fcb Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench.rsi/right.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/left.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/left.png new file mode 100644 index 00000000000..d456300e104 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/left.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/meta.json b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/meta.json new file mode 100644 index 00000000000..9e46cf47f5e --- /dev/null +++ b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TGStation at https://github.com/lessthnthree/tgstation/blob/2ca948b578cdb46b60d19e029782483b1218004e/icons/obj/sofa.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "left", + "directions": 4 + }, + { + "name": "right", + "directions": 4 + }, + { + "name": "middle", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/middle.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/middle.png new file mode 100644 index 00000000000..fcf97d15836 Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/middle.png differ diff --git a/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/right.png b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/right.png new file mode 100644 index 00000000000..a412a51871b Binary files /dev/null and b/Resources/Textures/SimpleStation14/Structures/Furniture/Benches/steel_bench_white.rsi/right.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index f044d43541c..9457a50e55e 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -74,7 +74,7 @@ SpeedLoaderPistolHighVelocity: SpeedLoaderPistol #MountainRockMining: AsteroidRockMining #DeltaV # 2023-08-08 -WindowTintedDirectional: WindowFrostedDirectional # DeltaV +#WindowTintedDirectional: WindowFrostedDirectional # DeltaV # 2023-08-10 SyringeSpaceacillin: null