ADD: Large Ame Jar to maps #1308
Open
Conversation
This file contains hidden or 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
okay who did that (cherry picked from commit 042f0d3)
most papers are not trash anymore (cherry picked from commit 55366dc)
* add `HighRiskItem` tag * Correct tags Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]> (cherry picked from commit 465170f)
* Add_Poppy&Lily * Add_FlowerWreath * Add_Headflowers Sprites, meta, prototype * Id_Changes * Changes * Update_Sprite * Desc_Change * Scale_Change * Sprite_Scaling (cherry picked from commit 867efe8)
(cherry picked from commit b6ec43035ace5c56d1099f1b9e4cd8862a6f872e)
* Slime plushie now squishes * Remove useSound (cherry picked from commit 8f96c77de547bcd0a5584eff6928fc08e5362c3f)
* added sprite and began implementation * fixed sprite name, fixed meta files * silly whitespace * added paper-stamp file * figured out where to add the componet, added 'credits' * spelling is hard * hmm * GAHHHHH * how did i do this again (cherry picked from commit e964e9c)
* butcherable surgery caps * readded cardboard box * butcherable now? * butcherable now? * one day ill figure this out * changed label of hyperzine syringe * removed the thing in hats.yml that wasn't supposed to be here * Update Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml --------- Co-authored-by: slarticodefast <[email protected]> (cherry picked from commit 31d5a66)
Fixed rotation shuttle consoles when anchored (cherry picked from commit f37b851810529d1737c75c6392949dd493465d46)
* Initial commit * Finalizing main changes * Addressed reviews * Fixed a few issues * Switched to using global overrides * Removed unnecessary references (cherry picked from commit efd5d644e8e5f38811a3778d0c0c73575943a236)
add a space Co-authored-by: thecopbennet <[email protected]> (cherry picked from commit cf7e680)
…#30640) (cherry picked from commit c04f717)
* Xeno walls * Fix icon smoothing for the walls * Added a bunch of items, and the map/shuttle * Fixed construction graphs * Put the map in the right place gosh * Fix shuttle walls rusting, invalid IDs, latejoin cryo, deprecated properties * Fix APC names and stuff * Updated to v1.1 (cherry picked from commit 7d48cc5)
box vox vox box box vox vox box (cherry picked from commit f760019)
make snapCardinals false for the nanotrasen sign. Co-authored-by: Zachary Yona <[email protected]> (cherry picked from commit b410f4b)
blep (cherry picked from commit 3817fe0)
* Vox sign/N2 locker update The "vox area" sign and N2 locker sprite were both taken from /vg/station. These sprites have bad racist connotations as discussed in space-wizards/space-station-14#31840, and do not fit our server culture. The new N2 locker is not a taped on piece of trash. It now also has a blue stripe to mimic the regular O2 locker and make it more distinct from fire safety closets. The new "vox area" sign sprite follows the same style as other "area indicator" signs used throughout the blue and isn't an explicit warning sign anymore. It still has "No O2" on it to fill that role though. * emogarbage adjustments --------- Co-authored-by: EmoGarbage404 <[email protected]> (cherry picked from commit 1b1d63f)
* add headset * Add icons * Meta change * fix * Revert + delete headset from locker (cherry picked from commit d642ee7)
* Made the Armory Gun Safe craftable with 10 steel, 10 plasteel, and 5 LV cables. * Changed gun safe price to 335, to match the cost of its material components. Changed gun safe to start with no accesses when constructed. * adress the review * yeah * wrah * test fail is not real --------- Co-authored-by: Ty Ashley <[email protected]> (cherry picked from commit 6c925d2)
* Ensure Arrivals Blacklist in Bluespace Locker rule * While I'm at it, stop the QSI too * fix thing I broke somehow * Every bluespace locker arrivals blacklisted * Add ArrivalsBlacklist to the prototypes too (cherry picked from commit 34e9979dc5af833ea16fd3234f2626a2403c9f54)
Thou shall not map items with "do not map" suffix (cherry picked from commit 02f7dad6f3ce7c4008e3c98d28718d9ed2cbcaf2) convert it to entity category (cherry picked from commit d15a770078af35858857078199042eeb84c835ae) slight text adjustment (cherry picked from commit 32f7ea6c29228a65a07341537c4ec7df3eeb299a) Merge branch 'master' of https://github.com/space-wizards/space-station-14 into pr/34711 Fix merge conflict (cherry picked from commit 81ff9bdda0c0ea8771b2346b8cc333a730dbfb03) Expand whitelist (cherry picked from commit b43cb069e91dbd81c6f26e69020dfa387458f538)
* init * item * requested changes * Apply suggestions from code review --------- Co-authored-by: slarticodefast <[email protected]> (cherry picked from commit 5169ad4e8f47c6b7a18aa3c58315db3952af759f)
(cherry picked from commit 4576555e5bccc033e8d334169cf33794bd444e65)
(cherry picked from commit b800d98)
* lobby name cvar * panel width * skrek * server name localization fix * comment format fix Co-authored-by: Thomas <[email protected]> * remove redundant newline Co-authored-by: Thomas <[email protected]> * string.empty Co-authored-by: Thomas <[email protected]> * use SetWidth * Update Resources/Locale/en-US/lobby/lobby-gui.ftl --------- Co-authored-by: Thomas <[email protected]> Co-authored-by: slarticodefast <[email protected]> (cherry picked from commit a55dc4d3bb006f29ca5535cc2f38878f8a498a50)
* version watermark * force version watermarks on vulture (cherry picked from commit cc74880061a35abbaa5d107edf4d4079434eef5c)
* Update ActionUIController.cs * renamed some inconsistent arguments. * removed a redundant check. * revert some variable renames to reduce the diff. (cherry picked from commit 7d64599d2d60c16303c46327b9ae2739bde81128)
(cherry picked from commit 0762f9d)
remove imagesharp and StatusEffectAddedEvent from FlashOverlay (cherry picked from commit eb4ce85)
* let FlashArea be called from shared * untroll --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 84062da)
THEYTOOKOURJOBS .yml
Update jobspawners.yml
Signed-off-by: acatrw <[email protected]>
Miscellaneous fixes
possible icon issue caused from this, will see.
fixes pda errors
Update departments.yml
…ck_loadout_and_borg_fix fixes spacer/contractor and borg linter failures
large ame cjar
…ntion-fix fix phase prevention
Tatsumoto fix (i hope)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
No description provided.