This better not fuck shit up #2
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* adds mult to most OnLife effects of bioeffects. some stuff is still in progress, and sims OnLife is not the same. * made these files work too * lag adjusts addict and kleptomaniac * updates revenant mult adjustment * enforces revenant time limit * applies remainders to mult loop * moves roundedmultremainder from OnLife to datum and makes emp_field actually use it * makes EMP overlays not stack also fixes only EMPs that hit you showing up on your Z * Readability update to bioeffect timer Co-authored-by: Tarmunora <48066662+Tarmunora@users.noreply.github.com> * removes blood toxification double lag compensation * fine. I'll do it myself. Co-authored-by: Tarmunora <48066662+Tarmunora@users.noreply.github.com>
* fixes artifact in-hand, basketball in-hand, leg blood overlay not showing up right * makes lipstick 1px (both hair and applied lipstick) * also adjusts signifier and phaser in-hand * also updates clown shoes based on feedback I got * also fixes industrial armor using the old sprite
* wip roach color customization * roach color customization, roach talk sounds * lowers pitch of roach talk sounds * makes roach skin tone be based on skin tone
Broke things horribly in relation to blood and whatnot.
…'ve been"" This reverts commit acf1cfa.
* feature: add a syringe gun that accepts love & hugs - the love gun No more tomorrow, the time is today. It can make you feel okay. You pull the trigger of the Love Gun. this adds the "love gun" as an alternative to the syringe gun. the love gun accepts only two reagents (love & hugs) and cannot be emagged to accept others. it's for love, not war. because of this limitation, it has a larger capacity than the standard syringe gun this also adds the "Love Gun Plus", for when the station is really in need of more love than the Love Gun carries. this was mostly added to be used in Lily White's office, but I bet it'd be neat to stash other harder to reach areas * chore: use the love gun plus in rodney's office confirmed with rodney on discord that this is lovely as long as it has a whole lotta love in it * chore: add the love gun to the clownspider prefabs this includes the love gun with the pink clown clothes in the clownspider prefabs for both the debris field & the trench
* donezo * to bohrum esq mats
* Resprite of popcorn/fries/takeout * adds chopsticks to takeout crate
cleans up some notice board code
ThatFiveGuys
pushed a commit
that referenced
this pull request
Aug 22, 2021
ThatFiveGuys
pushed a commit
that referenced
this pull request
Aug 21, 2022
…10146) * Flockmind now dies if their rift is destroyed * call your parents * Amy review * Update code/obj/flock/structure/rift.dm Co-authored-by: Ryan <53062374+FlameArrow57@users.noreply.github.com> * Reverted disposing parent call change * try #2 Co-authored-by: Ryan <53062374+FlameArrow57@users.noreply.github.com> * no single letter variable names Co-authored-by: Ryan <53062374+FlameArrow57@users.noreply.github.com>
ThatFiveGuys
pushed a commit
that referenced
this pull request
Jul 9, 2023
Co-authored-by: skeletonman0 <skeletonman0a@gmail.com>
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 PR
Why's this needed?
Changelog