Yautja fluff content update + hugger tank update #7580
+1,340
−1,860
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
…autja_machinery
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
I think that is all what whas needed
298e62b: maps/map_files/DesertDam/Desert_Dam.dmm 298e62b: maps/map_files/DesertDam/sprinkles/10.damtemple_intact.dmm 298e62b: maps/map_files/LV624/LV624.dmm 298e62b: maps/map_files/LV624/maintemple/1.intact.dmm 298e62b: maps/map_files/LV624/maintemple/2.flooded.dmm 298e62b: maps/map_files/LV624/science/10.yautja.dmm 298e62b: maps/map_files/New_Varadero/New_Varadero.dmm 298e62b: maps/predship/huntership.dmm Automatically commited by: tools\mapmerge2\fixup.py
nauticall
requested changes
Dec 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the pull request
Adds gigantic amount of assets for decorations, items, machinery etc for yautja
Mostly a port of things that i was working on from https://github.com/Cosmic-Overlord/TerraGov-Marine-Corps
Also contains a port of tgstation/TerraGov-Marine-Corps#12776
Which adds a living huggers and dead larva in destroyed tanks
Almost all new sprites by medjic (discord tag)
Skull spites by 3raz3rr (discord tag)
Statue sprites by crowford
Testing Photographs and Procedure
Screenshots & Videos
Changelog
🆑 Blundir, medjic, 3raz3rr, Crowford
add: hugger and larva tanks now actually have an alive hugger and a dead larva inside them on destroy
add: yautja: beds, chairs, microwaves, soda/chem/booze dispensers, sleeper/scanner/autodoc, freezer, refrigerator, air tank, computer, vendors, gibber, food grinder, hugger tank, closet, water/fuel tanks, juicer assets and objects
add: unique yautja full set of normal tools, replaced tools in yautja toolbelt with them
add: yautja windows
add: yautja new statues
add: decorative xeno skulls for yautja locations
fix: preds not being able to use chem master and chem dispenser on their ship
fix: preds not having access to vendors on their ship
mapadd: added tons of new assets on LV624, New Varadero, Trijent Dam, Yautja ship
/:cl: