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] [S] The great space horror #2483

Merged
merged 1 commit into from
Mar 22, 2024
Merged

[MIRROR] [S] The great space horror #2483

merged 1 commit into from
Mar 22, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#635

About The Pull Request

How This Contributes To The Nova Sector Roleplay Experience

Proof of Testing

Screenshots/Videos

Changelog

🆑 Zergspower
add: ah shit
/:cl:

* The Fleshy bits

* 2

* silly controllers

* 5

* Update fleshmind_structures.dm

* 7

* Update modular_nova/modules/space_ruin_specifics/code/machine_corruption_component.dm

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

* Update modular_nova/modules/space_ruin_specifics/code/fleshmind_environment_objects.dm

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

* Update modular_nova/modules/space_ruin_specifics/code/machine_corruption_component.dm

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

* Update modular_nova/modules/space_ruin_specifics/code/fleshmind_environment_objects.dm

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

* Update modular_nova/modules/space_ruin_specifics/code/fleshmind_environment_objects.dm

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

* Update modular_nova/modules/space_ruin_specifics/code/machine_corruption_component.dm

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

* Update modular_nova/modules/space_ruin_specifics/code/machine_corruption_component.dm

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

* Update modular_nova/modules/space_ruin_specifics/code/machine_corruption_component.dm

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

* tweaks

* 5

* cheeky

* Update fleshmind_environment_objects.dm

* 3

* Update cargodiselost.dmm

* Update fleshmind_controller.dm

* 66

* 7

* Update fleshmind_environment_objects.dm

* Update icon_smoothing.dm

* 2

* Update fleshmind_controller.dm

* Update icon_smoothing.dm

* were it so easy?

* Update fleshmind_mobs.dm

* Update fleshmind_mobs.dm

---------

Co-authored-by: Bloop <[email protected]>
@ReezeBL ReezeBL merged commit fed33bc into master Mar 22, 2024
24 checks passed
@ReezeBL ReezeBL deleted the upstream-mirror-635 branch March 22, 2024 06:33
AnywayFarus added a commit that referenced this pull request Mar 22, 2024
Iajret pushed a commit that referenced this pull request May 15, 2024
…d. (#2483)

* The armoury contraband locker guns have a chance to be rigged. (#83167)

## About The Pull Request
Gives a 10% chance for the handguns in the armoury to be rigged. The
makarov and desert eagle will have a clown pin, ultra clown pin or the
explosive ultra clown pin when rigged, randomly and uniformly weighted.
The pins can not be removed, even the normal ones, so there is only one
way to find out. The Unica 6 will be reversed, shooting you instead when
rigged.
## Why It's Good For The Game
People are too trustworthy of the gear they use in the contraband
locker. By giving them a chance to be rigged and backfire on them,
people will treat these guns like contraband and not toys. If someone
was treating them like a toy, they could receive a nice introduction of
the syndicate.
## Changelog
:cl:
balance: There are reports of malfunctioning guns being confiscated.
/:cl:

* The armoury contraband locker guns have a chance to be rigged.

---------

Co-authored-by: Pickle-Coding <[email protected]>
Co-authored-by: NovaBot13 <[email protected]>
ReezeBL pushed a commit that referenced this pull request May 16, 2024
…d. (#2483) (#3320)

* The armoury contraband locker guns have a chance to be rigged. (#83167)

## About The Pull Request
Gives a 10% chance for the handguns in the armoury to be rigged. The
makarov and desert eagle will have a clown pin, ultra clown pin or the
explosive ultra clown pin when rigged, randomly and uniformly weighted.
The pins can not be removed, even the normal ones, so there is only one
way to find out. The Unica 6 will be reversed, shooting you instead when
rigged.
## Why It's Good For The Game
People are too trustworthy of the gear they use in the contraband
locker. By giving them a chance to be rigged and backfire on them,
people will treat these guns like contraband and not toys. If someone
was treating them like a toy, they could receive a nice introduction of
the syndicate.
## Changelog
:cl:
balance: There are reports of malfunctioning guns being confiscated.
/:cl:

* The armoury contraband locker guns have a chance to be rigged.

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: Pickle-Coding <[email protected]>
Co-authored-by: NovaBot13 <[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