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.

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

Texture fixes #81

Closed
wants to merge 99 commits into from
Closed

Conversation

MetalSage
Copy link
Contributor

@MetalSage MetalSage commented Sep 9, 2024

О PR

  • Исправил текстуры шлюзов
  • Исправил текстуры ломов
  • Исправил текстуру эмитера в консоли заказов

drakewill-CRL and others added 30 commits September 5, 2024 18:43
* Add a kit for botanists to do some limited chemistry to the NutriMax. Intended to help new botanists learn in-game about chemistry.

* remove exclamation marks from names

* naming fix

* Rejected trademark application for 'Farmers Helper'.

---------

Co-authored-by: PraxisMapper <[email protected]>
* Fix typo in agri-chem manual

* Unremove my added newline
* Cleanup books.yml

* yeah

* shame
* Vox sign/N2 locker update

The "vox area" sign and N2 locker sprite were both taken from /vg/station. These sprites have bad racist connotations as discussed in space-wizards/space-station-14#31840, and do not fit our server culture.

The new N2 locker is not a taped on piece of trash. It now also has a blue stripe to mimic the regular O2 locker and make it more distinct from fire safety closets.

The new "vox area" sign sprite follows the same style as other "area indicator" signs used throughout the blue and isn't an explicit warning sign anymore. It still has "No O2" on it to fill that role though.

* emogarbage adjustments

---------

Co-authored-by: EmoGarbage404 <[email protected]>
Pizza box now contains cotton pizza

Co-authored-by: Ekkosangen <[email protected]>
* A

* B

* C

* D

* Update TechAnomalySystem.cs

* idle anim

* Update meta.json

* new animation
…, and I am mad (#31246)

* Fix logging of GetWebhook errors

Yeah let's just not log the error only stack trace.

* I have spent more time today cleaning up garbage than coding new shit, and I am mad

Cleans up the custom vote Discord webhook code because I *happened* to lay my eyes on how completely terrible it was and immediately found an obvious bug with it.

Also did basic QA because jesus christ: it more clearly reports pending votes, properly indicates cancelled votes, improves footer formatting, better error logging, all the usual shit.

Requires space-wizards/RobustToolbox#5375 to avoid test failures
* Mineral Scanner

* doink

* review

* sunday funday

* review and fix bugs i think?

* Update MiningOverlay.cs
* Fix ai upload console itemslot whitelist

* aw man
vox laugh not underwater
* fix shotgun sprite

* fix take 2
pest events reorganized and snails spawn
* break pull at sleep

* TryStopPull without user

---------

Co-authored-by: YourUsername <[email protected]>
…tegories: [ HideSpawnMenu ] + self recharge removed + 1 more shot + normal recharge speed (#31235)

* narrow nerf

* last instance of nospawn gone

* removes self recharge

* 8 shots, less recharge time
* Add justice helm

* backslash moment

* spinny light

* remove power cell from recipe
Deleting binary key

Silicon supremacy!
PJBot and others added 26 commits September 8, 2024 10:23
* some contra fixes

* whistles change
Add random sentience to calm events
* Update PULL_REQUEST_TEMPLATE.md

* Update PULL_REQUEST_TEMPLATE.md 2

* Update PULL_REQUEST_TEMPLATE.md 3

* Update PULL_REQUEST_TEMPLATE.md 3

* Update PULL_REQUEST_TEMPLATE.md 5

* slart suggestions

Co-authored-by: slarticodefast <[email protected]>

* paste

---------

Co-authored-by: slarticodefast <[email protected]>
* AlmostCertainlyDoesntWork

* Please work

* maybe work

* emptycommit

* test

* testest

* Empty-Commit

* Uplink grammar/typos fix
* Add SetEntity(Owner)  so can view APC sprite in UI

* bump apc version flavor text

---------

Co-authored-by: TIMMY <[email protected]>
added stuff
Update moffra.png
…ative fibers (#31886)

* Adds fibers-insulative-frayed to fibers.ftl and relevant fibers-insulative-frayed components to budget insuls

* +1 to the "different types of fibers in the game" info under the forensics guidebook entry (pray this is actually correct and accurate)
…on-14 into upstream

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.