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

Merged
merged 97 commits into from
Jan 3, 2025
Merged

garrow mod 3 #476

merged 97 commits into from
Jan 3, 2025

Conversation

DexterDude
Copy link
Contributor

@DexterDude DexterDude commented Sep 26, 2024

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.

EDIT: not much else for now is a lie there's a lot changed. mostly just sovlful stuff and random misc changes related to the arrow

🆑
add: Adds a map table you can place objects on like a normal table
add: Adds new crates to the prep rooms and replaces the old wooden crowbar-able crates. Now all items are stored organically.
add: Garrow hypersleep pods now start fogged and if used, become unfogged and show the marine inside.
add: tachyon cracker
imageadd: tachyon cracker
del: Removes some items from the medical vendor, placing them on the table in the medbay
qol: Removes the different medical pouch from the vendors and replaces them with empty medpouch types, moving the medical supplies to the utility vendors.
balance: Changes default squad rangefinders to tactical monocular with a slightly nerfed range, SL binoculars now become tactical binoculars with a slightly different sprite as well as laser designating abilities
imageadd: Changes the Golden Arrow's food vendors to be more movielike and adds a new icon for drink dispensers
imageadd: Trays and food icons for an upcoming sovlful food change soontm
imageadd: New larger computers for prop usage mostly
imageadd: Adds monoculars, tactical monoculars, and tactical binoculars
maptweak: Adds 1 drink dispenser to the Golden Arrow canteen
maptweak: Repositions the cargo elevator to be north of marine prep, alongside a new supply bay which houses materials for the marines
maptweak: Repositions and redesigns briefing to be a more viable & interesting choice for the platoon commander, complete with a map table
maptweak: Merges separate platoon equipment lockers into one, placing all relevant marine supplies into it
maptweak: Removes the squad sergeant lockers, putting laser designators in the vendors
maptweak: PlatCo privacy shutters & removal of their private office, now their main room works as an office.
maptweak: Changes the cargo areas below decks to accommodate the briefing and supply elevator changes
maptweak: Restructures medbay to look nicer
maptweak: Destroys trash bins actually using the piping system so I dont have to deal with nightmare insert problems with piping not connecting properly.
mapadd: Some nightmare inserts for the Golden Arrow
/:cl:

@DexterDude DexterDude requested a review from Nanu308 as a code owner September 26, 2024 01:49
@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.

@Meatstuff882
Copy link
Contributor

Could there be a non-wooden crate added to the supply launch room? We've had a supply launch room for a while but for the most part we haven't had suitable crates to launch supplies with.

code/__DEFINES/vendors.dm Outdated Show resolved Hide resolved
code/game/objects/items/reagent_containers/food/snacks.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/misc.dm Outdated Show resolved Hide resolved
code/game/turfs/walls/wall_types.dm Show resolved Hide resolved
code/modules/vehicles/powerloader.dm Outdated Show resolved Hide resolved
@cm13-github
Copy link
Contributor

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

@Doubleumc Doubleumc dismissed their stale review December 27, 2024 20:56

Issue resolved

@cm13-github
Copy link
Contributor

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

@DexterDude DexterDude dismissed stale reviews from AndroBetel and harryob January 3, 2025 18:14

fixed

@AndroBetel AndroBetel enabled auto-merge (squash) January 3, 2025 20:34
@AndroBetel AndroBetel merged commit b6717df into cmss13-devs:master Jan 3, 2025
37 checks passed
cm13-github added a commit that referenced this pull request Jan 3, 2025
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.

7 participants