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

undefined #4

Closed
wants to merge 1 commit into from
Closed

undefined #4

wants to merge 1 commit into from

Conversation

ffmirrorbot[bot]
Copy link

@ffmirrorbot ffmirrorbot bot commented Oct 5, 2023

undefined

* Add blackout drunk (#78394)

## About The Pull Request
You drink too much you lose your memory, but we cant really do that so
instead a ghost will take control of your body temporary. The drunk
character will then be given objective to do wild, wacky and otherwise
unusual stuff until the original returns to backtrack what transpired.
The blackout character will not be able to kill or hurt the body. Oh and
the duration is about 10 minutes
## Why It's Good For The Game

![image](https://github.com/tgstation/tgstation/assets/92416224/16808551-43a3-4495-848a-4707412fc049)
## Changelog
:cl:
add: Added blackout, happens when you drink...ALOT
/:cl:

---------

Co-authored-by: carlarctg <53100513+carlarctg@ users.noreply.github.com>

* Add blackout drunk

* No blackout drunk lol

* Fixes the commenting out

---------

Co-authored-by: FinancialGoose <[email protected]>
Co-authored-by: carlarctg <53100513+carlarctg@ users.noreply.github.com>
Co-authored-by: GoldenAlpharex <[email protected]>
Co-authored-by: GoldenAlpharex <[email protected]>
@Iajret Iajret closed this Oct 5, 2023
@Iajret Iajret deleted the upstream-mirror-24084 branch October 5, 2023 23:30
Iajret pushed a commit that referenced this pull request Jan 24, 2024
…30 (#42)

* Organ movement refactor *Un-nullspaces your organs*

* Fix conflicts

I checked the conflicts on the two weird conflicts and no previous TG pr touches them i assume its just github being github because those shoulden't be conflicts *shrug

* Fix #1 uhh...this is going to be a long one

* Fix #2 Modular Movement Flags

* Fix #3 It builds now

* Fix #4 Oh god it builds now, I missed some things

* Fix #5 No more Runtimesplosion Now time for Synths

* Fix #6 Shut up CI Where did you even come from

* Fix #7 Didn't I fix you already?

* Update language.dm

* Fix Opfor jank

* Revert "Fix Opfor jank"

This reverts commit 6af2fd71d85e6be58890f27f4f32bf92cfcb00fb.

* Revert "Revert "Fix Opfor jank""

This reverts commit cbd72277afd05f30a0b6f499a8162412fe3663ea.

* Update module_template.md

* Revert "Revert "Revert "Fix Opfor jank"""

This reverts commit 71ae4c10d8e9876c97f67278c55caa994b26a7dc.

* Fixing a runtime with H.A.R.S. (#80772)

The brain gets moved into the chest with H.A.R.S. now, but the bodypart
insertion and removal procs for it still asume it can only be found in
the head. This should fix it. For the sake of preventing similar issues
in the future, I've also updated the pretty-much-identical versions for
ears, eyes and tongue.

I've checked, and the brain var is only used by the head for visuals and
examine strings.

* Modular updates

* Fix synths not dying after being debrained

* Update brain.dm

* Update cortical_borer.dm

* Revert "Fixing a runtime with H.A.R.S. (#80772)"

This reverts commit 225035c2101d0e8946f7ef8cb375b68f2d25533a.

* Update dismemberment.dm

---------

Co-authored-by: Time-Green <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
Co-authored-by: Ghom <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants