forked from new-frontiers-14/frontier-station-14
-
Notifications
You must be signed in to change notification settings - Fork 25
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
NEirotoXiN00
wants to merge
743
commits into
Corvax-Frontier:master
Choose a base branch
from
NEirotoXiN00:Mails
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Mails and Dragons #104
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
fixed cog again
…unds (#32981) remove chair + changed maints db to rubber
* fix * oops, used savemap instead of savegrid
link air alarm in coms room
fix invalids
* 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 * * * 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 * * 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
* 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
Co-authored-by: Dvir <[email protected]>
* 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request