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] slaughter/laughter demon roundend report consume count + you cant bodyslam yourself #2782

Merged
merged 1 commit into from
Apr 8, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1868
Original PR: tgstation/tgstation#82481

About The Pull Request

you cant bodyslam yourself as a slaughter/laughter demon
also
2024-04-05 18_46_26-Space Station 13

also moved antag datum stuff to mind init which means easier spawning

Why It's Good For The Game

i wanted to brag in OOC about my supreme robust killcount but then i realized theres no way to verify this
also hurting yourself is stupid

Changelog

🆑 mc-oofert
qol: slaughter/laughter demons have a cooler round end report
qol: you may not bodyslam yourself as a demon
code: slaughter and laughter demons are given their antag datum when their mind initializes
/:cl:

… cant bodyslam yourself (#1868)

* slaughter/laughter demon roundend report consume count + you cant bodyslam yourself (#82481)

## About The Pull Request

you cant bodyslam yourself as a slaughter/laughter demon
also
![2024-04-05 18_46_26-Space Station
13](https://github.com/tgstation/tgstation/assets/70376633/2f67747f-fbd4-471a-a8bf-b7c0df6948eb)

also moved antag datum stuff to mind init which means easier spawning


## Why It's Good For The Game

i wanted to brag in OOC about my supreme robust killcount but then i
realized theres no way to verify this
also hurting yourself is stupid

## Changelog
:cl:
qol: slaughter/laughter demons have a cooler round end report
qol: you may not bodyslam yourself as a demon
code: slaughter and laughter demons are given their antag datum when
their mind initializes
/:cl:

---------

Co-authored-by: MrMelbert <[email protected]>

* slaughter/laughter demon roundend report consume count + you cant bodyslam yourself

---------

Co-authored-by: jimmyl <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
@Iajret Iajret merged commit 53f5cf2 into master Apr 8, 2024
26 checks passed
@Iajret Iajret deleted the upstream-mirror-1868 branch April 8, 2024 22:14
AnywayFarus added a commit that referenced this pull request Apr 8, 2024
Iajret pushed a commit that referenced this pull request Jun 20, 2024
* Fixing the timeline (Paradox clone fixes)

* Modular updates

---------

Co-authored-by: Lufferly <[email protected]>
Co-authored-by: Mal <[email protected]>
Iajret added a commit that referenced this pull request Jun 20, 2024
* [MIRROR] Fixing the timeline (Paradox clone fixes) (#2782)

* Fixing the timeline (Paradox clone fixes)

* Modular updates

---------

Co-authored-by: Lufferly <[email protected]>
Co-authored-by: Mal <[email protected]>

* Update changeling.dm

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Lufferly <[email protected]>
Co-authored-by: Mal <[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