Kill weapons#1833
Open
PotatOverlord wants to merge 41 commits into
Open
Conversation
…ing me and I wish I made a stash before I started commiting
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
|
Kill weapons.. Uhh Yea weapons tend to do that |
PotatOverlord
force-pushed
the
kill-weapons
branch
from
5f303fa to
4d89131
Compare
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
# Conflicts: # Content.Shared/Engineering/Systems/InflatableSafeDisassemblySystem.cs # Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml # Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml # Resources/Prototypes/Catalog/Fills/Items/belt.yml # Resources/Prototypes/Catalog/Fills/Lockers/misc.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/sustenance.yml # Resources/Prototypes/Entities/Clothing/Back/smuggler_tables.yml # Resources/Prototypes/Entities/Markers/Spawners/Mobs/hostile.yml # Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml # Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml # Resources/Prototypes/Entities/Objects/Fun/weapons.yml # Resources/Prototypes/Entities/Objects/Misc/kudzu.yml # Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml # Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml # Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml # Resources/Prototypes/Entities/Structures/Machines/microwave.yml # Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml # Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml # Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injections.yml # Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomaly_injectors.yml # Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml # Resources/Prototypes/Hydroponics/seeds.yml # Resources/Prototypes/Recipes/Cooking/meal_recipes.yml # Resources/Prototypes/floor_trap.yml
…theres a web shield and i didnt feel like doing surgery on construction graphs we were going to nuke anyways
Contributor
Author
|
ok its finally passed I might reccomend holding off on review until I rewrite the summary because the commits are pooped out but if you feel like it go ahead |
Contributor
Author
|
ok it turns out writing a proper summary is really hard when you've touched 256 files i made a list of the stuff thats leftoever good luck |
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
About the PR
I'm sorry but the commit history on this one is horrific because I did it in post & made a bunch of mistakes in the process because I forgot I did half this shit
Briefly: along with the vast majority of weapons, it also removes anomalies, syndie microwave, Basilisk/Hivebots/Watchers (RIP pride watcher), turrets, shields, shuttle cannons.
I added some general protos for the wielded weapon test and the embeddable object test because they used things I removed and its kinda weird to have your tests rely on keeping a random weapon in the files at all times
Notably I killed the inflatable test because it was testing like, a safe dissasembly thing? Idk if it was overstepping the removal stuff but it was pmo so I just killed the entire system because why does it exist
Anomalies' C# is still lingering so an issue will have to be made for that or I can grab it if needed, the scope was creeping and i was scared
Also removed that weird wire that explodes cause like. bro
Things that remain: All of the new ES ones ofc, cap gun, nerf rifle (the bright orange one), grappling hook, water pistol, makeshift bow, pneumatic cannon, pie cannon, spray nozzle (the jani/flamethrower one), cane/white cane, esword, fake esword, foam cutlass, foam sword, rubber hammer, butchers cleaver, shiv, plasma shiv, pickaxe, flash, spear, plasma spear, batong, stun prod, explosive grenade, flashbang, nuclear option, modular nades, emp grenade, ling armblade, baseball bat, fireaxe, makeshift shield, bola, firebomb, pipebomb, c4
The list of removed stuff is very extensive and i dont really want to list it out so just say if anythings missing from the above