3591 individual conflicts
Update build.js
Update install_node.sh
Update byond.js
oh my fucking god
hat
slow
huh
holy shit
we all fall down
2 more I missed
2900 individual conflicts
2700 Individual conflicts
replaces yarn file with tg version, bumping us down to 2200-ish
Down to 2000 individual conflicts
140 down
mmm
aaaaaaaaaaaaaaaaaaa
not yt
575
soon
900 individual conflicts
600 individual conflicts, 121 file conflicts
im not okay
160 across 19 files
29 in 4 files
0 conflicts, compiletime fix time
some minor incap stuff
missed ticks
weird dupe definition stuff
missed ticks 2
incap fixes
undefs and pie fix
Radio update and some extra minor stuff
returns a single override
no more dupe definitions, 175 compiletime errors
Unticked file fix
sound and emote stuff
honk and more radio stuff
## About The Pull Request
Title. Adds two new maps:
- Grasslands Hunt (peaceful)
- Meta Central (easy)
These maps add a new basic revolutionary mob and significantly upgrades
the ai of basic deer.
This fixes an issue where modular maps were not correctly spawning mobs
or adding them to the "mutable candidates" for antagonists.
There's also some balance changes to bitrunning vendor prices, which are
generally now lower. This change is unrelated to the PR as a whole so
I'm okay with removing it if there's concern
### photos
<details>
<summary>expand</summary>
</details>
### todo
- [x] Fix the revolutionary death anim
- [x] Make deer run when injured
## Why It's Good For The Game
New maps as a general positive for bitrunning
Bug fixes
Makes vendor choices for bitrunning-exclusive items generally less of a
chore to get
## Changelog
jlsnow301, MMMiracles, KikoWen0, Ben10Omintrix
🆑
add: Added two new bitrunning maps: Grasslands Hunt and Meta Central.
add: Deer are now more complex animals, granting them enhanced ability
to run amok and chew your favorite plants.
balance: Reduced the cost of most BR vendor items.
fix: Fixes an issue where modular virtual domains spawned less mobs than
intended.
fix: These modular spawns are now valid mutation targets to become an
antagonist.
/🆑
---------
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
## About The Pull Request
Replaces spin/flip's uses in mining's style meter and bitrunner's
projectile parrying and instead uses a new emote, taunt. It also does
not play a sound effect for emoting, only when you successfully block a
projectile.
The parrying time from the flip was 1.4 seconds, with taunting it is now
0.9 seconds. Taunting also has a cooldown of 1.5 seconds between uses.
https://www.youtube.com/watch?v=cJGuEqNhqUshttps://github.com/user-attachments/assets/1c6bf8b2-6a0d-4ae2-9b5b-9c6e619e76d6
## Why It's Good For The Game
Spin and flip are emotes that get a little boring and repetitive, which
makes its complete overuse quite annoying to see.
Compared to spin, taunting is a quick turn, which stacked with the
cooldown, makes it a shorter and un-overusable emote.
It also has a cooldown of 1.5s between hits, so players now actually
have a limit to how much they can parry/style. Currently if you have
some way to regenerate stamina damage, you're pretty set to spam parry
all projectiles at essentially no cost, since emotes cost nothing to
use, removing the limit of having to actually time it.
I wouldnt say falling over is necessarily a downside since anyone who
uses these items for a while can quickly figure out exactly hwo to
maximize parrying time.
## Changelog
🆑
add: Added Taunting, a faster and cooldowned version of the Spin emote.
balance: Wizards blocking projectiles with Transparence and the
bitrunner matrix skillchip now have a visible effect of deflecting the
projectile.
balance: The bitrunner skillchip now uses taunt instead of flip.
balance: The style meter now uses taunting instead of flips and spins.
/🆑
* Adds proto-kinetic accelerator modkit and proto-kinetic crusher trophy disks to the bitrunning vendor (#83825)
## About The Pull Request
Adds disks to the bitrunning vendor that give the pka and pkc additional
parts.
I have no idea if any of these numbers are balanced, I am not good at
balance, and these are just random numbers I came up with. If anyone has
any recommendations on how to better order or price it, I would love to
know.
## Why It's Good For The Game
It gives people a way to test fights against megafauna using unique
combinations of accelerator modkits and crusher trophies with less
risks.
## Changelog
🆑
add: Added disks for accelerator modkits and crusher trophies to the
bitrunning vendor
/🆑
* Adds proto-kinetic accelerator modkit and proto-kinetic crusher trophy disks to the bitrunning vendor
---------
Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
## About The Pull Request
Adds disks to the bitrunning vendor that give the pka and pkc additional
parts.
I have no idea if any of these numbers are balanced, I am not good at
balance, and these are just random numbers I came up with. If anyone has
any recommendations on how to better order or price it, I would love to
know.
## Why It's Good For The Game
It gives people a way to test fights against megafauna using unique
combinations of accelerator modkits and crusher trophies with less
risks.
## Changelog
🆑
add: Added disks for accelerator modkits and crusher trophies to the
bitrunning vendor
/🆑
## About The Pull Request
This PR adds Bepis disks to the main rewards of the Bitrunning crate in
addition to the minerals and domain specific rewards. It also removes it
from the Bepis vending machine.
Once per domain, if its difficult was Medium or higher, and the
completion score was A or S, and if there are still any leftover locked
Bepis tech nodes, a Bepis disk will spawn.
<details>
<summary>Original PR text</summary>
If domain has a reward value greater than one, it has 10% chance per
reward value to drop. No disk is gained if they ran out of techs to
unlock. Most of the domains have a reward value of three, so by the law
of great numbers they probably get one disk per every three domains run,
which should be one disk every 20-30 minutes. At least, if I am correct
that domain runs take about five to ten minutes, and the server cooldown
is three minutes. If I am incorrect, I can edit the drop chance as
needed, of course.
Edit: As I have underestimated how fast Bitrunners can be, I have
decreased the chance to be 5% per reward tier.
</details>
## Why It's Good For The Game
- Bepis disks are expensive, and bitrunners need to spend almost all
their NP on gear and abilities
- Downloading secret research data, is flavourful, fitting for invading
the forgotten nooks of cyberspace.
- This will allow Bepis tech to be actually used in rounds
## Changelog
🆑
balance: Bitrunners can now earn Bepis disks, once per medium domain or
above, if they scored at least an A.
del: Bitrunners can not buy Bepis disks from their vendors.
/🆑
## About The Pull Request
This PR adds Bepis disks to the main rewards of the Bitrunning crate in
addition to the minerals and domain specific rewards. It also removes it
from the Bepis vending machine.
Once per domain, if its difficult was Medium or higher, and the
completion score was A or S, and if there are still any leftover locked
Bepis tech nodes, a Bepis disk will spawn.
<details>
<summary>Original PR text</summary>
If domain has a reward value greater than one, it has 10% chance per
reward value to drop. No disk is gained if they ran out of techs to
unlock. Most of the domains have a reward value of three, so by the law
of great numbers they probably get one disk per every three domains run,
which should be one disk every 20-30 minutes. At least, if I am correct
that domain runs take about five to ten minutes, and the server cooldown
is three minutes. If I am incorrect, I can edit the drop chance as
needed, of course.
Edit: As I have underestimated how fast Bitrunners can be, I have
decreased the chance to be 5% per reward tier.
</details>
## Why It's Good For The Game
- Bepis disks are expensive, and bitrunners need to spend almost all
their NP on gear and abilities
- Downloading secret research data, is flavourful, fitting for invading
the forgotten nooks of cyberspace.
- This will allow Bepis tech to be actually used in rounds
## Changelog
🆑
balance: Bitrunners can now earn Bepis disks, once per medium domain or
above, if they scored at least an A.
del: Bitrunners can not buy Bepis disks from their vendors.
/🆑
## About The Pull Request
Active skillchips are now copied on bitrunning avatars. To celebrate
this, I've made a skillchip, which can be ordered through the bitrunning
vendor, that lets you dodge projectiles for the duration of your flips
plus 1/10 of a second (so 8/10 of a sec), at the cost of stamina (if you
think 20 is a bit too low, tell me).
I've also renamed the files containing the orderable bepis disks and
bitrunning tech because they inconsistent with the names of their
sections shown in the UI.
## Why It's Good For The Game
I think (active) skillchips being copied to bitrunning avatars makes
sense as after all they're both tech-y, brainy stuff. It's a bit of a
shame that no one thought of doing that.
## Changelog
🆑
add: Active skillchips are now copied on bitrunning avatars.
add: To celebrate it, a skillchip is now available from the bitrunning
order console, which lets you dodge projectiles for the duration of your
flips, at the cost of stamina.
/🆑
* Adds unique vendor description to the bitrunning disks (#80444)
## About The Pull Request
This PR adds a unique description to the six bitrunning disk vendor
orders.
## Why It's Good For The Game
This lets you know in advance what the disks contain, so you can plan
out if you want to save up your heard earned bitpoints for being able to
turn into a dragon, or perhaps if you want to double up on complex
spells.
## Changelog
🆑
qol: The bitrunning equipment vending machine now has a unique
description for each of the bitrunning disks
/🆑
* Adds unique vendor description to the bitrunning disks
---------
Co-authored-by: Profakos <profakos@gmail.com>
## About The Pull Request
This PR adds a unique description to the six bitrunning disk vendor
orders.
## Why It's Good For The Game
This lets you know in advance what the disks contain, so you can plan
out if you want to save up your heard earned bitpoints for being able to
turn into a dragon, or perhaps if you want to double up on complex
spells.
## Changelog
🆑
qol: The bitrunning equipment vending machine now has a unique
description for each of the bitrunning disks
/🆑
* Feature: bitrunner, a new supply role (READY)
* Delete bepis.dm
* Conflicts
* Update dynamic_rulesets_midround.dm
* Fixing this invalid icon file path
It was trying to use the aesthetics one
* Bepis is dead
* New digi sprites courtesy of CandleJaxx!!
Now in the correct branch!
* Fixing merge conflict
* bitrunning hotfixes [NO GBP]
* Modular health adjustments
* Revert "Modular health adjustments"
This reverts commit 0ff3c48d39.
* Modular health adjustments
Only this one should be necessary
* The screenshot test
* Bitrunner den for voidraptor (FOR #23865) (#23891)
* no shower in sight
* lets bitrunners actually get to their room and spawn there
* New digi sprites courtesy of CandleJaxx!!
* Revert "New digi sprites courtesy of CandleJaxx!!"
This reverts commit eea9f47de2.
---------
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
* Removes bitrunning unit tests (#78607)
## About The Pull Request
Removes the fraction of unit tests I thought would be safe.
Not thrilled that I have to exclude ALL unit tests now, but hey.
The issue is that atmos attempts to process on a turf which hasn't
initialized yet.
## Why It's Good For The Game
Other PRs can pass checks now
## Changelog
N/A
* Update birdshot.dmm
* Tweaks the BEPIS category of the bitrunning order console
* Adds back the flashdark that we had skyrat edited in
* Update tgstation.dme
* Fixes Voidraptor bitrunning den not being connected to the powergrid
---------
Co-authored-by: Jeremiah <42397676+jlsnow301@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
Co-authored-by: Profakos <profakos@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
## About The Pull Request
The bitrunner PR has removed the BEPIS machine, but kept two BEPIS disks
as a possible reward. However, the base BEPIS disks may contain
duplicate data. Originally, the BEPIS dispensed a Reformatted version of
the disks, which on spawn remove their tech from the spawn list,
ensuring that any future BEPIS disks would not contain duplicates of
this purchased data. Therefore, I have removed the cheaper version,
after discussing this with jlsnow301.
Of course, your expensive disk can still contain data that was in a base
disk found in space, or worse, mailed to a scientist, and eventually,
you will run out of techs to purchase, but these are separate issue.
I have also added the orphaned minor rewards to the same console, with
prices suggested by @ArcaneMusic, who has also suggested that I should
set all prices to be derived from the crew paycheck define, however,
none of the product vendors use this, so I think I would like to do all
of those in one go in a separate PR.
The reasoning behind the prices:
- Survival Pen: Not too disruptive, it just lets you dig. 150, lets
round it up. Worth 100, or 1 star when not express ordered.
- Spray on gloves: prevents shocks 10 times, cleaning also uses up
charges, uses up glove slots. Potentially disruptive item. 750 or 500
when not express ordered.
- Party pod: Mainly drugs, beer and recolouring chems, with potential of
poisoning. 750 or 500 when not express ordered as while it is something
silly you can do during downtime, you should do a bit of hunting for
crates before you get this.
- Polycircuit: Actually very good item for engineers, so they have to
carry less stuff around. They would still get bleed from using it, if
someone interrupts them, but that doesn't matter much. 8 uses of
circuits, adds up to little more than half sheet of materials, which is
vastly smaller than the mineral amounts you get from the crates. 150, or
100 when not expressed ordered, just because of the versatility, and
taking up only one slot in the inventories. Much cheaper than the
original proposed one.
Still thinking about how to reintroduce the "Make Buck" Doe, I will try
to reintroduce them in a different PR.
## Why It's Good For The Game
Its bad when a bitrunner buys an expensive disk, only to realize its
contents are the same as the cheaper disk they bought due to RNG.
The silly items from the BEPIS shouldn't be lost. The prices are fair
because you are giving up your precious domain loot points that you
could use to give a gun to your avatar to buy a silly spray-on glove.
## Changelog
🆑
add: Added the BEPIS' minor rewards as purchasable products to the
bitrunning order console.
del: Removed the base BEPIS disk from the bitrunner console
/🆑
Waterpig
