Code

Adds sunscreen#570

Code

Merged

MrMelbert merged 30 commits intoMrMelbert:masterMrMelbert/MapleStationCode:masterfrom Constellado:sunstuffConstellado/MapleStationCode:sunstuffCopy head branch name to clipboardSep 1, 2024

+121-1

Commits

Commits on Jul 30, 2024

• actually fixes Volkan's shoulder companions space issue!! for real this time

  Constellado

  committed
  0ced948

  Copy full SHA for 0ced948

Commits on Aug 2, 2024

• Merge branch 'MrMelbert:master' into master

  Constellado

  authored
  96c5299

  Copy full SHA for 96c5299

Commits on Aug 23, 2024

• Merge branch 'MrMelbert:master' into master

  Constellado

  authored
  a51c4e3

  Copy full SHA for a51c4e3

• Sunscreen has been invented again, but it does nothing... YET

  Constellado

  committed
  50feca9

  Copy full SHA for 50feca9

• more than one brand of sunscreen

  Constellado

  committed
  997f57d

  Copy full SHA for 997f57d

Commits on Aug 25, 2024

• sunscreen with... functionality!!! It lowers burns a teeny bit when applied.

  Constellado

  committed
  dc6a556

  Copy full SHA for dc6a556

• sunscreen sprites!!

  Constellado

  committed
  d539256

  Copy full SHA for d539256

• minor balance edit

  Constellado

  committed
  40ef067

  Copy full SHA for 40ef067

• more balance

  Constellado

  committed
  413b7d4

  Copy full SHA for 413b7d4

• woopsies! fix that!

  Constellado

  committed
  af5c801

  Copy full SHA for af5c801

• OK maybe Volkan's AIs would make the SPF very good. I will think of a funny drawback due to this insane SPF later.

  Constellado

  committed
  8858077

  Copy full SHA for 8858077

• aaaaa

  Constellado

  committed
  5b5febf

  Copy full SHA for 5b5febf

• variables be annoying sometimes. compiles!!

  Constellado

  committed
  3ad316a

  Copy full SHA for 3ad316a

Commits on Aug 30, 2024

• Volkan umbrella inventory sprites

  Constellado

  committed
  415aa31

  Copy full SHA for 415aa31

• fixes up the sunscreen

  Constellado

  committed
  b4df485

  Copy full SHA for b4df485

• we dont need the umbreallas here, umbrella will be separate PR!

  Constellado

  committed
  6301051

  Copy full SHA for 6301051

• sunscreen descriptions

  Constellado

  committed
  8139f5a

  Copy full SHA for 8139f5a

• more description stuff

  Constellado

  committed
  924962b

  Copy full SHA for 924962b

• A big woopsie doodles fixed!!

  Constellado

  committed
  62eab15

  Copy full SHA for 62eab15

• turns out seconds need to be divided by 600 instead of 60.

  Constellado

  committed
  3dc033d

  Copy full SHA for 3dc033d

• what's with the checks aa???

  Constellado

  committed
  39e3929

  Copy full SHA for 39e3929

• aaaaa

  Constellado

  committed
  2ae5a1b

  Copy full SHA for 2ae5a1b

Commits on Aug 31, 2024

• actually ticked

  Constellado

  committed
  3527cff

  Copy full SHA for 3527cff

• I moved the umbrellas to another branch, removed the two sprites.

  Constellado

  committed
  9c24f36

  Copy full SHA for 9c24f36

• Update maplestation_modules/story_content/volkan_equipment/code/sunitems.dm

  Show description for 02fd321
  

  Constellado

  and

  MrMelbert

  authored
  02fd321

  Copy full SHA for 02fd321

• Update maplestation_modules/story_content/volkan_equipment/code/sunitems.dm

  Show description for c37c782
  

  Constellado

  and

  MrMelbert

  authored
  c37c782

  Copy full SHA for c37c782

• Update maplestation_modules/story_content/volkan_equipment/code/sunitems.dm

  Show description for d307b11
  

  Constellado

  and

  MrMelbert

  authored
  d307b11

  Copy full SHA for d307b11

• brackett

  Constellado

  committed
  1537f83

  Copy full SHA for 1537f83

• ok it compiles now.

  Constellado

  committed
  7020713

  Copy full SHA for 7020713

• code review thingys

  Constellado

  committed
  3f4941f

  Copy full SHA for 3f4941f