Code

Ports Microfusion Energy Guns#961

Code

Merged

dwasint merged 52 commits intoMonkestation:masterMonkestation/Monkestation2.0:masterfrom wraith-54321:guns-portswraith-54321/Monkestation2.0:guns-portsCopy head branch name to clipboardFeb 12, 2024

+4,379-1,230

Commits

Commits on Jan 15, 2024

• Microfusion Energy Guns (#9638)

  Show description for c54b2b7
  

  3 peoplecommitted
  c54b2b7

  Copy full SHA for c54b2b7

• Microfusion bugfixes (#9911)

  

  Gandalf2k15

  authored and

  wraith-54321

  committed
  ad64e21

  Copy full SHA for ad64e21

• Small Microfusion Hotfix (#9936)

  

  Nerev4r

  authored and

  wraith-54321

  committed
  dc62285

  Copy full SHA for dc62285

• fixes microfusion charging runtime (#9953)

  

  tf-4

  authored and

  wraith-54321

  committed
  eaeef01

  Copy full SHA for eaeef01

• MCR patch (#10714)

  

  tf-4

  authored and

  wraith-54321

  committed
  454d010

  Copy full SHA for 454d010

• MCR fix 2 (#10720)

  

  tf-4

  authored and

  wraith-54321

  committed
  398fed6

  Copy full SHA for 398fed6

• fixes microfusion cell emp_act (#11077)

  

  tf-4

  authored and

  wraith-54321

  committed
  b452ab2

  Copy full SHA for b452ab2

• why cant you be righthanded like all the other guns!? (#11220)

  

  Zenitheevee

  authored and

  wraith-54321

  committed
  0a88d5f

  Copy full SHA for 0a88d5f

• [SEMI-MODULAR] MCR Expansion Vol 1 & Balance Passes (#11377)

  Show description for 9c25795
  

  3 peopleauthored and

  wraith-54321

  committed
  9c25795

  Copy full SHA for 9c25795

• [MODULAR] Refactors MCR designs (#11536)

  Show description for ee4633f
  

  YakumoChen

  authored and

  wraith-54321

  committed
  ee4633f

  Copy full SHA for ee4633f

• cells fix!! (#12724)

  

  OrionTheFox

  authored and

  wraith-54321

  committed
  44fd5c1

  Copy full SHA for 44fd5c1

• [MODULAR] Removes the undercharger MCR attachment. (#12688)

  Show description for 4d64f85
  

  2 peopleauthored and

  wraith-54321

  committed
  4d64f85

  Copy full SHA for 4d64f85

• Update cargo_stuff.dm (#12931)

  

  MassacreDemigirl

  authored and

  wraith-54321

  committed
  34e3c5a

  Copy full SHA for 34e3c5a

• MCR renaming adjustment (#12961)

  

  tf-4

  authored and

  wraith-54321

  committed
  1ea9442

  Copy full SHA for 1ea9442

• Adds Gun Cargo (#12632)

  Show description for 6d00b91
  

  4 peopleauthored and

  wraith-54321

  committed
  6d00b91

  Copy full SHA for 6d00b91

• scope (#13115)

  

  Zonespace27

  authored and

  wraith-54321

  committed
  86c4c05

  Copy full SHA for 86c4c05

• walkandload (#13557)

  

  MassacreDemigirl

  authored and

  wraith-54321

  committed
  199293a

  Copy full SHA for 199293a

• Reworks microfusion guns to behave like energy guns that can be upgraded, not like ballistic guns that happen to fire lasers (#16017)

  Show description for 62edf2c
  

  Paxilmaniac

  authored and

  wraith-54321

  committed
  62edf2c

  Copy full SHA for 62edf2c

• Fixes default MCR charging (#16386)

  Show description for c06a001
  

  tf-4

  authored and

  wraith-54321

  committed
  c06a001

  Copy full SHA for c06a001

• MCR crates have better contents (#17378)

  Show description for fac482f
  

  YakumoChen

  authored and

  wraith-54321

  committed
  fac482f

  Copy full SHA for fac482f

• The great Unfuckening of all the tech/mechfab categories (#18673)

  Show description for b93c4e5
  

  Zergspower

  authored and

  wraith-54321

  committed
  b93c4e5

  Copy full SHA for b93c4e5

• [MODULAR] Fixes microfusion ignoring safety (#20149)

  Show description for 45ad9f3
  

  vinylspiders

  authored and

  wraith-54321

  committed
  45ad9f3

  Copy full SHA for 45ad9f3

• Removes MCR cell change timer (#20440)

  Show description for 9d1a763
  

  tf-4

  authored and

  wraith-54321

  committed
  9d1a763

  Copy full SHA for 9d1a763

• [MODULAR] Remove or implement unused microfusion vars/procs (#21626)

  Show description for 5c0ac1b
  

  out-of-phaze

  authored and

  wraith-54321

  committed
  5c0ac1b

  Copy full SHA for 5c0ac1b

• i'm in hell. i'm in hell. i'm in hell. - mcr lathe category and some misc bug fixes (#21838)

  Show description for d93bd16
  

  Hatterhat

  authored and

  wraith-54321

  committed
  d93bd16

  Copy full SHA for d93bd16

• Refactors manufacturer examine into an element rather than a component with a massive switch case (#22301)

  Show description for 59ff640
  

  Paxilmaniac

  authored and

  wraith-54321

  committed
  59ff640

  Copy full SHA for 59ff640

• mcr bugfix pr - makes camos work. does not do much else at the moment (#22816)

  Show description for ca661ec
  

  Hatterhat

  authored and

  wraith-54321

  committed
  ca661ec

  Copy full SHA for ca661ec

• [MODULAR] Fixes microfusion suppressor path (#23273)

  Show description for 6cd5449
  

  vinylspiders

  authored and

  wraith-54321

  committed
  6cd5449

  Copy full SHA for 6cd5449

• MCR damage buff (#23454)

  Show description for 3c8e42b
  

  burgerenergy

  authored and

  wraith-54321

  committed
  3c8e42b

  Copy full SHA for 3c8e42b

• Armadyne Antitrust Act 2563 :: Disintegrates armadyne as a concept and replaces basically everything related (#23424)

  Show description for 3f5e6af
  

  2 peopleauthored and

  wraith-54321

  committed
  3f5e6af

  Copy full SHA for 3f5e6af

• denial

  wraith-54321

  committed
  c9459fb

  Copy full SHA for c9459fb

Commits on Jan 16, 2024

• anger

  wraith-54321

  committed
  29a9921

  Copy full SHA for 29a9921

• bargaining

  wraith-54321

  committed
  575d801

  Copy full SHA for 575d801

• grief

  wraith-54321

  committed
  6aa9ba4

  Copy full SHA for 6aa9ba4

Commits on Jan 17, 2024

• acceptence

  wraith-54321

  committed
  5532638

  Copy full SHA for 5532638

• Experimental Mineral Balance PR. (#75437)

  Show description for e85a5a9
  wraith-54321

  committed
  e85a5a9

  Copy full SHA for e85a5a9

• Revert "Experimental Mineral Balance PR. (#75437)"

  Show description for 9b03084
  wraith-54321

  committed
  9b03084

  Copy full SHA for 9b03084

• Minerals have been refactored so costs and minerals in items are now in terms of mineral defines. (#75052)

  Show description for c315161
  

  ArcaneMusic

  authored and

  wraith-54321

  committed
  c315161

  Copy full SHA for c315161

• Experimental Mineral Balance PR. (#75437)

  Show description for 6dbeb16
  

  ArcaneMusic

  authored and

  wraith-54321

  committed
  6dbeb16

  Copy full SHA for 6dbeb16

• pain

  wraith-54321

  committed
  6b6fb0a

  Copy full SHA for 6b6fb0a

• Merge remote-tracking branch 'upstream/master' into guns-ports

  wraith-54321

  committed
  9624ee7

  Copy full SHA for 9624ee7

Commits on Jan 18, 2024

• CC firing range

  wraith-54321

  committed
  1f296af

  Copy full SHA for 1f296af

• I hate prettier

  wraith-54321

  committed
  d2d825a

  Copy full SHA for d2d825a

• Merge remote-tracking branch 'upstream/master' into guns-ports

  wraith-54321

  committed
  97f9dae

  Copy full SHA for 97f9dae

• no goon styles

  wraith-54321

  committed
  9562c22

  Copy full SHA for 9562c22

• linebreaks

  wraith-54321

  committed
  d290595

  Copy full SHA for d290595

Commits on Jan 20, 2024

• Update construction.dm

  dwasint

  authored
  be366fb

  Copy full SHA for be366fb

Commits on Jan 22, 2024

• firing range

  wraith-54321

  committed
  5400d0d

  Copy full SHA for 5400d0d

Commits on Jan 24, 2024

• minor fix

  wraith-54321

  committed
  e1ea710

  Copy full SHA for e1ea710

• Merge remote-tracking branch 'upstream/master' into guns-ports

  wraith-54321

  committed
  39f99b6

  Copy full SHA for 39f99b6

Commits on Jan 27, 2024

• fixed unlimited ammo

  wraith-54321

  committed
  04d1d56

  Copy full SHA for 04d1d56

• use() correctly

  wraith-54321

  committed
  66ea3ad

  Copy full SHA for 66ea3ad