Ports Microfusion Energy Guns #961
Merged
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
* RELOADING! * Update skillchip.dm * a * Update master.dm * Update master.dm * Part one * E * E * EOR * Oops * EEEH * Fixes. * begone oldcode from old times * fixes * cell attatchments * haha u cant spell * Gun attachments! * Fastest gun in the west * Update multi_cell_charger.dm * ESA * Stability * phase emitters * foixes * More fixes * Update microfusion_gun_attachments.dm * Update microfusion_gun_attachments.dm * eee * Intermediate interactions. * Update microfusion_energy_master.dm * wooh * EEE * Update microfusion_cell.dm * Map edits * Merge branch 'master' into gun_reloads * E * attachment removal * Update _basemap.dm * proper parent gun interactions * Update code/game/machinery/recharger.dm Co-authored-by: Tom <[email protected]> * E * Update modular_skyrat/modules/gunsgalore/code/guns/ballistic_master.dm Co-authored-by: Tom <[email protected]> * Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm Co-authored-by: Tom <[email protected]> * Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm Co-authored-by: Tom <[email protected]> * Review comments pt2 * review comments pt2 * review part 3 * review part 4 * review 4.1 * review fixes * Update microfusion_designs.dm * ffs * Update code/__DEFINES/~skyrat_defines/traits.dm Co-authored-by: GoldenAlpharex <[email protected]> * Nearly there * final review commit * Update multi_cell_charger.dm * Update microfusion_energy_master.dm * E * insight * Fixes, rgb, remove instability on cells * de epic * Update _basemap.dm * TGUI in the houise * Update MicrofusionGunControl.js * FULL STEAM AHEAD CHOO CHOO (Adds zooming) * FUU bayonets and flights * e * Nearly * microCHANGES * Update gun.dm * Minidate. - Shooting the gun while it's overheating can cause it to [REDACTED]. - Shooting the gun while it's overheating will burn your hand! - Some cells will now notify you when they're empty using an alarm sound. - Gun barrel attachments now change the sound of the laser! - An overheating emitter slows down! - Emitters now control fire time more! * 0 * owo * FFF * Update code/game/machinery/recharger.dm Co-authored-by: GoldenAlpharex <[email protected]> * Update modular_skyrat/modules/gunhud/code/gun_hud_component.dm Co-authored-by: GoldenAlpharex <[email protected]> * no spolsion * Generally we want the cell in our hands * 0 * Update microfusion_gun_attachments.dm * E * E * FINAL * superheater * Update projectiles.dm * Update microfusion_energy_master.dm * Update projectiles.dm * Update microfusion_gun40x32.dmi * Update laser_1.ogg * E * whoop * Cargo crates! * Review plus material updates * Update microfusion_designs.dm * E * E * E * E * EEEE * Update gun_spawns.dm * Some fine tuining * Update gun_spawns.dm * Update recharger.dm * E * Update microfusion_gun_attachments.dm * E * E * Update microfusion_gun_attachments.dmi * Update code/game/machinery/recharger.dm Co-authored-by: Tom <[email protected]> * E * You can now actually insert different cells into advanced guns! * 0 * E * Update microfusion_gun_attachments.dm * Update microfusion_energy_master.dm * Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm Co-authored-by: GoldenAlpharex <[email protected]> * Update modular_skyrat/modules/microfusion/code/microfusion_cell.dm Co-authored-by: GoldenAlpharex <[email protected]> * E * Update microfusion_energy_master.dm * Update microfusion_gun_attachments.dm Co-Authored-By: Tom <[email protected]> Co-Authored-By: GoldenAlpharex <[email protected]>
wraith-54321
force-pushed
the
guns-ports
branch
from
f3512a4 to
c54b2b7
Compare
* LasersAreTameNow * HellfireAndSuperheat * Update readme.md * Modular Edit of Damage * moreupdates * Update modular_skyrat/modules/microfusion/code/microfusion_gun_attachments.dm Co-authored-by: Gandalf <[email protected]> * goerofsleepy * eep * morestuff * Update microfusion_gun40x32.dmi * Update microfusion_designs.dm * price * oops * whyisthiscodenotworking * help * aaaaaaaaaaa * how * YeahBabyWeMadeIt * wowcoolreloads * LetsGoBaby * coolbox * Update modular_skyrat/modules/microfusion/code/cargo_stuff.dm Co-authored-by: OrionTheFox <[email protected]> * reviews * missedone * cells * cargo * aaaaaa * lasernerf * refactor * hhnnngh Co-authored-by: Gandalf <[email protected]> Co-authored-by: OrionTheFox <[email protected]>
* refactors MCR design * forgot one designpath * more sorting im sorry @ErdinyoBarboza * linters hate him! * not again * I found a bug
* rere * Update microfusion_designs.dm * Update microfusion_techweb.dm * Update microfusion_gun_attachments.dm Co-authored-by: Gandalf <[email protected]>
* mega-commit * js fix 1 * js fix 2 * documentation1 * balance? * balance pass * 2 -> 20 mins * m90 increase * thanks prophet (balance and stuff) * more touchups * mini correction * cmg update * tgui fix * this took me too long * permit pin removal (testing) * price bump * accidental commit * ammo cheapening * weh * this is incredibly embarassing * woo * woo * pepperballs * permit-pins are lame anyway * dep guards get permits * CI fix * model75 increase * fix lint * model75 removal * Update cargo_stuff.dm * ZONESPACE REEEEE * not the bluie's anymore * interdyne company fixes and stuff * fix * fix2 * nagant revolver removal * threshold changes * undo * techshell to dynamics * mag cost 3.5 -> 3 * dynamics 10mm auto * ammo gens manifest * ladon/osprey price changes * if ixed it for you sir * assault rifle rebalancing * review * Update modular_skyrat/modules/gun_cargo/code/datums/cargo_pack.dm Co-authored-by: Ghom <[email protected]> * Apply suggestions from code review Co-authored-by: Dragonfruits <[email protected]> * Update modular_skyrat/modules/sec_haul/code/guns/guns.dm Co-authored-by: Dragonfruits <[email protected]> * weh * add disabler crates back Co-authored-by: Gandalf <[email protected]> Co-authored-by: Ghom <[email protected]> Co-authored-by: Dragonfruits <[email protected]>
…ded, not like ballistic guns that happen to fire lasers (#16017) * dont look at the branch name * removes the rechargeable attachment from cargo, fixes a desc * its a two handed weapon y'all * its a tradeoff, not a flat upgrade * copypaste naming my beloved * unless its admin or has big downsides, everything should be a sidegrade * reorders the messages * a whole bunch of realizing these modules dont mean anything anymore * we dont need ammo pouches since we dont reload these anymore * i forgor a few * some fixes to make self charging usable * indentation fixes, this is also a constantly running fusion reaction * damnit i forgor
mcr charge fix
* MCR cargo changes * dont need bulk cells anymore
|
And im sure there will be NOTHING WHAT SO EVER UNSAVORY IN THE COMMITS. |
* Finally Sanity * Update robot_items.dm * leftover * multi-cell oops * tweak * suggested * Match upstream Research category for integrations sake * Revert "Match upstream Research category for integrations sake" This reverts commit 5ad819888368c07ee992bc9facf36872a12041fb. * Fixes Newlines
Fixes microfusion ignoring safety
remove mcr cell change timer
Remove or implement unused microfusion vars/procs
…misc bug fixes (#21838) * i'm in hell. i'm in hell. i'm in hell. i'm in hell * unused proc oops --------- Co-authored-by: Hatterhat <[email protected]>
…t with a massive switch case (#22301) * makes the element real * its target not parent * a fuckton of changes * makes the descriptions more ambiguous about what they're applied to * just eradicates oldarms because only two guns used it
… (#22816) camo fix Co-authored-by: Hatterhat <[email protected]>
* Fixes microfusion suppressor * Fixes a runtime when ejecting cells
This was referenced Feb 1, 2024
Closed
Closed
Closed
Closed
This was referenced Feb 2, 2024
Closed
Closed
Closed
This was referenced Feb 11, 2024
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.
About The Pull Request
Ports microfusion energy guns with parts of
Also ports tgstation/tgstation#75052 and tgstation/tgstation#75437
Why It's Good For The Game
Changelog
🆑 Gandalf2k15, Nerev4r, tf-4, ArcaneMusic, Zenitheevee, Gandalf2k15, YakumoChen, OrionTheFox, RatFromTheJungle, ErdinyoBarboza, Zonespace27, Useroth, Paxilmaniac, Zergspower, vinylspiders, out-of-phaze, Hatterhat, burgerenergy
add: Ports microfusion energy guns
/:cl: