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

garrow mod 3 #476

Draft
wants to merge 37 commits into
base: master
Choose a base branch
from
Draft

garrow mod 3 #476

wants to merge 37 commits into from

Conversation

DexterDude
Copy link
Contributor

Replaces all the shitty wood crates in prep with actual crates that store stuff properly, no more crowbar and ugly wood sprites everywhere. Gives most items unique cases with AWESOME overlays (ty umc, andro, and zonespace), and modifies the map a bit. large mk1 crates now exist, they store 32 magazines.

not much else for now.

@github-actions github-actions bot added Sprites Mapping Missing Changelog Maintainers always document their changes. labels Sep 26, 2024
@DexterDude DexterDude marked this pull request as draft September 26, 2024 05:33
@github-actions github-actions bot added the Sound label Oct 3, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@DexterDude
Copy link
Contributor Author

FUCK YOU

@DexterDude
Copy link
Contributor Author

STOP FUCKING FAILING

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@@ -15564,6 +15323,10 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/golden_arrow/engineering)
"cuV" = (
/obj/structure/machinery/cm_vending/gear/medic,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs to be swapped out with /obj/structure/machinery/cm_vending/clothing/medic, as the current one is the PVP medical equipment vendor

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done btw

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mapping Missing Changelog Maintainers always document their changes. Sound Sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants