diff --git a/Resources/Changelog/ChangelogSyndie.yml b/Resources/Changelog/ChangelogSyndie.yml index 83722c17fbb..0059bccba66 100644 --- a/Resources/Changelog/ChangelogSyndie.yml +++ b/Resources/Changelog/ChangelogSyndie.yml @@ -1,57 +1,4 @@ Entries: -- author: lapatison - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0430\u0437\ - \u043B\u0438\u0447\u043D\u044B\u0435 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\ - \u044B" - type: Add - id: 220 - time: '2022-08-16T16:26:53.0000000+00:00' -- author: lapatison - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\u0440\ - \u0435\u0432\u043E\u0434\u044B" - type: Add - id: 221 - time: '2022-08-16T16:42:20.0000000+00:00' -- author: Morty - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\ - \u043B\u0435\u0434\u043D\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\ - \u043D\u0438\u044F" - type: Add - id: 222 - time: '2022-08-17T07:30:50.0000000+00:00' -- author: lapatison - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\u0440\ - \u0435\u0432\u043E\u0434\u044B" - type: Add - id: 223 - time: '2022-08-17T20:10:56.0000000+00:00' -- author: lapatison - changes: - - message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u044B \u0442\u0430\ - \u0431\u043B\u0438\u0447\u043A\u0438" - type: Tweak - id: 224 - time: '2022-08-18T16:31:19.0000000+00:00' -- author: Morty - changes: - - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u0441\ - \u043B\u0435\u0434\u043D\u0438\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\u0435\ - \u043D\u0438\u044F" - type: Add - id: 225 - time: '2022-08-19T20:09:21.0000000+00:00' -- author: lapatison - changes: - - message: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u043E \u043F\u043E\ - \u0441\u043B\u0435\u0434\u043D\u0435\u0435 \u043E\u0431\u043D\u043E\u0432\u043B\ - \u0435\u043D\u0438\u0435" - type: Tweak - id: 226 - time: '2022-08-19T21:28:25.0000000+00:00' - author: lapatison changes: - message: "\u041F\u043E\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u0435\ @@ -4551,3 +4498,65 @@ id: 719 time: '2024-11-30T10:45:49.0000000+00:00' url: https://github.com/space-syndicate/space-station-14/pull/2818 +- author: MureixloL, KREKS, SonicDC + changes: + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\ + \u0439\u0442\u044B!" + type: Tweak + id: 720 + time: '2024-12-11T23:32:29.0000000+00:00' + url: https://github.com/space-syndicate/space-station-14/pull/2802 +- author: TiFeRi + changes: + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u043A\u0430\u0440\u0442\ + \u0430 Paper." + type: Tweak + id: 721 + time: '2024-12-01T17:32:59.0000000+00:00' + url: https://github.com/space-syndicate/space-station-14/pull/2822 +- author: Litogin + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u0442\ + \u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0435 \u0443\u043D\u0438\u0444\ + \u043E\u0440\u043C\u044B \u043D\u0430 \u0436\u0435\u043D\u0441\u043A\u0438\u0445\ + \ \u0432\u0435\u0440\u0441\u0438\u044F\u0445 \u0443\u043D\u0430\u0442\u0445\u043E\ + \u0432 \u0438 \u0432\u0443\u043B\u044C\u043F" + type: Fix + id: 722 + time: '2024-12-05T23:10:01.0000000+00:00' + url: https://github.com/space-syndicate/space-station-14/pull/2832 +- author: Ko4erga + changes: + - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\ + \u0442\u0430 Tushkan." + type: Tweak + id: 723 + time: '2024-12-02T12:51:18.0000000+00:00' + url: https://github.com/space-syndicate/space-station-14/pull/2826 +- author: doctor_jake + changes: + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0430 \u043A\u0430\u0440\u0442\ + \u0430 Silly." + type: Tweak + id: 724 + time: '2024-11-30T15:45:31.0000000+00:00' + url: https://github.com/space-syndicate/space-station-14/pull/2809 +- author: Ko4erga + changes: + - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\ + \u0442\u0430 Pilgrim." + type: Tweak + id: 725 + time: '2024-11-30T15:45:52.0000000+00:00' + url: https://github.com/space-syndicate/space-station-14/pull/2821 +- author: Ko4erga + changes: + - message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0430 \u043A\u0430\u0440\ + \u0442\u0430 Pilgrim." + type: Tweak + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u043F\u0430\u0440\u0430\u043B\ + \u0430\u043A\u0441 \u043D\u0430 Silly." + type: Tweak + id: 726 + time: '2024-12-03T07:23:23.0000000+00:00' + url: https://github.com/space-syndicate/space-station-14/pull/2828 diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl index 2e3c02c9f6d..a55d5dd08ac 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl @@ -1,2 +1,4 @@ ent-SpawnPointPilot = pilot .desc = { ent-SpawnPointJobBase.desc } +ent-SpawnPointSurgeon = surgeon + .desc = { ent-SpawnPointJobBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl index 1fe4b2d1fa4..67a91f0ac9f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/markers/spawners/jobs.ftl @@ -1,2 +1,4 @@ ent-SpawnPointPilot = пилот .desc = { ent-SpawnPointJobBase.desc } +ent-SpawnPointSurgeon = хирург + .desc = { ent-SpawnPointJobBase.desc } diff --git a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml index 0ba0637d366..e23d3c9de75 100644 --- a/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Corvax/Entities/Markers/Spawners/jobs.yml @@ -7,5 +7,15 @@ job_id: Pilot - type: Sprite layers: - - state: green - - state: seniorofficer + - state: green + - state: seniorofficer + +- type: entity + id: SpawnPointSurgeon + parent: SpawnPointJobBase + name: surgeon + components: + - type: Sprite + layers: + - state: green + - state: virologist diff --git a/Resources/Prototypes/Corvax/Objectives/objectiveGroups.yml b/Resources/Prototypes/Corvax/Objectives/objectiveGroups.yml index f5c264fd83b..f0d39531292 100644 --- a/Resources/Prototypes/Corvax/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Corvax/Objectives/objectiveGroups.yml @@ -1,4 +1,4 @@ - type: weightedRandom id: TraitorObjectiveGroupNukieDisk weights: - NukeDiskStealObjective: 0.05 \ No newline at end of file + NukeDiskStealObjective: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Corvax/lobbyscreens.yml b/Resources/Prototypes/Corvax/lobbyscreens.yml index 2d90b235743..5edb6be3e64 100644 --- a/Resources/Prototypes/Corvax/lobbyscreens.yml +++ b/Resources/Prototypes/Corvax/lobbyscreens.yml @@ -134,45 +134,45 @@ id: GrayTide background: /Textures/Corvax/LobbyScreens/gray-tide.png -#- type: lobbyBackground -# id: NewYearBar -# background: /Textures/Corvax/LobbyScreens/new-year-bar.png +- type: lobbyBackground + id: NewYearBar + background: /Textures/Corvax/LobbyScreens/new-year-bar.png -#- type: lobbyBackground -# id: NewYearSec -# background: /Textures/Corvax/LobbyScreens/new-year-sec.png +- type: lobbyBackground + id: NewYearSec + background: /Textures/Corvax/LobbyScreens/new-year-sec.png -#- type: lobbyBackground -# id: NewYearSave -# background: /Textures/Corvax/LobbyScreens/new-year-save.png +- type: lobbyBackground + id: NewYearSave + background: /Textures/Corvax/LobbyScreens/new-year-save.png -#- type: lobbyBackground -# id: NewYearComfort -# background: /Textures/Corvax/LobbyScreens/new-year-comfort.png +- type: lobbyBackground + id: NewYearComfort + background: /Textures/Corvax/LobbyScreens/new-year-comfort.png -#- type: lobbyBackground -# id: NewYearParty -# background: /Textures/Corvax/LobbyScreens/new-year-party.png +- type: lobbyBackground + id: NewYearParty + background: /Textures/Corvax/LobbyScreens/new-year-party.png -#- type: lobbyBackground -# id: NewYearPine -# background: /Textures/Corvax/LobbyScreens/new-year-pine.png +- type: lobbyBackground + id: NewYearPine + background: /Textures/Corvax/LobbyScreens/new-year-pine.png -#- type: lobbyBackground -# id: NewYearExplosion -# background: /Textures/Corvax/LobbyScreens/new-year-explosion.png +- type: lobbyBackground + id: NewYearExplosion + background: /Textures/Corvax/LobbyScreens/new-year-explosion.png - type: lobbyBackground id: SpaceNuke background: /Textures/Corvax/LobbyScreens/space-nuke.png -#- type: lobbyBackground -# id: NewYearPenguins -# background: /Textures/Corvax/LobbyScreens/new-year-penguins.png +- type: lobbyBackground + id: NewYearPenguins + background: /Textures/Corvax/LobbyScreens/new-year-penguins.png -#- type: lobbyBackground -# id: NewYearNuke -# background: /Textures/Corvax/LobbyScreens/new-year-nuke.png +- type: lobbyBackground + id: NewYearNuke + background: /Textures/Corvax/LobbyScreens/new-year-nuke.png - type: lobbyBackground id: ArnoldIntelligence diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 2bf1b2707fd..5e17e618407 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -6,7 +6,7 @@ TraitorObjectiveGroupKill: 1 TraitorObjectiveGroupState: 1 #As in, something about your character. Alive, dead, arrested, gained an ability... TraitorObjectiveGroupSocial: 1 #Involves helping/harming others without killing them or stealing their stuff - TraitorObjectiveGroupNukieDisk: 1 #Corvax + TraitorObjectiveGroupNukieDisk: 0.05 #Corvax - type: weightedRandom id: TraitorObjectiveGroupSteal diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png index 7c6872e738b..b7937ab4317 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png index 8fb01d6d97c..2c96ad2c169 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png index 3d5d498bbac..0943fffdb24 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png index 73e19be6581..e58baabf754 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json index 1fc5a9bb676..d99652ef975 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by emisse, monkey by Ko4erga (discord)", + "copyright": "resprited by @mishutka09, monkey by Ko4erga (discord)", "size": { "x": 32, "y": 32 @@ -27,4 +27,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png index c7acb2b4a05..23cc1772f1a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png index 31a1a06958d..d9e788a42b9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-left.png index 3d5d498bbac..e29579d845f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-right.png index 73e19be6581..93d2bd4d7a9 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json index b895d671225..5f73a0ef26b 100644 --- a/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and inhand modified by emisse, monkey made by brainfood1183 (github) for ss14", + "copyright": "resprited by @mishutka09, monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING.png index 95f66fab849..f82846a950e 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/icon.png index 91cad641b2e..5d825dd6fa8 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/inhand-left.png index 5d472ec6900..c1e900347e3 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/inhand-right.png index 477643c9328..8f70a03cf4a 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/meta.json index 14b769a190a..80f927ae90e 100644 --- a/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Scrubs/blue.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, derivative monkey made by brainfood1183 (github) for ss14", + "copyright": "Resprited by @mishutka09, derivative monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING.png index 9323083108e..f5839d10c81 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/icon.png index 688b52822e0..923a1cbe57c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/inhand-left.png index 409a0548728..889ae449749 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/inhand-right.png index 2d5175903de..2cf009f0a8d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/meta.json index 14b769a190a..80f927ae90e 100644 --- a/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Scrubs/green.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, derivative monkey made by brainfood1183 (github) for ss14", + "copyright": "Resprited by @mishutka09, derivative monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING.png index 588b96e1b3a..ef3d4ad3219 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/icon.png index 078c780eebb..c8d4a5576ca 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/inhand-left.png index 759d32a4a4e..566387e527d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/inhand-right.png index 3e8970526c7..b242aa8be7d 100644 Binary files a/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/meta.json index 14b769a190a..80f927ae90e 100644 --- a/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/Scrubs/purple.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, derivative monkey made by brainfood1183 (github) for ss14", + "copyright": "Resprited by @mishutka09, derivative monkey made by brainfood1183 (github) for ss14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed.png index c5dbd975b97..ce88c375c28 100644 Binary files a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed.png and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed.png differ diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed_buckled.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed_buckled.png index 61330875a56..9b11a143bad 100644 Binary files a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed_buckled.png and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed_buckled.png differ diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed_folded.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed_folded.png index c0a7bec080a..c8238881cd6 100644 Binary files a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed_folded.png and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/cheap_rollerbed_folded.png differ diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed.png index 809a1b04996..11cde067f0a 100644 Binary files a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed.png and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed.png differ diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed_buckled.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed_buckled.png index afad4c3fe01..277f80c6ccc 100644 Binary files a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed_buckled.png and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed_buckled.png differ diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed_folded.png b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed_folded.png index f1e3a2b8202..aa72b7e84f1 100644 Binary files a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed_folded.png and b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/emergency_rollerbed_folded.png differ diff --git a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json index 669e74f8e2d..2ec9d9f9a2e 100644 --- a/Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json @@ -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/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0, Baystation 12 and AuroraStation", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/59fe5dd2841f47a8abce60eecb9fafad34282bd0, Baystation 12 and AuroraStation, emergency and cheap Resprite by KREKS", "size": { "x": 32, "y": 32