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

t #1

Merged
merged 4,056 commits into from
Apr 23, 2021
Merged

t #1

merged 4,056 commits into from
Apr 23, 2021

Conversation

ThatFiveGuys
Copy link
Owner

Alright lets hope I dont fuck this up and its a pr from the actual master to my fork, and not the other way around.

robuddybot and others added 30 commits April 10, 2021 03:03
now with the correct file
Co-authored-by: Kubius <augu1595@hotmail.com>
* jobban runtime

* do it like this instead maye

* ok
* hats

* fixin checks maybe

* old asteroid layout is back
* adds o2 and plasma canisters

* replaces plasma

* wrong item path dumpass

* and crate name, idjot

* Update code/datums/supply_packs.dm

Co-authored-by: flrsh <59894319+flrsh@users.noreply.github.com>

Co-authored-by: flrsh <59894319+flrsh@users.noreply.github.com>
flrsh and others added 29 commits April 21, 2021 17:58
* Resprites cows (again)

* adds a white strip of pixels to hooves so you can recolor them
this might reduce Map CPU %
* Sprites & functions & oh god this needs unfucking
* Do rods, mostly. We have procs for this shit y'all
* Tile stacking/taking cleanup
* Sheet consumption stuff
* Addresses review, enlargens and changes sprites

Co-authored-by: ZeWaka <zewakagamer@gmail.com>
@ThatFiveGuys ThatFiveGuys merged commit 3f6eda8 into ThatFiveGuys:master Apr 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet