[pull] master from Nyanotrasen:master #73
+1,863,760
−1,835,489
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
(cherry picked from commit 78939b4)
(cherry picked from commit aadcc48)
(cherry picked from commit 9c976d5)
* fix * left over comment (cherry picked from commit cacf26d)
(cherry picked from commit 276f181)
* Added Lead & Zinc, Nerfed Licoxide. * Updated physical descriptions. * Fixed my stupid dumb error. (cherry picked from commit d0a9cce)
Co-authored-by: keronshb <[email protected]> (cherry picked from commit 9d84452)
Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 777c7dc)
- Add turret spawns. - Mark warding tower as anchored. (cherry picked from commit 982e8f3)
* Syndicate sponge for uplink * Fix yaml error * Made changes mentioned in review * Made changes according to reviews (cherry picked from commit ec58d2e)
* Syndicate sponge nerf * Fixed Indentation * Made it exclusive to zookeeper, chef and scientist (cherry picked from commit b070d98)
Signed-off-by: c4llv07e <[email protected]> (cherry picked from commit 6e66866)
* [Clothing] Syndicate cool. * s1 * s2 * Update meta.json * new banner (cherry picked from commit 2cb700b)
* [VM] SyndieDrobe * "Death to NT" * Animation update (cherry picked from commit bc79e94)
(cherry picked from commit 8b1af36)
* interrogator lamp Ultra-bright lamp for the bad cop * interrogator lamp update -Reduced energy consumption, improved base energy source for extra thorough interrogation -The Basic Rights of Sentient Beings have been respected by reducing the number of flash charges. Now they slowly regenerate over time. -The chief engineer fixed the charge indication, although there was a conscript on the shift. It may not work as intended (cherry picked from commit 1aab1ee)
* Adds Advanced ointment and bruisepack recipes * Changes the sprites to the ones from /tg * Changed names and sprites, slight tweaks * Formatting * Solve Conflict * Formatting * Fix issues found in check * Fix Oopsie (cherry picked from commit b4c2514)
* minibomb buff * redux (cherry picked from commit 979e283)
* centcom pda and other ID changes * remove duplicate pda (cherry picked from commit 1f55391)
…722) (cherry picked from commit 84bd21b)
* Disposable turret for uplink * Adjusted firerate and ammo capacity * Fix funny yaml mistake * adjust cargo value * Fix price for real this time * Made it buyable for scientist traitors (cherry picked from commit 579b009)
* tweaked stats * change comment (cherry picked from commit 657d157)
* Food HUD Icons and Onion Goggles * Added meta.json to food_icons.rsi --------- Co-authored-by: Derby <Derby@ss14> (cherry picked from commit b3a1b97)
(cherry picked from commit 0ea6ec1)
* animal masks Seven new animal masks. Let the masquerade be more diverse. * maint fluff spawner (cherry picked from commit f2ae568)
* adds spacemen figurines * dode dode dode * dodeulation * you know what they say * bunger * bunger bunger bunger bunger bunger (cherry picked from commit 9a32e4d)
(cherry picked from commit f4dbb4d)
* Make anchoring nukes require enough nearby floor * Remove unused Anchorable event subscriptions The nuke doesn't have Anchorable so this never comes up. (cherry picked from commit 7d08061)
(cherry picked from commit cc8b642)
(cherry picked from commit d571cde)
Co-authored-by: Jeff <[email protected]>
Co-authored-by: Jeff <[email protected]>
Adjusted armory contents to include suit storage units instead of having hardsuits/air tanks on racks, and mk58 safes instead of the weapon/magazines on racks. Also made sure janitors have trash bags in their offices.
Co-authored-by: Jeff <[email protected]>
* Add Basic Parts to Engi Techfab Adds Capacitors, Matter-bins, and Micro-Manipulators to engineering Techfab static recipes. * Deleting Stock Parts in dynamic recipes since the research for them doesn't exist. * Fixes I forgot * Fixes I forgot 2 * Update lathe.yml
(cherry picked from commit cc5d83f)
Cherrypick 2023-08-08
* Map Edits * HoS Shutters * Delete invalid * Deploy D.D.S.(Disposal Defense System) --------- Co-authored-by: Jeff <[email protected]>
Updated stations to have mass-media computers. Updated NTSV Tote to have a mass scanner and side blast doors.
Co-authored-by: moonheart08 <[email protected]> (cherry picked from commit e9890a8)
Bugfix 2023-08-19
* Map Tweaks * Add additional warp points --------- Co-authored-by: Jeff <[email protected]>
Co-authored-by: Jeff <[email protected]>
Adds the "PreventPilot" component to both stations, and replaces chemical dispensers at medical outposts (not chemistry) with ChemVends.
Gave cargo jobs (QM & mail carrier) service access, and gave assistants maintenance access.
* Mk32 Glowup Improved the Mk32 sprite, fixed erroneous pixels on the katana sheath sprite, added a new pistol gunshot for the Universal. * Second fix There's always something, ain't there? --------- Co-authored-by: Rane <[email protected]>
* Update glacier.yml - added cryo - moved docking port office - added land mine field - added mining chunk * Update glacier.yml
* Update angle.yml Completely overhauled Angle's medical department. * Update angle.yml Added medical techfab * Update angle.yml Fixed missing disposal pipes * Update angle.yml fixes unpowered APC * Update angle.yml Added missing biomass reclaimer * Update angle.yml Added missing vents and camera router
* Map Edits * remove potential serialization * Fix upsidedown mirror --------- Co-authored-by: Jeff <[email protected]>
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )