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

Jump to bottom

Пластиковые бутылки #75

Merged
merged 40 commits into from
Feb 28, 2023
Merged

Пластиковые бутылки #75

merged 40 commits into from
Feb 28, 2023

Conversation

GuakeTheAcinid
Copy link

@GuakeTheAcinid GuakeTheAcinid commented Feb 27, 2023 •
edited by AruMoon
Loading

Они здесь! Они реальны! Даа!

About the PR

Добавляет пластиковые бутылки. Работают как мензурки, но из пластика и с крышкой. Больше не страшно тащить химикаты в руках!

Media

  • Сюда были добавлены скриншоты, показывающие само существование бутылок, их использование, факт спауна в соответствующих ящиках и шкафах:
    image
    И возможность крафта таковых в протолате или медицинском ТехФабе
    image

Changelog
🆑

  • add: Добавлен прототип пластиковых бутылок большого и малого размера, коробка из под них, текстуры для бутылок и их коробки, рецепт для протолата и мед. ТехФаба, перевод для бутылок и коробки из под них
  • tweak: Цена ящика набора Химического оборудования 750 изменена на 900 для баланса цены; изменён спаун для ящика химического оборудования и шкафов химиков, чтобы в них появлялась коробка из под бутылок

Emisse and others added 25 commits February 26, 2023 18:23
@Emisse
nukie planet fixe a unpowered door to dorm (space-wizards#14277)
a6d0c9b
@metalgearsloth
Fix rsi sprite access for verbs (space-wizards#14284)
44fb8a9
@PJBot
Automatic changelog update
6e2db84
@EmoGarbage404 @metalgearsloth
Predict entitystorage (space-wizards#14082)
a5b9cec 
Co-authored-by: metalgearsloth <[email protected]>
@Cheackraze @0x6273
Crayonsystem cleanup (space-wizards#13400)
6ac3c4d 
Co-authored-by: 0x6273 <[email protected]>
@PJB3005
Send changelog to Discord webhook. (space-wizards#14292)
61a671b
@PJBot
Automatic changelog update
0e8b3b9
@PJB3005
Oopsied the workflow file, awesome. (space-wizards#14293)
587e173
@PJB3005
Fix GITHUB_REPOSITORY in changelog pusher (space-wizards#14294)
24121c1
@metalgearsloth
Sync lava sprites (space-wizards#14059)
5d44386
@GuakeTheAcinid
Plastic bottle textures
ca96df4 
Textures for small and LARGE plastic bottles and meta.json for them
@GuakeTheAcinid
Box of Plastic bottles Icon
c484b4e
@GuakeTheAcinid
Box of Plastic bottles Meta.json
b355798
@GuakeTheAcinid
Box of Plastic bottles Texture
788b526
@GuakeTheAcinid
Box of Plastic bottles texture Meta.json
0a88490
@GuakeTheAcinid
Plastic bottles for chemists! Yey! They are here!
80d825d 
Finally THE CORRECT DIFF YEEEEEEAAAAH!
@GuakeTheAcinid
Plastic bottles for protolathe and Medical TechFab
9c54274
@GuakeTheAcinid
Plastic bottles as technology for R&D
0689804
@GuakeTheAcinid
Plastic bottles recipes for protolathe
307d48a
@GuakeTheAcinid
Box of bottles as spawn in Chemists' lockers
595ed2d
@GuakeTheAcinid
Box of bottles as spawn in ChemCrates
3382a64
@GuakeTheAcinid
Box of bottles now contains bottles owo
16a4132
@GuakeTheAcinid
Cargo ChemCrate 750 -> 900
41a4feb
@GuakeTheAcinid
Перевод пластиковых бутылок
bf17a3f
@GuakeTheAcinid
Перевод Коробки из под пластиковых бутылок
84d6393
@github-actions
Copy link

github-actions bot commented Feb 27, 2023 •
edited
Loading

RSI Diff Bot; head commit 1694498 merging into 0e5b90b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Specific/Chemistry/bottle_large.rsi

State Old New Status
bottlelarge Added
bottlelarge1 Added
bottlelarge2 Added
bottlelarge3 Added
bottlelarge4 Added
bottlelarge5 Added
bottlelarge6 Added

Resources/Textures/Objects/Specific/Chemistry/bottle_small.rsi

State Old New Status
bottlesmall Added
bottlesmall1 Added
bottlesmall2 Added
bottlesmall3 Added
bottlesmall4 Added
bottlesmall5 Added
bottlesmall6 Added

Resources/Textures/Objects/Storage/boxes.rsi

State Old New Status
bottleplastic Added

Resources/Textures/Objects/Storage/boxicons.rsi

State Old New Status
bottleplastic Added

Edit: diff updated after 1694498

Emisse and others added 2 commits February 27, 2023 15:17
@Emisse
Bagel Station Evac Shuttle Lox (space-wizards#14307)
68cba24 
* proto

* mapfile

* posters n shit

* gyroscope oop
@Interrobang01
Add cooldown to hypospray (space-wizards#13953)
553a46f 
* added cooldown to hypospray

* moved one of the 'using's over a space

* changed all cooldowns to 0.5 seconds

* resolved suggestions

* minor comment change
IamVelcroboy and others added 13 commits February 27, 2023 13:20
@IamVelcroboy @BurningRash
Medical Wall Locker Hotfix (space-wizards#14247)
32d6dbd 
Co-authored-by: Jeff <[email protected]>
@PJBot
Automatic changelog update
374e236
@Scribbles0
NT Evac Raven (space-wizards#14286)
d34d1ff 
* raven shuttle

* add missing blast door in sec compartment

* name

* extinguishers and emer lights
@Scribbles0
Update Raven dock (space-wizards#14311)
809959e 
* update raven dock

* name
@Emisse
siofjaosd (space-wizards#14313)
e402d28
@metalgearsloth
Fix ContentTileDefinition prototype reloads (space-wizards#14080)
25f5137
@PJBot
Automatic changelog update
b5b2588
@AruMoon
Merge branch 'master' of github.com:space-wizards/space-station-14 in…
5739bcb 
…to master-ru
@AruMoon
Update english locale files
a31d379
@AruMoon
Translate upstream update
bfe561d
@AruMoon
Cancel in progress mirror job to prevent losing changes on multiple u…
4bf5424 
…nmirrored commits
@AruMoon
oops
42e5963
@GuakeTheAcinid
Merge branch 'Workbench-Team:master-ru' into Tweaks&QoL
1694498
@AruMoon AruMoon merged commit 7933229 into Workbench-Team:arumoon-server Feb 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Map Changes: Sprites
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.