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

Mails and Dragons #104

Open
wants to merge 743 commits into
base: master
Choose a base branch
from
Open

Conversation

NEirotoXiN00
Copy link

BramvanZijp and others added 30 commits November 6, 2024 15:27
* Rework flaregun and add security shell gun

* Make flare gun twice as likely to appear in emergency lockers

* Security shell gun can now fire lethal shells like the flare gun used to be able to.

* Rebalance the sec shell gun material cost to primarily be steel instead of plastic

* Define the ShellShotgunLight tag in tags.yml

* Leave the no lethal shells for normal flareguns to a different PR.

* Move a comment to re-run checks.

* Bye bye lethal shells from plastic guns.

* Fix weird whitespace issue.

* Make the sec shell gun inherit the normal flare gun.

* Remove the rack verb and update the sec shell gun description

* Remove the ability to fire lethals from flare guns, pending blowing up the gun

---------

Co-authored-by: SlamBamActionman <[email protected]>
* Initial commit

* Change burst fire variable to be a set value rather than a multiplier
…unds (#32981)

remove chair + changed maints db to rubber
* fix

* oops, used savemap instead of savegrid
* Fix reserach disk crash

* remove extra whitespace

* removed args.handled where args are not handled
* One line fix

* Removed redundant using

* Allocation improvement
* pass Actor to cartridge messages

* NonSerialized gaming

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* cant disguise to thing in a container

* copy cigarette visualiser

* prevent aghost throwing an error

* make disguises die in space

* fuck it rewrite it to not use polymorph

* fix action troll

* oop

* add vebr

* add access to the components

* 2/3

* fix

* relay damage from disguise to user

* fix integrity

* :trollface:

* :trollface:

* m

* kill integrity

* fix a bug

* review

* remove them from component

* relay flash effect to the disguise

* fix icon being weird

* change method since multiple systems cant handle same network event

* :trollface:

* actually network Disguise real

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
* Sec Shell Gun Craftability Hotfix

* Capital Fix
* Role abandonment aHelp requirement.

* disable roundstart chat message

---------

Co-authored-by: slarticodefast <[email protected]>
* Update computers_shipyard.yml

* Move it to comp

* Update edison.yml
* Crossbow bolt fixes: projectile hit-based triggers

* Minimize diff
whatston3 and others added 25 commits December 6, 2024 13:23
* Moth digestion

* Mark pyrotton material as MothFood

* MothFood component, flavor "like cotton"

* Update Content.Server/Body/Components/StomachComponent.cs

---------

Co-authored-by: Dvir <[email protected]>
* Added rubber ammo to SecurityTechFab

Moved nonlethal recipes from dynamic to static for SecurityTechFab inherited by NfsdTechFab

* Return and comment shotgun recipes

* Moved to NFSD

* Update lathe.yml

* NFSD Stuff

* Update arsenal.yml

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
* EMP descriptions

* Comment cleanup

* Fix Frontier comments, EMP label consistency
* Added Empess cryosleep

Added cryosleep chamber to empress in place of morgue slab

* Update empress.yml

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
Adds fryer to piecrust in addition to a button to feather the thrusters
This reverts commit c41c609.
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.