Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Prevents Mindswapping on Bitrunners #350

Merged
merged 1 commit into from
Oct 31, 2023
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24667
Original PR: tgstation/tgstation#79323

About The Pull Request

Fixes #79310

Adds a new trait to prevent mindswaps (which is just useful for any future cases when we don't wanna rely on the blacklist typecache) while also accounting for bitrunners (who you can't mindswap because their mind is elsewhere) and their avatars (because that's not a real mind now is it).

this does mean that bitrunners while bitrunning are immune to all mindswaps but i don't have a good answer on how to fix it. i don't even much like the idea of VR but I think that having these traits are useful enough for future utilization.

Why It's Good For The Game

prevent big breakage.

Changelog

🆑 san7890
fix: Bitrunners can no longer get mass-mindswapped out of their avatar when the wizard does the event. Something about machinery and magic not going well together.
/:cl:

* Prevents Mindswapping on Bitrunners (#79323)

## About The Pull Request

Fixes #79310

Adds a new trait to prevent mindswaps (which is just useful for any
future cases when we don't wanna rely on the blacklist typecache) while
also accounting for bitrunners (who you can't mindswap because their
mind is elsewhere) and their avatars (because that's not a real mind now
is it).

this does mean that bitrunners while bitrunning are immune to all
mindswaps but i don't have a good answer on how to fix it. i don't even
much like the idea of VR but I think that having these traits are useful
enough for future utilization.
## Why It's Good For The Game

prevent big breakage.
## Changelog

:cl:
fix: Bitrunners can no longer get mass-mindswapped out of their avatar
when the wizard does the event. Something about machinery and magic not
going well together.
/:cl:

* Prevents Mindswapping on Bitrunners

---------

Co-authored-by: san7890 <[email protected]>
@ReezeBL ReezeBL merged commit 9a8c4ef into master Oct 31, 2023
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-24667 branch October 31, 2023 07:12
AnywayFarus added a commit that referenced this pull request Oct 31, 2023
Iajret pushed a commit that referenced this pull request Feb 12, 2024
* big interdyne rework

* fixes

* oops i missed one

* not the first defo not thte last

* a grave mistake

* more fixes to ease my soul

* sprite fixes

* biohood was acting up

* oops

* some extra detailing

* i left a syringe gun on the floor

* adds lightswitches

* floating fucking light

* one more quick fix

* floating camera

* feedback and fixes

* big changes

* big fixes

* grilled cheese

* one last small oops

* wrong airlock perms :(

* air alarm helpers

* fixes active turfs

* more fixes...

* the government is invading my home

* small ds2 brig treatment area

* kitchen oopsie

* table

* missing wire

* actual lounge area

* small oops

* sigh

* dying im dying im dying

* AAAAAAAAAAAAAAAAAAAA

* i should probably give them rad protection

* floating camera

* apc hiding in a window

* way too many commits

* one last small tweak

* commit

* makes power setup easier

* moves radsuit so players don't miss it

* changes based on feedback

* removes interdyne white ship console

* this looks really dumb lets move some things

* doors

* small biosuit change

* names some things that should have names

* icebox vendor fixes

* gave some of interdynes jackets armor values

* tide resistance (turrets in various places)

* fixes and tweaks

* conscription kit

* CRYING AND SHAKING

* one last little thing

* wwwwwww

* adjust brig officer loadout

* laundry + barber

* stray cytology equipment locker

* :3

* room

* fixes

* few more things

* something something

* something really dumb i overlooked

* increase nif boxes

* 500 commits later

* IMMERSIVE BATHROOM

* one more :(

* more small fixes

* wwwwwwwwwwwwwwwww

* deletes random windoor from hell

* odds and ends

* trash bin move

* areas

* sorry 4 so many commits omg

* real

* expansion

* commit message

* i forgot some railings uUUGHHHH

* im gonna cry

* quirked up

* locker fix

* tables !

* JUST... ONE... MORE... COMMIT...

* light fixes

* ok im done now

* #%#$%

* final touches

* misc fixes

* bbbbbbbbbbbbbbbbbbbbb

* e

* digi/tesh sprite fixes

* resolve merge conflicts

* small fixes

* one more

* disposal chute

* sansufentanyl crates

* last minute fixes

* disconnected disposal pipe from hell

* its so fucking over

* stupid turret thing

* tm ready

* inducer + extra building materials

* oop

* fix broken door bolt buttons

* renames a button

* long sigh

* resolve merge conflicts

* i forgot the armory kiboko locker

* im dumb oops

* hhuuuhh

* sigh

* why did i put that there

* repaths

* area changes, repaths

* do that instead.

* more that I missed. woops.

* tweaky tweaks

* more.

* outfit cleanup

* polishing. shuttle.

* and the rped...

* shuttle fix. tweaks and fixes.

* epipens return

* ds2 prison intercoms

* one more. plus the boxes for the ds-2 ops

* icedyne drobe, beds, plumbing path tweak

* Merge skew

* Why does this still keep happening?!!?!?

* Revert "Why does this still keep happening?!!?!?"

This reverts commit 37f84b1c16ccf8f3a819991c83bb3b33185eb180.

* hotfixes.

* fixes

* quick revert. I'll fix it in the morning once I've slept.

* IDs. kindness to monkies.

* closets

* medkit fixes, less miner murder

* a

* polarizing.

* wrong branch.

* oh so that's where announcements are handled

* ship gets thick

* pool floor test

* windoors

* make linters happy

* onstation cleanup. I think that's it.

* dorms wiring

* shower.

* small area fix

* xenobio fixes - camera and plasma

* barber vendor

* decor from dhu

* a

* conflict cleanup

* linters. heck u jolly.

* tweaks

* camera fixes. couple of bluespace cells from tg lathe changes

* light stuff.

* lathe fuckery not needed now?

* small area fix + backpacks

* dyne biolockers. do tweaks.

* there's no reason we shouldn't have sensors now. we're not syndicate.

* duct.

* oops.

* one last one.

* note, push commit

---------

Co-authored-by: NotDhu <[email protected]>
Co-authored-by: Zergspower <[email protected]>
Co-authored-by: Bloop <[email protected]>
Iajret added a commit that referenced this pull request Mar 6, 2024
* Interdyne/DS2 Rising: Revengeance (#350)

* big interdyne rework

* fixes

* oops i missed one

* not the first defo not thte last

* a grave mistake

* more fixes to ease my soul

* sprite fixes

* biohood was acting up

* oops

* some extra detailing

* i left a syringe gun on the floor

* adds lightswitches

* floating fucking light

* one more quick fix

* floating camera

* feedback and fixes

* big changes

* big fixes

* grilled cheese

* one last small oops

* wrong airlock perms :(

* air alarm helpers

* fixes active turfs

* more fixes...

* the government is invading my home

* small ds2 brig treatment area

* kitchen oopsie

* table

* missing wire

* actual lounge area

* small oops

* sigh

* dying im dying im dying

* AAAAAAAAAAAAAAAAAAAA

* i should probably give them rad protection

* floating camera

* apc hiding in a window

* way too many commits

* one last small tweak

* commit

* makes power setup easier

* moves radsuit so players don't miss it

* changes based on feedback

* removes interdyne white ship console

* this looks really dumb lets move some things

* doors

* small biosuit change

* names some things that should have names

* icebox vendor fixes

* gave some of interdynes jackets armor values

* tide resistance (turrets in various places)

* fixes and tweaks

* conscription kit

* CRYING AND SHAKING

* one last little thing

* wwwwwww

* adjust brig officer loadout

* laundry + barber

* stray cytology equipment locker

* :3

* room

* fixes

* few more things

* something something

* something really dumb i overlooked

* increase nif boxes

* 500 commits later

* IMMERSIVE BATHROOM

* one more :(

* more small fixes

* wwwwwwwwwwwwwwwww

* deletes random windoor from hell

* odds and ends

* trash bin move

* areas

* sorry 4 so many commits omg

* real

* expansion

* commit message

* i forgot some railings uUUGHHHH

* im gonna cry

* quirked up

* locker fix

* tables !

* JUST... ONE... MORE... COMMIT...

* light fixes

* ok im done now

* #%#$%

* final touches

* misc fixes

* bbbbbbbbbbbbbbbbbbbbb

* e

* digi/tesh sprite fixes

* resolve merge conflicts

* small fixes

* one more

* disposal chute

* sansufentanyl crates

* last minute fixes

* disconnected disposal pipe from hell

* its so fucking over

* stupid turret thing

* tm ready

* inducer + extra building materials

* oop

* fix broken door bolt buttons

* renames a button

* long sigh

* resolve merge conflicts

* i forgot the armory kiboko locker

* im dumb oops

* hhuuuhh

* sigh

* why did i put that there

* repaths

* area changes, repaths

* do that instead.

* more that I missed. woops.

* tweaky tweaks

* more.

* outfit cleanup

* polishing. shuttle.

* and the rped...

* shuttle fix. tweaks and fixes.

* epipens return

* ds2 prison intercoms

* one more. plus the boxes for the ds-2 ops

* icedyne drobe, beds, plumbing path tweak

* Merge skew

* Why does this still keep happening?!!?!?

* Revert "Why does this still keep happening?!!?!?"

This reverts commit 37f84b1c16ccf8f3a819991c83bb3b33185eb180.

* hotfixes.

* fixes

* quick revert. I'll fix it in the morning once I've slept.

* IDs. kindness to monkies.

* closets

* medkit fixes, less miner murder

* a

* polarizing.

* wrong branch.

* oh so that's where announcements are handled

* ship gets thick

* pool floor test

* windoors

* make linters happy

* onstation cleanup. I think that's it.

* dorms wiring

* shower.

* small area fix

* xenobio fixes - camera and plasma

* barber vendor

* decor from dhu

* a

* conflict cleanup

* linters. heck u jolly.

* tweaks

* camera fixes. couple of bluespace cells from tg lathe changes

* light stuff.

* lathe fuckery not needed now?

* small area fix + backpacks

* dyne biolockers. do tweaks.

* there's no reason we shouldn't have sensors now. we're not syndicate.

* duct.

* oops.

* one last one.

* note, push commit

---------

Co-authored-by: NotDhu <[email protected]>
Co-authored-by: Zergspower <[email protected]>
Co-authored-by: Bloop <[email protected]>

* Luna's Dyne update

* ATs???

* and some more

---------

Co-authored-by: sqn <[email protected]>
Co-authored-by: NotDhu <[email protected]>
Co-authored-by: Zergspower <[email protected]>
Co-authored-by: Bloop <[email protected]>
Co-authored-by: Iajret <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants