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

Replaces Xeno sprite. #2718

Merged
merged 2 commits into from
Dec 17, 2020
Merged

Conversation

SweptWasTaken
Copy link
Contributor

@SweptWasTaken SweptWasTaken commented Dec 7, 2020

PR replaces the old xeno sprite with one from colonial marines.

This is REQUIRED and cannot be helped. I picked the "digger" from this folder, as I thought it looked the best out of the rest.

If you have any suggestions for alternative sprites, please let me know.

This is what it looks like in-game.
2020-12-06_14-57-58

@DrSmugleaf
Copy link
Member

We will bikeshed this longer once urgency is no longer of the essence

@DrSmugleaf DrSmugleaf merged commit a1d9248 into space-wizards:master Dec 17, 2020
collinlunn pushed a commit to collinlunn/space-station-14 that referenced this pull request Dec 20, 2020
* Initial

* Adjusted the bounding box to be sensible
collinlunn pushed a commit to collinlunn/space-station-14 that referenced this pull request Jan 6, 2021
* Initial

* Adjusted the bounding box to be sensible
Fildrance pushed a commit to Fildrance/space-station-14 that referenced this pull request Dec 2, 2024
Fildrance pushed a commit to Fildrance/space-station-14 that referenced this pull request Dec 2, 2024
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Kirus59 pushed a commit to Kirus59/space-station-14 that referenced this pull request Dec 29, 2024
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
stalengd pushed a commit to SerbiaStrong-220/space-station-14 that referenced this pull request Dec 30, 2024
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

* fix locale (space-wizards#2688)

* Fix morgue.ftl locale (space-wizards#2707)

* Translate Upstream space-wizards#2718 (space-wizards#2719)

Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

* fix arrivals gender locale (space-wizards#2723)

* fix law locale (space-wizards#2734)

* Фикс законов боргов. (space-wizards#2754)

* replace zzz (space-wizards#2758)

* Translate Upstream space-wizards#2785 (space-wizards#2797)

Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>

* translate borer names (space-wizards#2835)

* Перевод Upstream space-wizards#2830  (space-wizards#2836)

Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>

* Translate Upstream space-wizards#2748 (space-wizards#2837)

Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>

* duplicates fix

* duplicates fix 2

* duplicates fix 3

* gender fix

* change timers desc

* delete corvax locale

* delete corvax comment

* SS220 antimov law

* Lost soul tweaks

* change comments

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: mhamster <81412348+mhamsterr@users.noreply.github.com>
Co-authored-by: Kill_Me_I_Noobs <118206719+Vonsant@users.noreply.github.com>
Co-authored-by: lapatison <lapatisonsocial@gmail.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants