]>
git.smokeofanarchy.ru Git - space-station-14.git/log
MaxSMokeSkaarj [Mon, 30 Dec 2024 15:12:35 +0000 (01:12 +1000)]
Автообновление SS14
MaxSMokeSkaarj [Mon, 30 Dec 2024 11:32:15 +0000 (21:32 +1000)]
Merge branch 'master' of ssh://github.com/space-wizards/space-station-14
Southbridge [Mon, 30 Dec 2024 07:37:05 +0000 (02:37 -0500)]
Amber Station Overhaul (#34113)
* Step 01: Remade arrivals
* Nearly finished, also added new beacons and a holopad
* Wrapped up all changes, also added a beacon for the docking arm
MaxSMokeSkaarj [Mon, 30 Dec 2024 03:30:20 +0000 (13:30 +1000)]
переименование
Dylan Hunter Whittingham [Sun, 29 Dec 2024 20:23:18 +0000 (20:23 +0000)]
Added ID entry for captain on Bagel (#34120)
added id for captain
Co-authored-by: dylanhunter <dylan2.whittingham@live.uwe.ac.uk>
Velcroboy [Sun, 29 Dec 2024 18:14:36 +0000 (12:14 -0600)]
Adds kitchen/botany-locked maints airlock (#34116)
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Valeriy [Sun, 29 Dec 2024 15:36:39 +0000 (01:36 +1000)]
Update publish_multi_request.py
MaxSMokeSkaarj [Sun, 29 Dec 2024 13:36:54 +0000 (23:36 +1000)]
Merge branch 'master' of ssh://github.com/space-wizards/space-station-14
MaxSMokeSkaarj [Sun, 29 Dec 2024 13:36:44 +0000 (23:36 +1000)]
Автообновление RobustToolbox
lzk [Sun, 29 Dec 2024 03:28:58 +0000 (04:28 +0100)]
fix interdimensional teleporter desc (#34108)
Update hand_teleporter.yml
PJBot [Sun, 29 Dec 2024 03:26:46 +0000 (03:26 +0000)]
Automatic changelog update
Velcroboy [Sun, 29 Dec 2024 03:25:39 +0000 (21:25 -0600)]
Rolling joints no longer requires a filter (#34106)
* Remove filters from joint crafting
* err
* hmmm
* guhhh
* yyyy
* whitespace
---------
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
MaxSMokeSkaarj [Sun, 29 Dec 2024 02:32:43 +0000 (12:32 +1000)]
добавление субрепо
MaxSMokeSkaarj [Sun, 29 Dec 2024 02:18:26 +0000 (12:18 +1000)]
перенос локалей в другой репо
PJBot [Sun, 29 Dec 2024 02:03:31 +0000 (02:03 +0000)]
Automatic changelog update
ArtisticRoomba [Sun, 29 Dec 2024 02:02:24 +0000 (18:02 -0800)]
New cotton baguette, crostini, chevre-chaud, bagel, and croissant foods for moffs (#33508)
* A looooooooot of new cotton foods for the moffs
* address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs)
* alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png
* update requested sprites
* change requested sprites
* address part of sloth's review, awaiting response
* address second half of review, fix magical food nutriment mitosis bug
Booblesnoot42 [Sun, 29 Dec 2024 01:56:23 +0000 (20:56 -0500)]
Corrected Cotton Dough Recipe (#33988)
PJBot [Sun, 29 Dec 2024 01:51:56 +0000 (01:51 +0000)]
Automatic changelog update
SolStar [Sun, 29 Dec 2024 01:50:49 +0000 (20:50 -0500)]
Add a guaranteed cotton pizza to pizza crates (#33997)
* add guaranteed cotton pizza to pizza crates
* saner parenting
* Use clearer suffix on cotton pizza box
PJBot [Sun, 29 Dec 2024 01:50:11 +0000 (01:50 +0000)]
Automatic changelog update
zHonys [Sun, 29 Dec 2024 01:49:05 +0000 (22:49 -0300)]
Added support so that smile can use hats (#33924)
* Added support so that smile can use hats
Changed Prototypes/Entities/Mobs/NPCs/pets.yml
Added smile_inventory_template.yml in Resources/Prototypes/inventoryTemplates
Added dir smile_displacement.rsi inside Resources/Textures/Mobs/Pets/smile.rsi
Added smile_displacement.rsi/meta.json
Added smile_displacement.rsi/head.png
* Fixed sprite path in ProtoTypes/Entities/Mobs/NPCs/pets.yml mapping to wrong smile_displacement.rsi
Fixed smile_inventory_template.yml using uiWindowPos as 1,2 instead of 0,1
Moved Resources/Textures/Mobs/Pets/smile.rsi/ to .../Pets/smile/smile.rsi/
Moved Resources/Textures/Mobs/Pets/smile.rsi/smile_displacement.rsi to .../Pets/smile/smile_displacement.rsi
* Minor fixes: removing comments and change naming
Renamed Resources/Textures/Mobs/Pets/smile/smile.rsi To .../Mobs/Pets/Smile/smile.rsi
* Removed smile_inventory_template.yml and used head_inventory_template.yml instead
github-actions[bot] [Sun, 29 Dec 2024 00:39:04 +0000 (01:39 +0100)]
Update Credits (#34109)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
PJBot [Sat, 28 Dec 2024 23:34:22 +0000 (23:34 +0000)]
Automatic changelog update
chromiumboy [Sat, 28 Dec 2024 23:33:15 +0000 (17:33 -0600)]
UI improvements for holopads (#34055)
* Initial commit
* Minor update
PursuitInAshes [Sat, 28 Dec 2024 16:52:27 +0000 (08:52 -0800)]
Removes weh.txt from Textures/Parallaxes (#34097)
Removes Unneeded File
PJBot [Sat, 28 Dec 2024 14:50:11 +0000 (14:50 +0000)]
Automatic changelog update
psykana [Sat, 28 Dec 2024 14:49:03 +0000 (15:49 +0100)]
Traitor can no longer get multiple objectives to save/help/kill the same person (#33704)
* Deduplicate traitor objectives
* Remove redundant check
PJBot [Sat, 28 Dec 2024 10:14:21 +0000 (10:14 +0000)]
Automatic changelog update
Alpaccalypse [Sat, 28 Dec 2024 10:13:13 +0000 (10:13 +0000)]
Removed Power Monitoring Computer boards from research and lathe recipes. Added default engineering sprites for atmos computer boards. (#34078)
* Defined sprites for Atmospheric Alerts and Monitoring computer boards. Added research unlocks and lathe recipes for them.
* Defined default engineering sprite for atmospherics computer boards. Removed Power Monitoring Computer board from research and lathe recipes.
* Defined engineering sprite for atmos computer boards. Removed Power Monitoring Computer board from research and lathe recipes.
lzk [Sat, 28 Dec 2024 10:00:12 +0000 (11:00 +0100)]
Fix wagging action name and desc (#34089)
Leon Friedrich [Sat, 28 Dec 2024 00:54:32 +0000 (11:54 +1100)]
Ignore audio entities in SpawnAndDeleteEntityCountTest (#34021)
PJBot [Fri, 27 Dec 2024 13:35:38 +0000 (13:35 +0000)]
Automatic changelog update
Plykiya [Fri, 27 Dec 2024 13:34:32 +0000 (05:34 -0800)]
Fix popup on handcuffing for person being handcuffed (#33639)
* Fix popup on handcuffing for person being handcuffed
* wrap onto newlines to appease the style gods
PJBot [Fri, 27 Dec 2024 12:35:38 +0000 (12:35 +0000)]
Automatic changelog update
crazybrain23 [Fri, 27 Dec 2024 12:34:30 +0000 (12:34 +0000)]
Arrivals blacklist for bluespace lockers and QSIs (#34072)
* Ensure Arrivals Blacklist in Bluespace Locker rule
* While I'm at it, stop the QSI too
* fix thing I broke somehow
* Every bluespace locker arrivals blacklisted
* Add ArrivalsBlacklist to the prototypes too
MaxSMokeSkaarj [Fri, 27 Dec 2024 02:55:15 +0000 (12:55 +1000)]
Переводы
MaxSMokeSkaarj [Fri, 27 Dec 2024 01:13:33 +0000 (11:13 +1000)]
переводы
PJBot [Thu, 26 Dec 2024 22:48:31 +0000 (22:48 +0000)]
Automatic changelog update
ArtisticRoomba [Thu, 26 Dec 2024 22:47:22 +0000 (14:47 -0800)]
Reinforced tables require welding to construct/deconstruct (#33992)
MaxSMokeSkaarj [Thu, 26 Dec 2024 13:52:13 +0000 (23:52 +1000)]
Переводы
Valeriy [Thu, 26 Dec 2024 10:30:22 +0000 (20:30 +1000)]
Merge pull request #55 from TrailBlazer41legion/patch-57
Update lattice-cutting-component.ftl
Valeriy [Thu, 26 Dec 2024 10:29:27 +0000 (20:29 +1000)]
Merge pull request #56 from TrailBlazer41legion/patch-58
Update multiple-tool-component.ftl
Valeriy [Thu, 26 Dec 2024 10:28:42 +0000 (20:28 +1000)]
Merge pull request #57 from TrailBlazer41legion/patch-59
Update tool-component.ftl
Valeriy [Thu, 26 Dec 2024 10:26:02 +0000 (20:26 +1000)]
Merge pull request #58 from TrailBlazer41legion/patch-60
Update tool-openable-component.ftl
Valeriy [Thu, 26 Dec 2024 10:15:16 +0000 (20:15 +1000)]
Merge pull request #59 from TrailBlazer41legion/patch-61
Update weldable-component.ftl
Valeriy [Thu, 26 Dec 2024 09:52:03 +0000 (19:52 +1000)]
Merge pull request #61 from TrailBlazer41legion/patch-64
Update toilet-component.ftl
Valeriy [Thu, 26 Dec 2024 09:50:42 +0000 (19:50 +1000)]
Merge pull request #62 from TrailBlazer41legion/patch-65
Update tips-system.ftl
Valeriy [Thu, 26 Dec 2024 09:50:15 +0000 (19:50 +1000)]
Merge pull request #54 from TrailBlazer41legion/patch-56
Update tool-qualities.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 08:33:27 +0000 (20:33 +1200)]
Update tips-system.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 08:32:26 +0000 (20:32 +1200)]
Update toilet-component.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 08:18:58 +0000 (20:18 +1200)]
Update weldable-component.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 08:17:13 +0000 (20:17 +1200)]
Update tool-openable-component.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 08:12:36 +0000 (20:12 +1200)]
Update tool-component.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 08:10:30 +0000 (20:10 +1200)]
Update multiple-tool-component.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 08:09:40 +0000 (20:09 +1200)]
Update lattice-cutting-component.ftl
MaxSMokeSkaarj [Thu, 26 Dec 2024 08:01:57 +0000 (18:01 +1000)]
Переводы
TrailBlazer41legion [Thu, 26 Dec 2024 08:01:41 +0000 (20:01 +1200)]
Update tool-qualities.ftl
Emisse [Thu, 26 Dec 2024 07:06:48 +0000 (00:06 -0700)]
bagel update (#34073)
Valeriy [Thu, 26 Dec 2024 07:05:42 +0000 (17:05 +1000)]
Merge pull request #51 from TrailBlazer41legion/patch-53
Update telecrystal-component.ftl
Valeriy [Thu, 26 Dec 2024 07:05:16 +0000 (17:05 +1000)]
Merge pull request #52 from TrailBlazer41legion/patch-54
Update uplink-component.ftl
Valeriy [Thu, 26 Dec 2024 07:04:49 +0000 (17:04 +1000)]
Merge pull request #53 from TrailBlazer41legion/patch-55
Update traitor-death-match-redemption-component.ftl
Valeriy [Thu, 26 Dec 2024 07:04:40 +0000 (17:04 +1000)]
Update traitor-death-match-redemption-component.ftl
Valeriy [Thu, 26 Dec 2024 07:03:04 +0000 (17:03 +1000)]
Merge pull request #50 from TrailBlazer41legion/patch-52
Update traitor-codes-component.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 07:01:16 +0000 (19:01 +1200)]
Update traitor-death-match-redemption-component.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 06:45:11 +0000 (18:45 +1200)]
Update uplink-component.ftl
Valeriy [Thu, 26 Dec 2024 06:44:10 +0000 (16:44 +1000)]
Merge pull request #49 from TrailBlazer41legion/patch-51
Update traits.ftl
Valeriy [Thu, 26 Dec 2024 06:43:56 +0000 (16:43 +1000)]
Update traits.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 06:42:35 +0000 (18:42 +1200)]
Update telecrystal-component.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 06:41:34 +0000 (18:41 +1200)]
Update traitor-codes-component.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 06:25:27 +0000 (18:25 +1200)]
Update traits.ftl
Valeriy [Thu, 26 Dec 2024 06:00:10 +0000 (16:00 +1000)]
Merge pull request #48 from TrailBlazer41legion/patch-50
Update attach-to-self-verb.ftl
Valeriy [Thu, 26 Dec 2024 05:59:39 +0000 (15:59 +1000)]
Merge pull request #47 from TrailBlazer41legion/patch-49
Update attach-to-grid-verb.ftl
Valeriy [Thu, 26 Dec 2024 05:59:16 +0000 (15:59 +1000)]
Merge pull request #46 from TrailBlazer41legion/patch-48
Update attach-to-grandparent-verb.ftl
Valeriy [Thu, 26 Dec 2024 05:58:50 +0000 (15:58 +1000)]
Merge pull request #45 from TrailBlazer41legion/patch-47
Update transfer-amount.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 05:58:08 +0000 (17:58 +1200)]
Update attach-to-self-verb.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 05:57:19 +0000 (17:57 +1200)]
Update attach-to-grid-verb.ftl
Valeriy [Thu, 26 Dec 2024 05:56:25 +0000 (15:56 +1000)]
Merge pull request #44 from TrailBlazer41legion/patch-46
Update solar-control.ftl
Valeriy [Thu, 26 Dec 2024 05:55:59 +0000 (15:55 +1000)]
Update solar-control.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 05:55:34 +0000 (17:55 +1200)]
Update attach-to-grandparent-verb.ftl
Valeriy [Thu, 26 Dec 2024 05:55:11 +0000 (15:55 +1000)]
Merge pull request #43 from TrailBlazer41legion/patch-45
Update power-apc.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 05:54:40 +0000 (17:54 +1200)]
Update transfer-amount.ftl
Valeriy [Thu, 26 Dec 2024 05:54:23 +0000 (15:54 +1000)]
Merge pull request #42 from TrailBlazer41legion/patch-44
Update navmap.ftl
Valeriy [Thu, 26 Dec 2024 05:53:58 +0000 (15:53 +1000)]
Merge pull request #41 from TrailBlazer41legion/patch-43
Update general.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 05:52:23 +0000 (17:52 +1200)]
Update solar-control.ftl
Valeriy [Thu, 26 Dec 2024 05:51:26 +0000 (15:51 +1000)]
Update general.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 05:49:41 +0000 (17:49 +1200)]
Update power-apc.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 05:39:31 +0000 (17:39 +1200)]
Update navmap.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 05:37:21 +0000 (17:37 +1200)]
Update general.ftl
MaxSMokeSkaarj [Thu, 26 Dec 2024 04:43:33 +0000 (14:43 +1000)]
Merge branch 'master' of ssh://github.com/space-wizards/space-station-14
MaxSMokeSkaarj [Thu, 26 Dec 2024 04:42:27 +0000 (14:42 +1000)]
Переводы
Valeriy [Thu, 26 Dec 2024 04:41:51 +0000 (14:41 +1000)]
Merge pull request #40 from TrailBlazer41legion/patch-42
Update actionmenu.ftl
Valeriy [Thu, 26 Dec 2024 04:41:25 +0000 (14:41 +1000)]
Merge pull request #39 from TrailBlazer41legion/patch-38
Update vending-machine-restock-component.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 04:18:04 +0000 (16:18 +1200)]
Update actionmenu.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 04:11:16 +0000 (16:11 +1200)]
Update vending-machine-restock-component.ftl
Valeriy [Thu, 26 Dec 2024 04:09:17 +0000 (14:09 +1000)]
Merge pull request #38 from TrailBlazer41legion/patch-37
Update vending-machine-component.ftl
Valeriy [Thu, 26 Dec 2024 04:08:54 +0000 (14:08 +1000)]
Merge pull request #37 from TrailBlazer41legion/patch-36
Update ventriloquist.ftl
Valeriy [Thu, 26 Dec 2024 04:08:16 +0000 (14:08 +1000)]
Merge pull request #36 from TrailBlazer41legion/patch-35
Update verbs.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 04:07:16 +0000 (16:07 +1200)]
Update vending-machine-component.ftl
TrailBlazer41legion [Thu, 26 Dec 2024 04:04:45 +0000 (16:04 +1200)]
Update ventriloquist.ftl
БОЛВАНЫ!
Valeriy [Thu, 26 Dec 2024 04:00:10 +0000 (14:00 +1000)]
Merge pull request #35 from TrailBlazer41legion/patch-34
Update verb-system.ftl