[IN WORK] Cherrypick September Part 2#664
Open
Ossa88 wants to merge 111 commits into
Open
Conversation
…(#5087) Adds the Shrike-class Fast Response Frigate, a Vigilitas Interstellar vessel centered around combat (Of the PvE and PvP variety), and security contracting as a vessel of the largest security contractor in the Galaxy, with 2 new VI outfits (Captain, and 2IC (Sergeant for this vessel)). Weaponry currently present within are placeholders until the Sharplite rework is merged. *** >_Description is currently a WIP_ ><img width="574" height="766" alt="image" src="https://github.com/user-attachments/assets/c0ebf8b7-b9e5-41fc-91cf-317694ec547e" /> <details> <summary>Strongdmm photos</summary> <p align="center">Areas:</p> <img width="1152" height="1120" alt="image" src="https://github.com/user-attachments/assets/ffd09854-eccc-4f22-9695-572089bb933c" /> <p align="center">Without Areas:</p> <img width="1152" height="1120" alt="image" src="https://github.com/user-attachments/assets/58e92054-a303-4dd5-921d-6cca1fa5fdab" /> </details> Whilst Vigilitas may already have a combat related vessel ingame, it is unfortunately locked to the Loss Prevention department of VI, instead of a more broad generalist vessel. This addition changes that, giving VI players who may have wanted to play the faction outside of Nanotrasen and N + S Shipping vessel, without having to make a character who may not potentially fit with the LP department. :cl: add: Adds the Shrike-class Fast Response Frigate, a new Vigilitas Interstellar vessel. add: Adds two additional VI outfits. add: New secure safe subtype /:cl: --------- Signed-off-by: Burning02 <141873051+Burning02@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> (cherry picked from commit fe325d23c208c6a95cb4c208743ef0e8b7eafa8b)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request I changed the trashcan in the bridge for a photocopier and made the armoury windoor rotated inward and put a public one on the outside so you can put stuff on the table like the HOP line <img width="325" height="319" alt="image" src="https://github.com/user-attachments/assets/ca775cee-8707-4ae7-a944-6496bf62492d" /> <img width="319" height="339" alt="image" src="https://github.com/user-attachments/assets/6c1b65b8-c429-470e-a4f9-da8cf870eda3" /> ## Why It's Good For The Game photocopiers are like godsgrace to the land <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: The Leyak has a photocopier now. It also has it's indoor adjusted. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit c66d67dbd54e7a4aa7ba52db2297926470b235b7)
## About The Pull Request - All-in-One tcomms in the command area - Saluki and ammo in the ERT armoury - Facemasks in both CLIP and Inteq ERT areas - Defibrillator in ERT corpsman - Renamed 7.5mm ammo can path back to 6.5 cause it was annoying - Folders and Clipboards to the fax area - Takes ammo out of the museum guns (keeps magazines) ## Why It's Good For The Game Stuff to equip ERTs with ## Changelog :cl: add: Added some misc supplies and changes to Arrowsong's ERT armoury and museum. Comms to Arrowsong /:cl: (cherry picked from commit 09b4244998b99a5b2387e9f46fb76fb88e228a5c)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request PGF being brought up to modern standards is something that's been in talks and small project bursts for a long time now, but none ever went through to the end. This PR updates all of the PGF factional sprites, WITH FULL VOX AND KEPORI SUPPORT. In addition, it updates PGF vessel maps with the new/resprited items and updates ERT/roundspawn outfits. Images below **SPRITES** <img width="698" height="417" alt="Screenshot 2025-08-26 155834" src="https://github.com/user-attachments/assets/1c43df24-2b1b-4a06-b653-f46edecda785" /> <img width="582" height="262" alt="Screenshot 2025-08-26 155845" src="https://github.com/user-attachments/assets/86fad7ee-0698-4b65-9d91-ac325cfc2e0b" /> <img width="686" height="388" alt="Screenshot 2025-08-26 155856" src="https://github.com/user-attachments/assets/7a9219d8-e3c4-4fd6-abdb-fb815a2b9589" /> <img width="584" height="384" alt="Screenshot 2025-08-26 155906" src="https://github.com/user-attachments/assets/9fc107fd-9f81-4e74-9487-6a692c79407f" /> <img width="747" height="414" alt="Screenshot 2025-08-26 155933" src="https://github.com/user-attachments/assets/1823b2f6-72ca-4bc9-bd75-2d49888c2a5a" /> <img width="770" height="388" alt="Screenshot 2025-08-26 155950" src="https://github.com/user-attachments/assets/9ec615a6-e125-4dc5-b1b9-9874bbb16e32" /> <img width="1031" height="260" alt="Screenshot 2025-08-26 160956" src="https://github.com/user-attachments/assets/bbd16158-4241-413a-9709-61dbb0135ed9" /> <img width="640" height="389" alt="Screenshot 2025-08-27 003408" src="https://github.com/user-attachments/assets/6614e8f1-33b4-4ca5-a030-b4da7487b751" /> <img width="1153" height="509" alt="Screenshot 2025-08-27 003421" src="https://github.com/user-attachments/assets/70c4107a-5d04-4911-a295-668d47bcd33a" /> <img width="639" height="255" alt="Screenshot 2025-08-27 003439" src="https://github.com/user-attachments/assets/3f37e71c-56e8-4623-9805-4d23b9220285" /> <img width="638" height="511" alt="Screenshot 2025-08-27 003449" src="https://github.com/user-attachments/assets/4131d182-c923-408f-9516-8d774bd0b092" /> <img width="1156" height="259" alt="Screenshot 2025-08-27 003504" src="https://github.com/user-attachments/assets/bb5ef6ce-15df-46f7-a160-521e5c173cc7" /> **INGAME** <img width="494" height="628" alt="image" src="https://github.com/user-attachments/assets/045d58ef-74ea-4d03-a20a-57a4ee65f789" /> <img width="471" height="299" alt="image" src="https://github.com/user-attachments/assets/8a127f74-9e01-488b-a0eb-14e65ab05cbe" /> <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game New sprites and planned content making their way into the game is a good thing. Worked closely with Thgvr throughout this whole process and took the time to make sure that quality was up to snuff <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: add: Made new PGF items accessible fix: Adjusted PGF outfits and items imageadd: Added new PGF sprites imagedel: Removed redundant sprites /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> --------- Signed-off-by: DIB-DOG <DaneOfThieves@gmail.com> Co-authored-by: Changelogs <action@github.com> (cherry picked from commit 42f427b543ec2176bd1889a536363cb82fb60a0f)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <img width="995" height="204" alt="image" src="https://github.com/user-attachments/assets/a3782046-9276-4bf6-8bec-3f45dc6d1ca0" /> ## Why It's Good For The Game cheese hands sucked ## Changelog :cl: add: insulated glove resprite /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit 5f95d8f2517ccd68fe89a0a542c977afcaa4c576)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> <img width="71" height="88" alt="image" src="https://github.com/user-attachments/assets/27322aef-67e0-497a-beef-ca6038b67215" /> <img width="639" height="131" alt="image" src="https://github.com/user-attachments/assets/d83fa752-7699-44d4-974e-a90bd43dba45" /> it might look better :cl: add: resprites explorer gas mask /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit 91f2ae3a1c1677c72f4b88b3736a93348160a4d3)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request just touches up the sprite a bit. <img width="377" height="323" alt="image" src="https://github.com/user-attachments/assets/c9d600c9-0320-4f62-9508-f2e8f3c7605f" /> ## Why It's Good For The Game wanted to add a bit of depth ## Changelog :cl: add: touches up auto elite sprite /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit 0f7a376da5cd8dc39c6faa1a3f7a437b63c3136b)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <img width="935" height="181" alt="image" src="https://github.com/user-attachments/assets/ed12f05c-b228-441d-aaa6-33d8f18074c5" /> ## Why It's Good For The Game species sprites are nice ## Changelog :cl: add: Kepi variant for NS hardsuit /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit e99da366a36790abd82c5bdc50beead41780ba23)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request adds a few inteq sprite adaptations for kepori. battlecoat and hoodie sprites by @thearbiber . also fixes the rolldown states for their uniforms <details> <summary>In-game Screenshots</summary> <img width="492" height="492" alt="keporiwinter" src="https://github.com/user-attachments/assets/18a4492b-031a-4e54-8311-652154fdc7b6" /> <br> <img width="448" height="448" alt="keporivanguard" src="https://github.com/user-attachments/assets/89a4d95c-c957-4a04-bf7b-c282fbc81f4d" /> <br> <img width="256" height="256" alt="keporimaa" src="https://github.com/user-attachments/assets/1871cc55-8362-455c-a753-b465fedd9b62" /> <br> <img width="192" height="256" alt="keporihoodie" src="https://github.com/user-attachments/assets/e1d3c224-edde-4845-853b-e70376f74e08" /> </details> <img width="873" height="896" alt="keporiasepriteinteq" src="https://github.com/user-attachments/assets/73ae26b5-6a7e-45e4-9371-fd787e88cd7e" /> ## Why It's Good For The Game species compatibility good ## Changelog :cl: moffball, thearbiber add: The IRMG has upped the knitting quality of it's kepori-designed wear. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit e7728b23807a685caf74bb50f6f5b59782725615)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request sprite motivation fading PRing this before it dies completely <img width="951" height="302" alt="image" src="https://github.com/user-attachments/assets/88ceeff5-f0bb-43dc-906f-85e5f8dde0e2" /> ## Why It's Good For The Game resprites old thing ## Changelog :cl: add: short over eye resprite /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit 49faffa35e55d91395851a663186e762ddb2464f)
…urable) (#5280) ## About The Pull Request Sprites by @thearbiber Resprites a lot of the existing athletic shorts along with the dolphin shorts and adds a pink colour. Also makes them one recolourable item (NOT DOLPHIN SHORTS) <img width="254" height="508" alt="image" src="https://github.com/user-attachments/assets/09f51423-ffce-4fb6-acca-99465674928b" /> (first girl isnt dead she just took a nap) <img width="229" height="230" alt="image" src="https://github.com/user-attachments/assets/c1596f93-ef94-4a36-a045-6aeabe65faa5" /> ## Why It's Good For The Game Shorts ## Changelog :cl: thearbiber, generalthrax add: Athletic Shorts / Dolphin Shorts Resprite + Pink Shorts. Recolourables /:cl: (cherry picked from commit 9b500331e9fc645a45838edff795b92c06d86d40)
basic mobs are now checked for inside isanimal + human simplemobs will not drop loot if they are currently qdelling :cl: fix: animals should stop erupting into gore fountains when you land fix: hermits will refrain from causing damage to your hull during landings /:cl: --------- Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> (cherry picked from commit ace3dc054112a3ab4f9eb31c11ca145a74e8dfc8)
## About The Pull Request makes subshuttles (or any docked vessel) update their location upon the movement of the object they're docked to ## Changelog :cl: fix: subshuttles having absolutely bizarre interactions with overmap location /:cl: (cherry picked from commit f8126357a819c80ad760b04d06411ff65b65bfbf)
## About The Pull Request more randomgen planet / star names variety is good ## Changelog :cl: add: more randomgen planet / randomgen star names /:cl: --------- Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> Co-authored-by: thgvr <81882910+thgvr@users.noreply.github.com> (cherry picked from commit e82551d59b8c41820306c697809e4d216484c8f3)
## About The Pull Request Makes ammo counters fit on scope by default, but adds an interaction for them to also fit on railings. ##### why its good for the game i think its cool ## Changelog :cl: balance: ammo counters now go to the scope slot /:cl: --------- Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> (cherry picked from commit 24c4198e80ab19352fca2f76d75712a9fedd45bf)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> moves medbay around to not be so microscopic causing everyone and their mother to move it to the breakroom <img width="726" height="645" alt="image" src="https://github.com/user-attachments/assets/01280676-6c49-4279-ad10-635c4f58c12e" /> <img width="570" height="554" alt="image" src="https://github.com/user-attachments/assets/2ebff360-4861-4efe-8662-7683e16b2b2d" /> if I ate five grapefruit, I think i'd feel pretty sick :cl: fix: Magpie medical and security offices have been adjusted slightly for better space use. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit 98a0f185a692f189c55577ce2b35b47007a3e050)
… ever do their first try
## About The Pull Request Captained a round of it and was unsatisfied with a few things. Made some tweaks here and there, including: - Doubled the total ammo in the armory. Two boxes of 9mm feels extremely barebones for two ammo hungry SMGs. - Replaced some awkward seemingly misplaced decals in the main hallway. - Placed megaphones into the Captain's and Cergeant's lockers. - Placed a command pouch into the Captain's locker. - Placed a filing cabinet into the armory. Moved a hand labeler, clipboard, and some folders into it. - Placed a Minuteman chest rig into the Sergeant's locker. - Added two ballistic goggles into the armory, as that seems to be a new standard for Minutemen roles (From the Atlas remap). ## Why It's Good For The Game These tweaks are mostly for QOL. They should make the Typhon feel a bit better to play on. ## Changelog :cl: balance: Made some QOL tweaks to the Typhon (Mostly the addition of some convenient starting equipment). /:cl: (cherry picked from commit 6627153c08325981323cf556aa0fa5dd7f787da2)
…tleneck instead+vox sprites for it (#5285) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request as said in the title. Heres the vox sprites <img width="737" height="198" alt="image" src="https://github.com/user-attachments/assets/a2bf2560-d69b-4230-8ea2-f6db373e7495" /> ## Why It's Good For The Game These clothes have mostly been sitting about gathering dust, and are rarely seen anyways. Honorable Vanguards still have a distinct outfit even with this being moved over to command, and also gives command staff more of the possibility to Stick Out like the other factions, without having to wear the overcoat all the time. ## Changelog :cl: add: Vox Inteq command turtlenecks add: Honorable Vanguard turtlenecks are now inteq command turtlenecks /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit e53617a6fbdb329715da7c516d2773d312f0913d)
## About The Pull Request Makes the NT Suit Jacket and Hazard Vests now appear for Vox. These sprites existed but I forgot to add the VOX_VARIATION flag. Also fixes a sprite that didn't have a correct west state. ## Why It's Good For The Game Fix good ## Changelog :cl: fix: Missing vox sprite states for some NT outerwear. /:cl: (cherry picked from commit 6795ccce798ee3b2cdf06c135eed55696fc1b3fb)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <img width="636" height="426" alt="image" src="https://github.com/user-attachments/assets/cd734484-c991-4429-bbfa-6e474cbb78ac" /> <img width="570" height="194" alt="image" src="https://github.com/user-attachments/assets/7a5ee069-0571-4b2b-beb8-3d4ccc31712f" /> ## Why It's Good For The Game more comfy clothes ig. Scrappers wearing pajamas to work day ## Changelog :cl: add: pajama pants /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit 490a8e9eaa3a582587e1dee8a94cd177f7b6e7a0)
## About The Pull Request Lowered some magazine prices based on amount of rounds they have (mostly aimed at the Boomslang and F90 charging 750 for a 5 round mag) ## Why It's Good For The Game Way too much ## Changelog :cl: balance: Slightly decreased some magazine prices (namely the Boomslang and F90) /:cl: (cherry picked from commit 4c361a9c770e5f99aa2029d3350f98d9368ddf28)
## About The Pull Request - Increased frag grenade cost to 500 - Slightly increased Tear gas and Flash bang cost to 200 - Removed riot grenade launcher underbarrel from cargo - Removed heavy explosive damage and slightly reduced flame range from frags - Removed devastation from Concussion grenades ## Why It's Good For The Game Frags just seemed wayyyyyy too cheap for how effective they are for PVP (and to a lesser extent PVE). See them spammed out a loooot. Feel like whatever balance grenades have is pretty much negated by the riot. You can just spit it out beyond normal throwing distance (and ludicrously far if you have it on a DMR or Sniper) with a quickie firemode toggle. Was considering simply locking it from DMRs and snipers but I feel like you can still get a pretty similar effect with just normal ADS. Might reconsider, would like to hear thoughts As of 9/8: Wanted to lean grenades away from the direct explosive damage and more towards the shrapnel. Removing heavy explosive damage reduces the impact of cookoff and puts more emphasis on the shrapnel (which still does a lot of damage but a fair bit less so cause its tied to shrapnel + bullet armour instead of explosives and all the jank with that) ## Changelog :cl: del: Removed riot grenade underbarrel from cargo balance: Increased frag grenade and other auxiliary grenade costs slightly balance: Removed heavy explosive damage from Frags and devastation from Concussion grenades /:cl: (cherry picked from commit dc1f2927fed6869d1a781b1edcbf80e81110aa4c)
## About The Pull Request - Removes diamonds and bluespace crystals from common veins on planets they spawn on - Reduced amount of gold in most normal veins - Reduced spawn rate of certain rare veins - Reduced amount of nodes accessible from rare veins ## Why It's Good For The Game Crazy amount of money accessible from even base normal veins. It should be a nice bonus and not a "stop by jungle world roundstart for 80000 credits" Have not actually tested the new adjustments yet so I'll get back to you ## Changelog :cl: del: Removed diamonds and bluespace crystals from normal veins balance: Reduced amount of gold from normal veins. Slightly rarer rare veins /:cl: (cherry picked from commit 76d9196bc072421b890313f1f91a32740060d2b7)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> Title. Also gives hermits their own bespoke factions. Should stop simple mob versions of pirates aggroing onto player pirates, and similar cases. ## Why It's Good For The Game <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> What should be allied mobs shouldn't aggro onto you. ## Changelog :cl: add: Hermit faction balance: Simple mob pirates won't aggro on player pirates. /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit 7ebd051b1f1314e270c1a62a4cd89c9c17b2e425)
## About The Pull Request Adds horse genemods to humans. <img width="454" height="270" alt="image" src="https://github.com/user-attachments/assets/ce28835f-2a32-48e6-8534-e342e50591bd" /> ## Why It's Good For The Game Horsegirls. ## Changelog :cl: add: Horse genemods for humans /:cl: (cherry picked from commit 119db52167a8a483c0ef8d75608f2b608e80bbad)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> <details> <summary>Screenshots</summary> <br> <img width="1312" height="1184" alt="image" src="https://github.com/user-attachments/assets/e167520e-9109-4263-9b73-d57437f63a4e" /> <img width="1312" height="1184" alt="image" src="https://github.com/user-attachments/assets/bae5079c-d726-4776-9099-f3b87556c993" /> <img width="1280" height="1280" alt="tortuga" src="https://github.com/user-attachments/assets/073a3b4d-a8d3-458e-80e6-82e97e8804d2" /> <img width="288" height="224" alt="image" src="https://github.com/user-attachments/assets/d4d602bc-28ab-49ff-a435-f4dd61fd1135" /> </details> Touches up and modernizes the Tortuga. Major changes are: - Shutters to windows and engines. - Adds a helmsman role to pilot the subshuttle. - Reinforces the exterior hull. - Maint has been reorganized and pressurized. - Adds firelocks. - Telecomms - A hydroponics "room" - A bar - LTSRBT - Personal locker for the deckboss - Two of the engines are now normal. - Misc fixes. - Updates the armory and holding cell. <details> <summary>Weapons</summary> <br> - Captain: Mateba, - Helmsman: Pounder - Armory: Mower, Wasp, F3, Spitter, Mauler, Mauler Semi-Auto - Adds grenades (smoke and frag) </details> <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> Making our crackhouse a crackhome. The Tortuga was starting to show it's age, and was a bit unthreatening in the context of modern Shiptest. With the new Frontiersmen weapons out, it was about time to give it an update. This should help it lean a lot more into it's gimmick as a floating fortress/base with more shipside functionality to keep the home crew busy and help support the away team with some general QoL changes tossed in. :cl: add: Tortuga Touch Ups /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit 0e7d8f3dace66272bdc1f812d7f13f72fdb2fc79)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> This should fix all wind on bombed starport is that a tornado or are you happ-AAAAAAAAAAAAAHHHHHHHHHHH :cl: fix: wind on bombed starport /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit 62fd67874c053ecbcf67a7a3bb8ded95c855336c)
…(#5375) ## About The Pull Request yea ## Why It's Good For The Game fixes good ## Changelog :cl: fix: Fixes serene hunts error helmet and M10 helmet content overlays /:cl: (cherry picked from commit e5e71a5d030b693b4bbc959f73e8ed8fb2499753)
## About The Pull Request gives him correct faction ## Why It's Good For The Game fixes good ## Changelog :cl: fix: Makes David a true New Gorlex patriot /:cl: (cherry picked from commit 57d08b49cc7551b5a154d742e91955b6d1a4e631)
## About The Pull Request didnt do this a while ago and was informed it was "annoying" ## Changelog :cl: balance: cannabis leaves now have a unique reagent /:cl: (cherry picked from commit ae7106d06f0818b7a6b166f221654c2047c58d1f)
## About The Pull Request Adds bonesetters and surgical tape to medical belts ## Why It's Good For The Game Medical items in medical belts. All the other medical items go in medical belts ## Changelog :cl: balance: Bonesetter and Surgical Tape now fit in Medical Belts /:cl: (cherry picked from commit 10699bdd0d2a927151bee8118c25ab24f7729912)
## About The Pull Request reduces the chance of it procing brain damage ## Changelog :cl: balance: Mammoth Addiction no longer brainkills you /:cl: (cherry picked from commit b131baae9961df2cc9f7782e8978d435a63cc786)
## About The Pull Request Adds the CLIP-MELD Moonbase Ruin, a fuel extraction facility abandoned due to a crystal infestation and reclaimed by the Frontiersmen. Intended to be low-medium in terms of difficulty <img width="940" height="842" alt="image" src="https://github.com/user-attachments/assets/3b7ca90c-bb3c-42f6-b2e5-b87a0b676134" /> <img width="2240" height="1888" alt="image" src="https://github.com/user-attachments/assets/0c1488bb-ea73-4c3b-8937-542ee8372c26" /> <img width="2240" height="1888" alt="image" src="https://github.com/user-attachments/assets/442a2e80-9af9-441a-8b01-24b8cfe072d2" /> Also adds Spitter fronties and space variants for use in the ruin (and possibly elsewhere), with decent chasing and an eight-round burst. Loot includes: - CM-15 shotgun with 3 mags - Mauler Semi-auto with 3 extended mags - Ammo - Single box of pulse slugs - T3 stockparts to operate a drill - Basic first aid - Two CLIP patroller hardsuits - Plasmacutter - Lots and lots of Hydrogen gas - Too many Frontiersmen hardsuits Isolated in the north is a crystal-infested Class 4 moon vein, granting significantly more ice than other Class 3-4 drills yet with less nodes. Crystal-infected fauna are added to the spawn pool there at a low chance. ## Why It's Good For The Game Moon submissions are open, and I've been informed maptainers are looking for a low-medium threat ruin. This is pretty simple to clear, though there is a high-stakes drill in the north for those willing to brave the crystal mobs. ## Changelog :cl: add: Added CLIP-MELD Moonbase ruin add: Moons now can have ruins add: Spitter Frontiersmen /:cl: --------- Signed-off-by: generalthrax <139387950+generalthrax@users.noreply.github.com> Co-authored-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> (cherry picked from commit 2c65e733bf31ae4f332481688c3591723906aa4c)
…5335) <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Gives the Mission Network app icons on the Laptop & Modular Tablet, which were referenced in the PR that added the apps, but did not exist. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Flavor, plus reminds you that you left the laptop on <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: riquewright imageadd: added missing Mission Network App icon states to Laptop & Tablet /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->  (cherry picked from commit 800e80f50a74cc2e5728036e8032b47fc93db531)
## About The Pull Request sprites by @thearbiber <img width="157" height="160" alt="image" src="https://github.com/user-attachments/assets/febe9050-ff7f-41f2-8399-cdc196b77d1b" /> <img width="139" height="137" alt="image" src="https://github.com/user-attachments/assets/30abd0bc-aec0-48b1-bfd8-d6aa842dd19e" /> ## Why It's Good For The Game Some polymer for the SKM to make it not look too woody for whats supposed to be mass produced ## Changelog :cl: thearbiber, generalthrax add: Two SKM recolours - Polymer and Bright /:cl: (cherry picked from commit e564e1fdee65f09c54a6cb7f089133180a44b7a0)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request * Adds the emergency distress panel, a tiny panel on the floor of your ship that can send a distress signal. It needs a ship key to function, and there is a cooldown of ten minutes between distress signals. <img height="300" alt="image" src="https://github.com/user-attachments/assets/7a548f88-eca6-4d05-9c38-71c071b40ab7" /> https://github.com/user-attachments/assets/68ae54c8-0d42-4672-ba36-7947710f803e * [Distress signals now get their own scary bad sound.](https://freesound.org/people/edge%20of%20october/sounds/101357/) * Distress signals can now have a message attached to them. * Slight rework of how priority announcement types are handled. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game Players should have the autonomy to launch their own distress signals. <!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. --> ## Changelog :cl: Hyphen, MeeM add: Emergency distress panel soundadd: Sound for distress signals code: Distress signals may now have a message attached to them code: Minor rework of priority announcement code /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit 8f6ff1e3c17aaf4d281b7491f2dcf0c2df448f9b)
## About The Pull Request lets it spawn ## Why It's Good For The Game fixes good ## Changelog :cl: fix: Coalition softsuit spawns correctly in black market /:cl: (cherry picked from commit 4d927c7765e7198ea1eaea335df1341079a7e809)
## About The Pull Request whoops ## Changelog :cl: fix: disconnected cirrus power cable /:cl: (cherry picked from commit f62d428e18e589ac8dda072f2fc00a35b74877c3)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request <img width="558" height="261" alt="image" src="https://github.com/user-attachments/assets/fce4ed66-17a7-4ef5-8991-62e8487ee4e8" /> ## Why It's Good For The Game it was supposed to be there in shiptest-ss13/Shiptest#5321 ## Changelog :cl: add: Riot helmets now replace the X-11s bundled with medium tactical armour /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> (cherry picked from commit 4aa833d6fbef938b5dd33dfbf36d64ff3ecf565a)
## About The Pull Request elder had an empty medkit for like 2 years ## Why It's Good For The Game fixes good ## Changelog :cl: fix: elder no longer has an empty medkit. instead it has a full one /:cl: (cherry picked from commit 1e1b948a838481190540968a08659874e9732f50)
…inteq_javelin maps
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
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
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
Lots of Changes:
[Vigilitas Interstellar] Adds the Shrike-class Fast Response Frigate (#5087)
Adds the Shrike-class Fast Response Frigate, a Vigilitas Interstellar vessel centered around combat (Of the PvE and PvP variety), and security contracting as a vessel of the largest security contractor in the Galaxy, with 2 new VI outfits (Captain, and 2IC (Sergeant for this vessel)). Weaponry currently present within are placeholders until the Sharplite rework is merged.Strongdmm photos
Areas:
Without Areas:
Whilst Vigilitas may already have a combat related vessel ingame, it is
unfortunately locked to the Loss Prevention department of VI, instead of
a more broad generalist vessel. This addition changes that, giving VI
players who may have wanted to play the faction outside of Nanotrasen
and N + S Shipping vessel, without having to make a character who may
not potentially fit with the LP department.
Leyak Paperwork Buff + windoor (#5277)
## About The Pull Request I changed the trashcan in the bridge for a photocopier and made the armoury windoor rotated inward and put a public one on the outside so you can put stuff on the table like the HOP lineWhy It's Good For The Game
photocopiers are like godsgrace to the land
Tiny Arrowsong Tweaks (#5275)
## About The Pull RequestWhy It's Good For The Game
Stuff to equip ERTs with
PGF-resprite (#5264)
## About The Pull Request PGF being brought up to modern standards is something that's been in talks and small project bursts for a long time now, but none ever went through to the end. This PR updates all of the PGF factional sprites, WITH FULL VOX AND KEPORI SUPPORT. In addition, it updates PGF vessel maps with the new/resprited items and updates ERT/roundspawn outfits.Images below
SPRITES












INGAME


Why It's Good For The Game
New sprites and planned content making their way into the game is a good
thing. Worked closely with Thgvr throughout this whole process and took
the time to make sure that quality was up to snuff
insulated glove resprite (#5228)
## About The Pull RequestWhy It's Good For The Game
cheese hands sucked
resprites explorer gas mask (#5265)
auto elite touchup (#5271)
## About The Pull Request just touches up the sprite a bit.Why It's Good For The Game
wanted to add a bit of depth
Adds kepi variant for NS mining suit (#5272)
## About The Pull RequestWhy It's Good For The Game
species sprites are nice
kepori inteq sprites part 1 (#5274)
## About The Pull Request adds a few inteq sprite adaptations for kepori. battlecoat and hoodie sprites by @thearbiber . also fixes the rolldown states for their uniformsIn-game Screenshots
Why It's Good For The Game
species compatibility good
short over eye resprite (#5278)
## About The Pull Request sprite motivation fading PRing this before it dies completelyWhy It's Good For The Game
resprites old thing
Resprites Athletic Shorts / Dolphin Shorts + Adds Pink Shorts (Recolourable) (#5280)
## About The Pull RequestSprites by @thearbiber
Resprites a lot of the existing athletic shorts along with the dolphin
shorts and adds a pink colour. Also makes them one recolourable item
(NOT DOLPHIN SHORTS)
(first girl isnt dead she just took a nap)

Why It's Good For The Game
Shorts
fixes hermits punching a hole through ship hull (#5246)
basic mobs are now checked for inside isanimal + human simplemobs will not drop loot if they are currently qdellingUpdate ship_datum.dm (#5088)
## About The Pull Request makes subshuttles (or any docked vessel) update their location upon the movement of the object they're docked tomore randomgen names (#5282)
## About The Pull Request more randomgen planet / star namesvariety is good
ammo counter on scope OR railing (#5269)
## About The Pull Request Makes ammo counters fit on scope by default, but adds an interaction for them to also fit on railings.why its good for the game
i think its cool
Magpie medical expansion (#5268)
moves medbay around to not be so microscopic causing everyone and their mother to move it to the breakroomif I ate five grapefruit, I think i'd feel pretty sick
Typhon Gupdate (#5248)
## About The Pull RequestCaptained a round of it and was unsatisfied with a few things. Made some
tweaks here and there, including:
barebones for two ammo hungry SMGs.
clipboard, and some folders into it.
standard for Minutemen roles (From the Atlas remap).
Why It's Good For The Game
These tweaks are mostly for QOL. They should make the Typhon feel a bit
better to play on.
Reflavors the Honorable Vanguard turtleneck to be inteq's command turtleneck instead+vox sprites for it (#5285)
## About The Pull Request as said in the title. Heres the vox spritesWhy It's Good For The Game
These clothes have mostly been sitting about gathering dust, and are
rarely seen anyways. Honorable Vanguards still have a distinct outfit
even with this being moved over to command, and also gives command staff
more of the possibility to Stick Out like the other factions, without
having to wear the overcoat all the time.
Fixes some NT Vox Sprites (#5287)
## About The Pull RequestMakes the NT Suit Jacket and Hazard Vests now appear for Vox. These
sprites existed but I forgot to add the VOX_VARIATION flag. Also fixes a
sprite that didn't have a correct west state.
Why It's Good For The Game
Fix good
adds pajama pants to the game (#5284)
## About The Pull RequestWhy It's Good For The Game
more comfy clothes ig. Scrappers wearing pajamas to work day
Decreases some magazine prices slightly (#5243)
## About The Pull RequestLowered some magazine prices based on amount of rounds they have (mostly
aimed at the Boomslang and F90 charging 750 for a 5 round mag)
Why It's Good For The Game
Way too much
Frag Grenade Adjustment + Removed Riot Launcher from Cargo (#5242)
## About The Pull Requestfrags
Why It's Good For The Game
Frags just seemed wayyyyyy too cheap for how effective they are for PVP
(and to a lesser extent PVE). See them spammed out a loooot.
Feel like whatever balance grenades have is pretty much negated by the
riot. You can just spit it out beyond normal throwing distance (and
ludicrously far if you have it on a DMR or Sniper) with a quickie
firemode toggle. Was considering simply locking it from DMRs and snipers
but I feel like you can still get a pretty similar effect with just
normal ADS. Might reconsider, would like to hear thoughts
As of 9/8: Wanted to lean grenades away from the direct explosive damage
and more towards the shrapnel. Removing heavy explosive damage reduces
the impact of cookoff and puts more emphasis on the shrapnel (which
still does a lot of damage but a fair bit less so cause its tied to
shrapnel + bullet armour instead of explosives and all the jank with
that)
Vein Adjustments (#5221)
Vein Adjustments (#5221) ## About The Pull Requestthey spawn on
Why It's Good For The Game
Crazy amount of money accessible from even base normal veins. It should
be a nice bonus and not a "stop by jungle world roundstart for 80000
credits"
Have not actually tested the new adjustments yet so I'll get back to you
Pirate/Hermit outfits apply the relevant factions (#5276)
## About The Pull RequestTitle. Also gives hermits their own bespoke factions.
Should stop simple mob versions of pirates aggroing onto player pirates,
and similar cases.
Why It's Good For The Game
What should be allied mobs shouldn't aggro onto you.
Gallop on, Rocinante! Horse customizations for Humans (#5303)
## About The Pull RequestAdds horse genemods to humans.
Why It's Good For The Game
Horsegirls.
Tortuga Touch Ups (#5105)
Screenshots
Touches up and modernizes the Tortuga. Major changes are:
Shutters to windows and engines.
Adds a helmsman role to pilot the subshuttle.
Reinforces the exterior hull.
Maint has been reorganized and pressurized.
Adds firelocks.
Telecomms
A hydroponics "room"
A bar
LTSRBT
Personal locker for the deckboss
Two of the engines are now normal.
Misc fixes.
Updates the armory and holding cell.
Weapons
Making our crackhouse a crackhome.
The Tortuga was starting to show it's age, and was a bit unthreatening
in the context of modern Shiptest. With the new Frontiersmen weapons
out, it was about time to give it an update. This should help it lean a
lot more into it's gimmick as a floating fortress/base with more
shipside functionality to keep the home crew busy and help support the
away team with some general QoL changes tossed in.
bombed starport wind fix (#5306)
This should fix all wind on bombed starportis that a tornado or are you happ-AAAAAAAAAAAAAHHHHHHHHHHH
Adds a few modified meson goggles to the Derecho (#5301)
## About The Pull RequestThis PR adds a modified meson goggle to the captain's locker, the
foreman's locker, and the wrecker's lockers on the Derecho.
Why It's Good For The Game
This should allow for additional outfit customization options aboard the
ship.
Update planet_names.txt (#5300)
## About The Pull Requestchanges a few names i was told don't work
Fix tail sprite bugs (#5295)
About The Pull Request
Fixes a bug where elzu tails clipped through clothing while wagging
because I am a dumbass and didn't understand layers. Also fixes bifur
tails being done really weird because of framerate issue
Why It's Good For The Game
bug fix good
Sealed Glasses Lookover (#5296)
## About The Pull RequestAdds the "SEALS_EYES" flag to many goggles in the code, including
factional ones.
Why It's Good For The Game
Felt this was a long time coming and it never felt good wearing what
appeared to be protective goggles only to have my eyes fucking melted.
Increases the health of trees (#5309)
## About The Pull RequestIncreases the health of all trees to 200 (was 40)
Why It's Good For The Game
Being able to blast through a forest with machine gun fire is admittedly
very silly.
Lets AI eye see bodycam feed (#5069)
About The Pull Request
Cameranet now properly pulls visible chunk information from bodycams,

meaning that AI eyes and advanced camera consoles (present on some
ruins) can see through them.
The functionality was actually half there, I just made bodycams actually
run the relevant procs to make this happen.
Why It's Good For The Game
ratvar asked me to
Real answer, AIs are often stuck within the confines of their ship since
there isn't really a portable camera that they can see through, short of
the borg shells. With this, AIs can take on an "eye in the sky" role and
command shipmates around like some kind of RTS.
Also, combined with RUPFCs (coming Soon™), this'll let AIs reconnect to
frames easier as long as they have an active bodycamera on them.
Atlas Remap (#5173)
okay let's try againThis PR does the following:
Remaps the Atlas. A style guide revision will be done Soon:tm: if this
PR is merged. Changes include:
Engineering re-done (two ions replaced with combustion engines).
- Officers now sleep in the same room.
- Office for a correspondent/interrogation.
- One new bathroom and an expansion to the existing one.
Added cameras. Bodycams omitted purposefully (lol), though may be
added if suggested.
Armory changed. 2x CM-5, 1x CM-24 (CLIP SKM), 1x HP Hellfire, 3x
CM-23.
Captain and Bridge Officer receive a CM-23 case each. Team Sergeant
has the Hellfire on their locker.
Engineer -> Naval Engineer (virtually no difference but emphasizes
shipside purpose)
- First Officer -> Bridge Officer (virtually no difference)
- Sergeant -> Team Sergeant (no difference)
Adds overhead props - lattices and pipes. Mouse clicks go throughthem, and they turn transparent when someone is underneath them, so you
shouldn’t be too worried about them preventing your sick shipside
frags.
Adds locker subtypes for C-MM jobs (Bridge Officer, Combat Medic,
Naval Engineer, Team Sergeant).
Adds reflective green stripes.
Adds a persistent photo album for CLIP correspondents.
Repaths some C-MM jobs.
oneshoulder touchup (#5288)
About The Pull Request
Why It's Good For The Game
no more nip slip
Adds claymores to the outpost export market, and removes them from outpost cargo (#5302)
## About The Pull RequestThis PR adds claymores as a possible export at the outpost market, at
1250 credits each as the base price, and it removes the option to
purchase claymores on the market.
Why It's Good For The Game
No reward without a little risk, right? I remember seeing someone taking
the time to carefully defuse a few in order to sell them, only for them
to wind up disappointed because they weren't actually a valid export. It
makes sense for CLIP to want to get these removed from the sector as
much as landmines, I believe, so this PR aims to add that option.
Claymores as they currently are cost too much to be useful for a
defensive emplacement, and they're also just a little too destructive
when they do catch someone, oftentimes instantly killing someone and
shredding much of their equipment.
small kiwi touchups (#5311)
## About The Pull Requestadds a sink to the kiwi because i forgot. added a few inconsequential

suggestions from players while i was at it. biggest balance change is
addition of 500 dollars
Why It's Good For The Game
clean hands save lives
Gives the Arrowsong Refueling Platform the proper overmap sprite (#5320)
## About The Pull RequestTin
Why It's Good For The Game
Inteq Ship Touchups + Inteq Pilot Suit (#5313)
most prevalently edits the colossus, with a few very minor clothing additions being applied to the vaquero to keep it consistent. some changes include: * moves the corpsman out of cargo, replacing the pilot's office with a medbay * the pilot is now roomies with the maa * rearranged the dorms * split multiple rooms which were previously 1 area into separate areas * adds another smes and power monitoring console * readds the decal in front of apcs to the colossuscolossus screenshot showcase
overmap icon is this now (ryerice badge of approval)
pilot suit screenshot showcase
since the colossus's addition i've gotten a better idea of which areas
of the ship are utilized and which aren't. this pr replaces an unused
room (pilot office) with a proper space for the medical role, also
rearranging the dorms into a better space to live in. other than that,
fixes or changes a bunch of tiny flavour things which have little impact
on balance but still make the ship nicer (giving them several types of
coffee cart instead of just Solar's Bestest is not a balance change)
pilots are a role inteq's developed with nothing to Visually set them
apart from any other role. this pr gives them a cool looking spacesuit
to set them apart from the rest
Adds a new beach ruin, frontiersman moat, and removes two beach ruins aswell (#5259)
As stated. Adds this new beach ruin and also nerfs treasure troves assault rifle to an SMG. Notable loot would be an f3 drop, dynamic mission, cm23, some tools and a defib.Images
one, beaches need more modern ruins. Two, engi and pirate crash were
pretty bad. They had nothing going on really. Also, the assault rifle on
treasure trove was slightly absurd.
Allows one to see how many hours are left in an outpost mission, and extends mission durations by 50% (#5294)
About The Pull Request
This PR adds functionality to see how many hours are left to complete a
contract, and not just the modulo of the minutes remaining. This PR also
extends outpost mission timers across the board by 50%.
Why It's Good For The Game
As they are now, the current timers are perfectly sufficient for crews
operating adequately. However, I've noticed that, sometimes, some crews
can run into some bad luck and they can all end up dying. In the time
between their distress call being answered, and them returning to the
outpost, they may find that, rubbing salt into the wound, their mission
timers have run out. This PR aims to address this, and allow more time
in the event of accidents, events, and extended roleplay.
sarathi dlc (#5324)
## About The Pull Request you have no clue how incredible it feels to add something that only takes a few minutes and doesn't require system work touched up regular ears and added two new ones as shownWhy It's Good For The Game
why do we even still have this its so pedantic
Gas mask resprite+sec hailer resprite/reflavoring (#5314)
## About The Pull Request Sec hailer is reflavored to a generic half mask, also adds it to loadout so its not literally nowhere. Species variants include kepi, sarathi and human for the half mask and kepi and human for the full mask (I had 0 ideas for the sarathi mask)Why It's Good For The Game
The old sprites were pretty ass. These should be nicer, and as for the
half mask in loadout, its literally just a reflavored breath mask. Gas
masks as they are now are only valuable with eye protection, which this
has none.
stomp emote (#5325)
## About The Pull Requeststompy.mp4
You need legs to do it
Why It's Good For The Game
angry
Add heels (#5308)
## About The Pull RequestAdds heels. Compatible with all species
Details
Original human heel sprites were based on the monkestation heels, but
altered to fit other species/use palettes from shiptest. To be specific,
the item sprites are new, kepori/vox versions are altered.
Why It's Good For The Game
Another shoe option that's more formal. Bureaucrats rejoice. Appears in
loadout and in clothing venders.
Actually Fixes NT Vox Sprites (#5310)
## About The Pull RequestOops! I forgot to commit the final part of the fix when I made my PR!
This adds a single line to make my fix actually work and to make sprites
show up.
Why It's Good For The Game
Fixes broken things I introduced
Sock resprite (#5316)
## About The Pull RequestWhy It's Good For The Game
the old ones were old. New colors im debating on but as of right now i
think they ultimately mesh better with our sprites
black puffer fix (#5329)
## About The Pull Requestdont know how this happened but it did
Why It's Good For The Game
fixes good
Gives Nanotrasen and Ramzi Clique fax offices. (#5292)
Gives the Ramzi Clique and NT fax offices. Moves the NT fax out of the centcom courtroom.Faxes are a useful OOC utility for communicating needs to admins in a
diegetic way. Also good to centralize everything so the NT fax isn't on
the other end of the map away from everything else.
Centcom.dmm Fix
Reapply my hangar apc protection roomKali Andhi Remaster (#5176)
The Kali needs some love in the NGR catalogue. I've kept a lot of the eccentricities of the original vessel, but added a subshuttle (the Karst-class) with a pilot role, and updated the general flow of the vessel to be more in line with modern ship designs. Major changes include an E-10 in a safe in the Armory in case of breach through the shuttle dock, a Old-Colossus style dual cargo bay, and some authoritarian fluff to really make you feel like a true Republic Patriot.Kali-Andhi-class Destroyer

Karst-class Drop Pod

Patriots once again find themselves in control (of a small section of
the Frontier). The NGR now has a subshuttle for breaching operations,
which brings them in line with factions like the PGF and Inteq in terms
of response capabilities.
This is my first actual mapping project so please be warned that there
may be a ton of tiny errors I've missed, but I think I've caught all the
big ones (entire segments of the ship deleting, instant SGT, holofields,
cursed decals, airlocks breaking)
I love Kiirv-Waha.
resprites four hairs, adds one new one (#5343)
## About The Pull Request resprites short over eye(middle), emo fringe(top), and short hair 2(bottom). Feather hairs are also at the bottom, the one with the bang being the new oneWhy It's Good For The Game
they sucked before
Nanotrasen Advantage / Sharplite (#5210)
The long awaited Sharplite Rework and a few other less memoriable
weapons
After this the gun rework should almost be done, minus attachments and a
few more i wanted to do
Nanotrasen ballistics fill the same niche as their predecessors, not
much to really say here.
Sharplite lasers however have been completely redone, I'm sure theres a
lot of fun to be had there
Credits:
All weapons were designed by apogee
204, 201, x12, x46, al607, al655, al660 - Drawn by Imaginos16
Sound effects - Taken from TGMC
thrax - for helping this get over the finishing line
The big sharplite rework that was teased people who are not me
This also resprites the the ballistics to not look crappy
Once again, none of these are "replacements" nor "removals" the lineup
itself was reworked from scratch, so do not complain about bad removals
Misc:
resprites it
later, but for now its bulky but shoots eoehoma lasers
Replaces Moth's Surplus Prosthetics with Humaniform (#5305)
## About The Pull RequestSays on the tin. Replaces the generic surplus moth prosthetic with
humaniform (except for the head it looks cursed otherwise)
Why It's Good For The Game
Before you say "humaniform is only for humans", take a look at this
You can't tell me that looks better than this.
There's also the point that moths are human descendants, along with the
original point that the generic looks like shit.
Unique Action Energy Latches (#4477)
## About The Pull RequestThis PR changes the unlatch method from alt-click over to the unique
action key. Now, in order to unlatch the cell on an energy weapon, one
needs to press the unique action key in order to access their weapon's
cell. Unlatch times have also been reduced by 40%, and attachments will
now work with alt-click on any intent.
A new action button has been added to switch the ammo mode of energy
weapons that had previously used the unique action key in order to
toggle ammo modes.
Action button icons have been added for the ammo mode toggle. These
sprites were built off of @rye-rice 's work with firemode selection and
with her work on projectiles. She deserves all of the credit for the
sprites -- I've tried adapting her style, but if I need to change it or
tweak parts of it, I'm perfectly open to it -- I'm not really an artist
or a spriter, so I'm not really good with this sort of thing.
Why It's Good For The Game
This PR aims to address concerns regarding the unlatch mechanism being a
little too cumbersome.
more randomization for simple humans (#5096)
## About The Pull Request Adds both species and random seed randomization of simple humansWhy It's Good For The Game
No more 1 billion generic white male frontiersmen
tgui input text for flavor text (#5290)
## About The Pull Request Converts flavor text entry field into a tgui input text box instead of stripped multi line inputWhy It's Good For The Game
Makes sure to show character limit to prevent people from going too
crazy and loosing there work
Vestigial Pref Vars (#5315)
## About The Pull Request removes a handful of procs and vars surrounding prefs. partial atomization of #4831Why It's Good For The Game
these dont do anything in our current game, makes it easier to look at
the file diff for the real pref rework
Ramzi Clique MP-84m Cottonmouth (#5286)
## About The Pull RequestSprites by @thearbiber
Adds a modified 10mm Rattlesnake to the game in use by the Ramzi Clique.
It fires in 2-round burst with a bit more recoil, greater wear rate, now
used by Rust-red pistol mobs.
Obtainable through the blackmarket and the Rustbase ruin.
Why It's Good For The Game
The rust red pistol mobs kind of sucked for how menacing they looked,
especially now that we have softsuit mobs to look stupid and less
menacing. I figure Ramzi would do away with 9mm anyways and use the ammo
they have more of, rechambering for something with a fair bit more kick
for piracy work.
makes rustbase turrets not stupid as fuck (#5352)
## About The Pull Requestdoes this so the turrets dont shoot you through two solid walls
Why It's Good For The Game
fixes good
fix hoods (#5334)
## About The Pull Request fixes most hooded coats having a bad icon state for the hoodWhy It's Good For The Game
idk
Various Weather Sound Changes (#5247)
Various Weather Sound Changes (#5247) ## About The Pull RequestThis PR makes a number of tweaks and fixes to the weather sounds:
hardly noticeable before, because there was practically no difference.
broken into smaller chunks to make the transition between environments
smoother.
sounds, which makes the beginning of rain sound less weird.
Everything added here is still subject to change — Please Give Me
Feedback.
Why It's Good For The Game
It's a little immersion-breaking when you're sitting inside your ship or
a cave, and it sounds like you're in the middle of a hurricane.
The old ashstorm sounds were quite crusty, and featured a lot of
clipping, which couldn't be fixed without further diminishing the
quality of the sound. The new sounds should hopefully work better.
Elzu no longer take 1.25x brute damage (#5356)
## About The Pull Request idk why this was even happeningburn kit tweaks (#5337)
## About The Pull Requestreplaces one ointment with quardexane medigel
Why It's Good For The Game
makes it worth
Overmap Expansion 5.02 Fixes Small ship docking ports (#4629)
Fixes the docks of smaller ships to have proper mobile docking ports, therefore allowing ship to ship docking. In theory. Also standardizes mobile docking ports being at the airlock except in circimstances where it physically cannotthe vaqueors docking port is finally not in a stupid location
docking ports working
Nanotrasen Advantage Restoration
Restores the following: Nanotrasen Advantage laser guns can once again go though glass.Advanced Stopping Revolver - NT-C3 Compliance Revolver
Vector SMG restored
Saber SMG restored
Hades Restored
Prototype E-Gun
HOS E-Gun
Nuclear Gun
And some more, I need to re-review my edits. Some of these are just name restores, or sprite restores. Also these will need to be mapped to ruins/cargo and ships
gruboid no longer explode (#5367)
## About The Pull Requestgruboid stop exploding now
Why It's Good For The Game
This just isn't fun, ask anyone how fun running from exploding common
simplemobs that can SET YOU ON FIRE is. Plus we already had a PR
previously to do this that went stale like six months ago.
re-tiles cirrus/nimbus (#5363)
we were talking about shortcomings in the design and the aggressiveness of the tiling was brought up so i did some experimentsadjust some magpie stuff (#5333)
About The Pull Request
Fixes/alters a few things:
med expansion)
trash bin
Why It's Good For The Game
Fixes some bugs, also gives the crew back their mountain dew baja blast
to take the edge off alongside the five billion cigarettes. I also
missed my trash can.
Armor-Ening Part 1: Standardization and Indies (#5321)
Hi! Kept you waiting, huh?This PR is in a very long series coming up soon to standardize armor
fully into categories that were more or less already typecast before
this PR came to exist, as well as just respriting them!
The idea is simple! Armors are now going to fall in specific categories:
Within this category, Normal Armor includes the normal
non-bulletproof vests and the M10 helmet.
Bulletproof will be composed by bulletproof vests and the X11
helmet.
Light Marine will be the light marine vest and the X11
helmet.
Medium and Heavy will be their respective armor sets along with
the riot helmet.
The indie sets have their environmental variant armor semi-restored.
This is intended to be a quality of life update for indie mercenary
ships, such as the Falmouth and the Raleigh.
CLIP now has a regular, basic M10 helmet to go along with their
collection of helmets.
Inteq now has fully-standardized helmets, and the bulletproof (now
properly the inteq X11) no longer hides hair.
Nanotrasen now actually has helmets, including a riot one! Finally!
Hurrah! Enjoy the fun :)
This PR also sets the basis for how things should go pathing-wise going
forward. If new armor is ever to be released, please subtype it
appropriately from the categories I've shown.
Swat helmets have been partially deprecated. I intend for it to be fully
replaced by mech pilot helmets with a similar aesthetic as the
"althelmet", with a capability of flipping open or closed a flash-proof
visor.
The base helmet now displays as an error sprite. If you see it
somewhere, please replace it with an M10 helmet. This is why I marked
this PR as Test Merged Required until I am certain there are no more
examples of the base helmet wandering about the codebase.
Finally, as for balance changes, riot helmets now share stats with
heavy helmets, as I intend for them to be used in conjunction with
medium or heavy marine armor. Don't fret, they still boast a high melee
defense stat, just lower than before, in exchange for a more heavily
distributed armor spread!
Standardization is important, and the closer we get to a consistent
experience that doesn't unfairly put one faction above the other due to
wonky defense stats, the better. Keep in mind however, that this is
simply part 1 of the PR. The future parts will involve the rest of the
factions.
Also any reason for me to play as indies without weeping about terrible,
outdated spritework, the better!
M10 helmet content overlays fix and singular serene hunts helmet fix (#5375)
## About The Pull Requestyea
Why It's Good For The Game
fixes good
Makes David New Gorlex (#5371)
## About The Pull Requestgives him correct faction
Why It's Good For The Game
fixes good
puts the weed replacement reagent in weed (#5379)
## About The Pull Request didnt do this a while ago and was informed it was "annoying"Bonesetters and Surgical Tape in Medical Belts (#5366)
## About The Pull RequestAdds bonesetters and surgical tape to medical belts
Why It's Good For The Game
Medical items in medical belts. All the other medical items go in
medical belts
Mammoth Addiction no longer brainkills you (#5355)
## About The Pull Request reduces the chance of it procing brain damageCLIP-MELD Moonbase Ruin (#5307)
CLIP-MELD Moonbase Ruin (#5307) ## About The Pull RequestAdds the CLIP-MELD Moonbase Ruin, a fuel extraction facility abandoned
due to a crystal infestation and reclaimed by the Frontiersmen. Intended
to be low-medium in terms of difficulty
Also adds Spitter fronties and space variants for use in the ruin (and
possibly elsewhere), with decent chasing and an eight-round burst.
Loot includes:
Isolated in the north is a crystal-infested Class 4 moon vein, granting
significantly more ice than other Class 3-4 drills yet with less nodes.
Crystal-infected fauna are added to the spawn pool there at a low
chance.
Why It's Good For The Game
Moon submissions are open, and I've been informed maptainers are looking
for a low-medium threat ruin. This is pretty simple to clear, though
there is a high-stakes drill in the north for those willing to brave the
crystal mobs.
Gives the Mission Network app icons on the Laptop & Modular Tablet (#5335)
## About The Pull Request Gives the Mission Network app icons on the Laptop & Modular Tablet, which were referenced in the PR that added the apps, but did not exist.Why It's Good For The Game
Flavor, plus reminds you that you left the laptop on
Skm recolour (#5328)
## About The Pull Requestsprites by @thearbiber
Why It's Good For The Game
Some polymer for the SKM to make it not look too woody for whats
supposed to be mass produced
Emergency Distress Panel (#5186)
About The Pull Request
ship that can send a distress signal. It needs a ship key to function,
and there is a cooldown of ten minutes between distress signals.
distress.mp4
sound.
Why It's Good For The Game
Players should have the autonomy to launch their own distress signals.
fixes a typo in Coalition Softsuit black market (#5392)
## About The Pull Requestlets it spawn
Why It's Good For The Game
fixes good
fix disconnected cirrus power cable (#5387)
## About The Pull Requestwhoops
adds riot helm to medium marine armour cargo (#5397)
## About The Pull RequestWhy It's Good For The Game
it was supposed to be there in
shiptest-ss13/Shiptest#5321
gives the elder a real medkit (#5380)
## About The Pull Requestelder had an empty medkit for like 2 years
Why It's Good For The Game
fixes good
Why It's Good For The Game
Changelog
🆑
add: Adds the Shrike-class Fast Response Frigate, a new Vigilitas Interstellar vessel.
add: Adds two additional VI outfits.
add: New secure safe subtype
add: The Leyak has a photocopier now. It also has it's indoor adjusted.
add: Added some misc supplies and changes to Arrowsong's ERT armoury and museum. Comms to Arrowsong
add: Made new PGF items accessible
fix: Adjusted PGF outfits and items
imageadd: Added new PGF sprites
imagedel: Removed redundant sprites
add: insulated glove resprite
add: resprites explorer gas mask
add: touches up auto elite sprite
add: Kepi variant for NS hardsuit
add: The IRMG has upped the knitting quality of it's kepori-designed wear.
add: short over eye resprite
add: Athletic Shorts / Dolphin Shorts Resprite + Pink Shorts. Recolourables
fix: animals should stop erupting into gore fountains when you land
fix: hermits will refrain from causing damage to your hull during landings
fix: subshuttles having absolutely bizarre interactions with overmap location
add: more randomgen planet / randomgen star names
balance: ammo counters now go to the scope slot
fix: Magpie medical and security offices have been adjusted slightly for better space use.
balance: Made some QOL tweaks to the Typhon (Mostly the addition of some convenient starting equipment).
add: Vox Inteq command turtlenecks
add: Honorable Vanguard turtlenecks are now inteq command turtlenecks
fix: Missing vox sprite states for some NT outerwear.
add: pajama pants
balance: Slightly decreased some magazine prices (namely the Boomslang and F90)
del: Removed riot grenade underbarrel from cargo
balance: Increased frag grenade and other auxiliary grenade costs slightly
balance: Removed heavy explosive damage from Frags and devastation from Concussion grenades
del: Removed diamonds and bluespace crystals from normal veins
balance: Reduced amount of gold from normal veins. Slightly rarer rare veins
add: Hermit faction
balance: Simple mob pirates won't aggro on player pirates.
add: Horse genemods for humans
fix: wind on bombed starport
add: Added a few modified mesons to the Derecho
add: couple different planet names
balance: Many goggles and other protective wear now seal your eyes from environmental effects.
balance: Increased the health of trees to 200, from 40
add: AI eyes and advanced camera consoles can now see through body cameras.
add: Atlas-class Remap
add: Overhead lattices and pipes
add: Persistent photo album for CLIP correspondents
imageadd: Green hazard stripes
code: Subtypes for C-MM Captain, Bridge Officer, ComMed, Naval Engineer, and Sergeant lockers
code: Subtypes for C-MM and CLIP uniform lockers
code: No mag subtype of CM-24
code: Repathed C-MM sergeant, engineer, gunner, and medic
code: C-MM correspondent vest can store broadcast camera
add: touches up oneshoulder
add: Added claymore exports
del: Removed claymore purchases
add: Nanotrasen Spaceworks has begun installing sinks in the latest productions of the Kiwi-class
add: Arrowhead outpost gives the proper planetary outpost sprite
add: The IRMG has put additional funding towards medical facilities on their Colossus-class, among other smaller amenities.
add: Inteq's pilots have been issued a new standard spacesuit.
add: Frontiersman Moat ruin
del: Crashed Engineer, Beach Pirate Crash
balance: assault rifle on treasure trove replaced with an SMG
add: Added 50% more time to outpost mission contracts
fix: Fixed mission timers not showing how many hours are left in a contract
add: Added two new Sarathi frills (ears), curved and long
add: Gas mask resprite, sec hailer resprite and reflavoring
add: half mask to loadout
add: stomp emote
add: Added heels
fix: Certain NT Vox Sprites now should (actually) have sprites
add: resprites socks
fix: fixes black pufferjacket icon issue
add: NT and Ramzi fax offices.
add: the karst-class subshuttle
balance: updated the Kali Andhi, including bodycams, a DMR instead of an AR, and some flavor
add: resprites short over eye, emo fringe, short hair 2, feather
add: feather (bang)
add: Nanotrasen Advantage
add: Sharplite Defence
balance: Laserproof armor was given a slight buff in exchange for reflecting lasers being much more rare
del: The Nanotrasen Gauss rifle is no longer in black market
del: A bunch of old R&D laser weapons
del: sabr
fix: Some sound effects are no longer stereo
add: Moths now use humaniform as their prosthetic limb type (except for the head)
add: Added a ammo type toggle button
add: Swapped latch interaction over to the unique action key
del: Removed intent requirement for attachments
add: The appearance of simple humans is now much more varied
add: Flavor text now uses a tgui text box and shows character limit
del: Removed some old pref options that we dont use
add: Added MP-84m Cottonmouth, Ramzi Clique modified Rattlesnake, chambered in 10mm. Obtainable from Blackmarket and Rustbase ruin.
balance: Ramzi Clique Rustred pistol mobs now have a Cottonmouth instead of a military Ringneck and fire in slow bursts of 2
fix: rustbase turrets no longer xray shoot you
fix: winter coats will have hoods again
soundadd: The ashstorm/rockplanet weather sounds have been replaced.
soundadd: Weather sounds are now muffled when indoors.
soundadd: Weak rain now uses a unique soundloop, meaning the transition to heavy rain will be less jarring.
fix: Outside weather sounds no longer play indoors, and vice-versa.
fix: elzu no longer have a random brute damage increase
add: added quardexane to burn kit
add: Most small ships should have more stationary docking ports
fix: Mobile docking ports on most small ships
fix: disable_on_owner_ship_dock should work more properly now
fix: restores a bunch of Nanotrasen/Sharplite weapons
balance: Gruboids are no longer classified as "Hazardous Explosive Materials" by CLIP.
add: cybersun can afford more than 4 kinds of floor tile now. you can see this reflected in the cirrus and nimbus
add: Armors are currently being reworked! Indies now have a respectable variety of armors that can have their colors customized!
add: Vigilitas and by extension Nanotrasen, now boasts new helmets!
add: CLIP now has a proper M10 helmet!
fix: A variety of pathing has been retooled and fixed for certain armor sets!
balance: Riot helmets are now statistically like heavy helmets!
fix: Fixes serene hunts error helmet and M10 helmet content overlays
fix: Makes David a true New Gorlex patriot
balance: cannabis leaves now have a unique reagent
balance: Bonesetter and Surgical Tape now fit in Medical Belts
balance: Mammoth Addiction no longer brainkills you
add: Added CLIP-MELD Moonbase ruin
add: Moons now can have ruins
add: Spitter Frontiersmen
imageadd: added missing Mission Network App icon states to Laptop & Tablet
add: Two SKM recolours - Polymer and Bright
add: Emergency distress panel
soundadd: Sound for distress signals
code: Distress signals may now have a message attached to them
code: Minor rework of priority announcement code
fix: Coalition softsuit spawns correctly in black market
fix: disconnected cirrus power cable
add: Riot helmets now replace the X-11s bundled with medium tactical armour
fix: elder no longer has an empty medkit. instead it has a full one
/:cl: