Code

Trickwines! Part 2!#2166

Code

Merged

thgvr merged 78 commits intoshiptest-ss13:mastershiptest-ss13/Shiptest:masterfrom FalloutFalcon:trickwine-2FalloutFalcon/ShiptestF:trickwine-2Copy head branch name to clipboardNov 14, 2023

+823-454

Commits

Commits on Jun 19, 2023

• seperate files,half finished wines, fix first pr

  FalloutFalcon

  committed
  00eaed7

  Copy full SHA for 00eaed7

• Merge branch 'shiptest-ss13:master' into trickwine-2

  FalloutFalcon

  authored
  bfc6b18

  Copy full SHA for bfc6b18

Commits on Jul 8, 2023

• i love wine

  FalloutFalcon

  committed
  9c3c98b

  Copy full SHA for 9c3c98b

• Merge branch 'trickwine-2' of https://github.com/FalloutFalcon/Shiptest into trickwine-2

  FalloutFalcon

  committed
  4b4b9f5

  Copy full SHA for 4b4b9f5

Commits on Jul 10, 2023

• how armor..

  Show description for 4f75eab
  FalloutFalcon

  committed
  4f75eab

  Copy full SHA for 4f75eab

Commits on Jul 12, 2023

• yippee

  FalloutFalcon

  committed
  6256a84

  Copy full SHA for 6256a84

Commits on Jul 14, 2023

• yippee

  FalloutFalcon

  committed
  a5cc103

  Copy full SHA for a5cc103

• ,

  FalloutFalcon

  committed
  33e2f12

  Copy full SHA for 33e2f12

Commits on Jul 15, 2023

• sprites!!!!!! holy sheeeeet

  FalloutFalcon

  committed
  4f90a85

  Copy full SHA for 4f90a85

• sprit c:

  FalloutFalcon

  committed
  f97b1cb

  Copy full SHA for f97b1cb

• non constant in inint

  FalloutFalcon

  committed
  fc17c82

  Copy full SHA for fc17c82

Commits on Jul 31, 2023

• new sprites!!! from stiel

  FalloutFalcon

  committed
  5c2736d

  Copy full SHA for 5c2736d

• Merge branch 'master' into trickwine-2

  FalloutFalcon

  authored
  f4f1d63

  Copy full SHA for f4f1d63

Commits on Aug 10, 2023

• SOME changes

  Show description for 9ce51ac
  FalloutFalcon

  committed
  9ce51ac

  Copy full SHA for 9ce51ac

• laptop commit

  FalloutFalcon

  committed
  f95a6bb

  Copy full SHA for f95a6bb

• Test Commit

  

  BuildTools

  committed
  348b142

  Copy full SHA for 348b142

Commits on Aug 11, 2023

• smoke no work

  FalloutFalcon

  committed
  ea4392c

  Copy full SHA for ea4392c

• Merge branch 'trickwine-2' of https://github.com/FalloutFalcon/Shiptest into trickwine-2

  FalloutFalcon

  committed
  1486c79

  Copy full SHA for 1486c79

• Adds checks for Smoke

  

  BuildTools

  committed
  12269bb

  Copy full SHA for 12269bb

• Merge branch 'trickwine-2' of https://github.com/FalloutFalcon/Shiptest into trickwine-2

  

  BuildTools

  committed
  d5ef8f1

  Copy full SHA for d5ef8f1

• Test

  

  Slashy-Slasher

  committed
  edd900f

  Copy full SHA for edd900f

• Test Commit

  Show description for 2fe4e21
  Slashy-Slasher

  committed
  2fe4e21

  Copy full SHA for 2fe4e21

• Fixing Run Linters

  Show description for f8c43c6
  Slashy-Slasher

  committed
  f8c43c6

  Copy full SHA for f8c43c6

Commits on Aug 16, 2023

• mmm i will make it not a subtype later

  FalloutFalcon

  committed
  c8f421e

  Copy full SHA for c8f421e

Commits on Aug 17, 2023

• laptop commit

  Show description for 76aa0a5
  FalloutFalcon

  committed
  76aa0a5

  Copy full SHA for 76aa0a5

• fix merge conflict i hope

  FalloutFalcon

  committed
  19e2fa3

  Copy full SHA for 19e2fa3

• Try this again

  FalloutFalcon

  committed
  466f390

  Copy full SHA for 466f390

• Merge branch 'master' into trickwine-2

  FalloutFalcon

  authored
  6a1b04c

  Copy full SHA for 6a1b04c

• i hate you run linters

  FalloutFalcon

  committed
  fdc43e1

  Copy full SHA for fdc43e1

• Merge branch 'trickwine-2' of https://github.com/FalloutFalcon/Shiptest into trickwine-2

  FalloutFalcon

  committed
  864950c

  Copy full SHA for 864950c

Commits on Aug 18, 2023

• mmm tree works now

  Show description for 5fc4458
  FalloutFalcon

  committed
  5fc4458

  Copy full SHA for 5fc4458

Commits on Aug 19, 2023

• minor stuff & slashes alert

  Show description for 888321c
  FalloutFalcon

  committed
  888321c

  Copy full SHA for 888321c

• oops readded add sucide acts

  Show description for 62040d0
  FalloutFalcon

  committed
  62040d0

  Copy full SHA for 62040d0

Commits on Aug 20, 2023

• apples and mortars

  Show description for a446053
  FalloutFalcon

  committed
  a446053

  Copy full SHA for a446053

Commits on Aug 23, 2023

• minor tweaks + purple pray

  FalloutFalcon

  committed
  eab9edb

  Copy full SHA for eab9edb

• Merge branch 'trickwine-2' of https://github.com/FalloutFalcon/Shiptest into trickwine-2

  FalloutFalcon

  committed
  c4b556f

  Copy full SHA for c4b556f

• minor speling mistake

  FalloutFalcon

  committed
  ee53d59

  Copy full SHA for ee53d59

Commits on Sep 19, 2023

• Merge branch 'master' into trickwine-2

  FalloutFalcon

  authored
  c779099

  Copy full SHA for c779099

Commits on Sep 30, 2023

• fixes some missing smoke checks

  Show description for cd02f42
  tmtmtl30

  authored
  cd02f42

  Copy full SHA for cd02f42

• more smoke checks

  Show description for 32370f8
  tmtmtl30

  authored
  32370f8

  Copy full SHA for 32370f8

• more smoke checks

  Show description for 85e69a0
  tmtmtl30

  authored
  85e69a0

  Copy full SHA for 85e69a0

• more smoke checks

  Show description for acb4774
  tmtmtl30

  authored
  acb4774

  Copy full SHA for acb4774

• smoke changes

  Show description for 80d95f7
  tmtmtl30

  authored
  80d95f7

  Copy full SHA for 80d95f7

• smoke checks

  Show description for 760396f
  tmtmtl30

  authored
  760396f

  Copy full SHA for 760396f

• trickwine balance changes / fixes

  Show description for 6e09f68
  tmtmtl30

  authored
  6e09f68

  Copy full SHA for 6e09f68

• adjusts forcewalls for new forcefield args

  Show description for efba9db
  tmtmtl30

  authored
  efba9db

  Copy full SHA for efba9db

• minor balance change

  Show description for 8d1acbc
  tmtmtl30

  authored
  8d1acbc

  Copy full SHA for 8d1acbc

• Update code/game/objects/effects/forcefields.dm

  Show description for ae8edda
  

  FalloutFalcon

  and

  tmtmtl30

  authored
  ae8edda

  Copy full SHA for ae8edda

• Update code/game/objects/effects/forcefields.dm

  Show description for 36853d1
  

  FalloutFalcon

  and

  tmtmtl30

  authored
  36853d1

  Copy full SHA for 36853d1

• Update code/game/objects/effects/forcefields.dm

  Show description for 67c5e5a
  

  FalloutFalcon

  and

  tmtmtl30

  authored
  67c5e5a

  Copy full SHA for 67c5e5a

• Update code/game/objects/effects/forcefields.dm

  Show description for b59c4b6
  

  FalloutFalcon

  and

  tmtmtl30

  authored
  b59c4b6

  Copy full SHA for b59c4b6

Commits on Oct 1, 2023

• lovely

  FalloutFalcon

  committed
  bc5cf81

  Copy full SHA for bc5cf81

Commits on Oct 6, 2023

• Update code/modules/reagents/reagent_containers/mortar.dm

  Show description for 896beaf
  

  FalloutFalcon

  and

  tmtmtl30

  authored
  896beaf

  Copy full SHA for 896beaf

• ough motars!

  FalloutFalcon

  committed
  0aadb4b

  Copy full SHA for 0aadb4b

• fixing merge conflict

  FalloutFalcon

  committed
  9d0b380

  Copy full SHA for 9d0b380

• Merge branch 'master' into trickwine-2

  FalloutFalcon

  authored
  2549b40

  Copy full SHA for 2549b40

• restores distiller sprites?

  FalloutFalcon

  committed
  08eb349

  Copy full SHA for 08eb349

Commits on Oct 12, 2023

• improve vintage

  FalloutFalcon

  committed
  5833653

  Copy full SHA for 5833653

Commits on Oct 13, 2023

• mortar harddel fix?

  FalloutFalcon

  committed
  a7c2ac4

  Copy full SHA for a7c2ac4

Commits on Oct 15, 2023

• Merge branch 'master' into trickwine-2

  FalloutFalcon

  authored
  d42116c

  Copy full SHA for d42116c

Commits on Oct 16, 2023

• tiny fixs

  FalloutFalcon

  committed
  c0f984f

  Copy full SHA for c0f984f

• Merge branch 'trickwine-2' of https://github.com/FalloutFalcon/Shiptest into trickwine-2

  FalloutFalcon

  committed
  a6b18d5

  Copy full SHA for a6b18d5

Commits on Oct 17, 2023

• ethanol/trickwine

  FalloutFalcon

  committed
  4cd41d0

  Copy full SHA for 4cd41d0

• Merge branch 'trickwine-2' of https://github.com/FalloutFalcon/Shiptest into trickwine-2

  FalloutFalcon

  committed
  75825f8

  Copy full SHA for 75825f8

• erm

  FalloutFalcon

  committed
  c61b372

  Copy full SHA for c61b372

• mmh i broke a bit c:

  FalloutFalcon

  committed
  0710f43

  Copy full SHA for 0710f43

• why is it desc for obj but description for reagent

  FalloutFalcon

  committed
  7fd8dcb

  Copy full SHA for 7fd8dcb

Commits on Oct 21, 2023

• no test fails??

  FalloutFalcon

  committed
  e55f157

  Copy full SHA for e55f157

• blackbox records

  FalloutFalcon

  committed
  545a0d3

  Copy full SHA for 545a0d3

Commits on Oct 22, 2023

• regeants blackbox

  FalloutFalcon

  committed
  322876b

  Copy full SHA for 322876b

Commits on Oct 29, 2023

• conflict merge

  FalloutFalcon

  committed
  92dfff6

  Copy full SHA for 92dfff6

• ugh merge conflicts

  FalloutFalcon

  committed
  8a55760

  Copy full SHA for 8a55760

• Merge branch 'master' into trickwine-2

  Show description for f5f5162
  FalloutFalcon

  authored
  f5f5162

  Copy full SHA for f5f5162

• wooo readd

  FalloutFalcon

  committed
  1d2f661

  Copy full SHA for 1d2f661

Commits on Nov 8, 2023

• Merge branch 'master' into trickwine-2

  FalloutFalcon

  authored
  412fcdc

  Copy full SHA for 412fcdc

Commits on Nov 14, 2023

• Merge branch 'master' into trickwine-2

  Show description for b61b716
  FalloutFalcon

  authored
  b61b716

  Copy full SHA for b61b716

• Update security_officer.dm

  Show description for b229bf4
  FalloutFalcon

  authored
  b229bf4

  Copy full SHA for b229bf4

• Update assistant.dm

  Show description for 6236120
  FalloutFalcon

  authored
  6236120

  Copy full SHA for 6236120