Code

Satchel Charges#6924

Code

Closed

LynxSolstice wants to merge 55 commits intocmss13-devs:mastercmss13-devs/cmss13:masterfrom LynxSolstice:Satchel-Charges-take-twoLynxSolstice/cmss13:Satchel-Charges-take-twoCopy head branch name to clipboard

+204

Commits

Commits on Apr 1, 2023

• aaaaaaaaaa

  LynxSolstice

  committed
  41e48e3

• Merge remote-tracking branch 'upstream'

  LynxSolstice

  committed
  2fe23cd

Commits on Apr 16, 2023

• Merge remote-tracking branch 'upstream'

  LynxSolstice

  committed
  6f4420e

Commits on Apr 20, 2023

• Merge remote-tracking branch 'upstream'

  LynxSolstice

  committed
  be7d95e

Commits on May 21, 2023

• Merge remote-tracking branch 'upstream/master'

  LynxSolstice

  committed
  2de2b0b

Commits on Feb 4, 2024

• Merge remote-tracking branch 'upstream'

  LynxSolstice

  committed
  942919a

Commits on Aug 9, 2024

• Merge remote-tracking branch 'upstream'

  LynxSolstice

  committed
  08990e2

Commits on Aug 11, 2024

• Merge remote-tracking branch 'upstream'

  LynxSolstice

  committed
  3243470

• Merge remote-tracking branch 'upstream'

  LynxSolstice

  committed
  0e1745d

• Initial commit

  LynxSolstice

  committed
  10fbfeb

• Linters + lowering the amount of charges per box

  LynxSolstice

  committed
  ffde800

• Linters? Maybe?

  LynxSolstice

  committed
  38e082d

• Linters!!

  LynxSolstice

  committed
  85c89f9

• Linters please???

  LynxSolstice

  committed
  d2b5d65

• Slowed the flashing of the warning to 3 ticks, the same as the other animations.

  LynxSolstice

  committed
  5fd6604

Commits on Aug 12, 2024

• Adds req variant of a satchel charge box (3x) and ups the cost of the 5x box for engineers.

  LynxSolstice

  committed
  959cb94

• stashing for testing

  LynxSolstice

  committed
  cf09495

• Merge branch 'master' into Satchel-Charges-take-two

  LynxSolstice

  authored
  f3a2408

• Code stuff

  LynxSolstice

  committed
  a401836

• Merge branch 'Satchel-Charges-take-two' of https://github.com/LynxSolstice/cmss13 into Satchel-Charges-take-two

  LynxSolstice

  committed
  20cdcd2

• lore desc change

  LynxSolstice

  committed
  a0843f3

• Lore desc modified

  LynxSolstice

  committed
  371e22e

• lore desc modification

  LynxSolstice

  committed
  faf6d28

Commits on Aug 13, 2024

• Update code/game/objects/items/explosives/explosive.dm

  Show description for 6b23152
  

  LynxSolstice

  and

  kiVts

  authored
  6b23152

• Update code/game/objects/items/explosives/explosive.dm

  Show description for 1b3b933
  

  LynxSolstice

  and

  kiVts

  authored
  1b3b933

• Update code/game/objects/items/explosives/explosive.dm

  Show description for 29e17ff
  

  LynxSolstice

  and

  kiVts

  authored
  29e17ff

• Update code/game/objects/items/explosives/explosive.dm

  Show description for d62c2e8
  

  LynxSolstice

  and

  kiVts

  authored
  d62c2e8

• Merge branch 'master' into Satchel-Charges-take-two

  LynxSolstice

  authored
  844ed9d

• Adds more storage to the box

  LynxSolstice

  committed
  1ff004a

• Code fix

  LynxSolstice

  committed
  dac0cb1

• Update code/game/objects/items/explosives/explosive.dm

  Show description for f524162
  

  LynxSolstice

  and

  kiVts

  authored
  f524162

• CODE comments

  LynxSolstice

  committed
  875a39f

• Merge branch 'Satchel-Charges-take-two' of https://github.com/LynxSolstice/cmss13 into Satchel-Charges-take-two

  LynxSolstice

  committed
  956206b

• Update code/game/objects/items/explosives/explosive.dm

  Show description for 47406dc
  

  LynxSolstice

  and

  kiVts

  authored
  47406dc

• Update code/game/objects/items/explosives/explosive.dm

  Show description for 6e26b5b
  

  LynxSolstice

  and

  kiVts

  authored
  6e26b5b

• Update code/game/objects/items/explosives/explosive.dm

  Show description for 7e03bcf
  

  LynxSolstice

  and

  kiVts

  authored
  7e03bcf

• Update code/game/objects/items/explosives/explosive.dm

  Show description for 6b00e56
  

  LynxSolstice

  and

  kiVts

  authored
  6b00e56

• Update code/game/objects/items/explosives/explosive.dm

  Show description for c1afeeb
  

  LynxSolstice

  and

  kiVts

  authored
  c1afeeb

• Merge branch 'master' into Satchel-Charges-take-two

  LynxSolstice

  authored
  af895f7

• Update code/game/objects/items/explosives/explosive.dm

  Show description for a6bb360
  

  LynxSolstice

  and

  kiVts

  authored
  a6bb360

Commits on Aug 14, 2024

• adds anti-grief

  LynxSolstice

  committed
  1ba2600

• Merge branch 'Satchel-Charges-take-two' of https://github.com/LynxSolstice/cmss13 into Satchel-Charges-take-two

  LynxSolstice

  committed
  d9bba4f

• Update code/game/objects/items/explosives/explosive.dm

  Show description for f491eef
  

  LynxSolstice

  and

  kiVts

  authored
  f491eef

• Apply suggestions from code review

  kiVts

  authored
  a882431

Commits on Aug 15, 2024

• Commits suggestions.

  LynxSolstice

  committed
  19d9519

• price change

  LynxSolstice

  committed
  8a659f2

• Gives SLs and TLs the satchel charges for increased price.

  LynxSolstice

  committed
  e436005

• detonator small

  LynxSolstice

  committed
  82269cf

• Adds loose charges and detonators to the req vendor

  LynxSolstice

  committed
  9389ede

Commits on Oct 13, 2024

• Merge remote-tracking branch 'upstream' into Satchel-Charges-take-two

  LynxSolstice

  committed
  8c93d98

• Merge branch 'master' into Satchel-Charges-take-two

  LynxSolstice

  authored
  769d8a8

• CI

  LynxSolstice

  committed
  2265f3c

Commits on Oct 17, 2024

• requested features pushed, added box sprites

  LynxSolstice

  committed
  9e8df9d

• Adds handling sounds for the satchel charges and detonator, courtesy of Thwomper.

  LynxSolstice

  committed
  6fbe65a

Commits on Oct 31, 2024

• icons

  LynxSolstice

  committed
  bbb9225