Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Принтер документов. Дубль 2. #1832

Merged
merged 29 commits into from
Feb 2, 2024
Merged

Принтер документов. Дубль 2. #1832

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
534f107
setup
TheShuEd Dec 29, 2023
597d0c0
fix review
TheShuEd Dec 29, 2023
dd22cee
fix?
TheShuEd Dec 30, 2023
7f428fa
now u can build it
TheShuEd Dec 30, 2023
01e3129
fix!
TheShuEd Dec 30, 2023
ba7d027
раскидал по папкам
TheShuEd Dec 31, 2023
e7feddd
Merge branch 'space-syndicate:master' into printer
TheShuEd Dec 31, 2023
c808720
Merge branch 'master' into printer
TheShuEd Jan 4, 2024
4b14386
Update migration.yml
TheShuEd Jan 19, 2024
9966f47
Update Resources/migration.yml
TheShuEd Jan 20, 2024
f2a0e16
перевел названия на англ, обновил текстуру
TheShuEd Jan 29, 2024
99842e9
fix meta
TheShuEd Jan 29, 2024
05f46fb
Merge branch 'master-syndie' into fork/printer
Morb0 Feb 1, 2024
a08d4a1
apply review
lzk228 Jan 31, 2024
1867e4c
2
lzk228 Feb 1, 2024
18bcd91
Merge branch 'printer' of https://github.com/TheShuEd/corvax-ed-work …
TheShuEd Feb 1, 2024
f30d8e5
Merge pull request #3 from lzk228/printer
TheShuEd Feb 1, 2024
ca5f2e3
Update Resources/Prototypes/Corvax/Entities/Objects/Misc/flatpacks.yml
TheShuEd Feb 1, 2024
29707a2
UpadateForm
Krosus777 Feb 1, 2024
f7e77ca
Merge branch 'printer2' of https://github.com/TheShuEd/corvax-ed-work…
Krosus777 Feb 1, 2024
d56077e
Merge pull request #4 from Krosus777/UpdateForm
TheShuEd Feb 1, 2024
987874c
Fix#1
Krosus777 Feb 1, 2024
aa3ee7d
fix#2
Krosus777 Feb 1, 2024
7778cac
Merge pull request #5 from Krosus777/UpdateForm
TheShuEd Feb 1, 2024
e56e10a
Fix3
Krosus777 Feb 2, 2024
6ed28bb
fix4
Krosus777 Feb 2, 2024
e20d358
Fix5
Krosus777 Feb 2, 2024
7082e33
Merge pull request #6 from Krosus777/UpdateForm
TheShuEd Feb 2, 2024
c41aa7f
Fix6 (#7)
Krosus777 Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
877 changes: 877 additions & 0 deletions Resources/Locale/ru-RU/corvax/paper/doc-printer.ftl
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- id: RubberStampQm
- id: ClothingHeadsetAltCargo
- id: BoxEncryptionKeyCargo
- id: PrinterDocFlatpack # Corvax-Printer

- type: entity
id: LockerCaptainFilledHardsuit
Expand Down Expand Up @@ -103,6 +104,7 @@
prob: 0.5
- id: ClothingOuterCoatHOP # Corvax-Resprite
- id: AccessConfigurator
- id: PrinterDocFlatpack # Corvax-Printer

- type: entity
id: LockerChiefEngineerFilledHardsuit
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
ClothingUniformJumpskirtLibrarian: 3
ClothingShoesBootsLaceup: 2
ClothingHeadsetService: 2

PrinterDocFlatpack: 2 # Corvax-Printer
Loading
Loading