Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[IDB IGNORE][MDB IGNORE] Adds Jungleland as a randomly chosen alternative to Lavaland, [Bounty] #14802

Merged
merged 411 commits into from
Jan 5, 2024
Merged

[IDB IGNORE][MDB IGNORE] Adds Jungleland as a randomly chosen alternative to Lavaland, [Bounty] #14802

merged 411 commits into from
Jan 5, 2024
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Oct 18, 2022

  1. adds a guthen to ivymen nest

    @Marmio64
    Marmio64 committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    42aea5b View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2022

  1. Merge pull request #26 from Marmio64/ivymen-nest-guthen 

    adds a guthen to ivymen nest
    @Djiq
    Djiq authored Oct 19, 2022
    Configuration menu
    Copy the full SHA
    a9de198 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. updates some ruin appearances

    @Marmio64
    Marmio64 committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    8672b94 View commit details
    Browse the repository at this point in the history

  2. more ruin changes

    @Marmio64
    Marmio64 committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    24d83ac View commit details
    Browse the repository at this point in the history

  3. slightly lowered mob density, slightly higher chance of emerald spiders

    @Marmio64
    Marmio64 committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    d463ba6 View commit details
    Browse the repository at this point in the history

  4. adds the standard marrow weavers

    @Marmio64
    Marmio64 committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    7de17c4 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2022

  1. Merge pull request #28 from Marmio64/mob-density 

    slightly lower mob density, slightly higher chance of emerald spiders
    @Djiq
    Djiq authored Oct 21, 2022
    Configuration menu
    Copy the full SHA
    7baa300 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #27 from Marmio64/improve-the-ruins 

    Improves the look of some of the ruins
    @Djiq
    Djiq authored Oct 21, 2022
    Configuration menu
    Copy the full SHA
    fc6eb42 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2022

  1. fixes rock turfs, expands xeno ruin

    @Marmio64
    Marmio64 committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    a68a335 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2022

  1. Merge pull request #30 from Marmio64/better-xeno-ruin 

    expands and improves xeno ruin
    @Djiq
    Djiq authored Oct 31, 2022
    Configuration menu
    Copy the full SHA
    9393836 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2022

  1. couple of loot changes

    @Marmio64
    Marmio64 committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    5e08b08 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2022

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    1971c9e View commit details
    Browse the repository at this point in the history

  2. sprotes

    @Djiq
    Djiq committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    93a249b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #31 from Marmio64/morelootchanges 

    couple of loot changes
    @Djiq
    Djiq authored Nov 6, 2022
    Configuration menu
    Copy the full SHA
    45cb18a View commit details
    Browse the repository at this point in the history

  4. changes obj/screen to atom/mobable/screen because reasons

    @Djiq
    Djiq committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    6364868 View commit details
    Browse the repository at this point in the history

  5. makes it compile and changes how dilithium and bs generates a bit

    @Djiq
    Djiq committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    99d8d35 View commit details
    Browse the repository at this point in the history

  6. addresses some common concerns

    @Djiq
    Djiq committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    927733a View commit details
    Browse the repository at this point in the history

  7. more common concerns

    @Djiq
    Djiq committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    4dae93d View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2022

  1. Update JungleBiomes.dm

    @JamieD1
    JamieD1 authored Nov 12, 2022
    Configuration menu
    Copy the full SHA
    5a46b4b View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. ivymen egg balancing

    @Marmio64
    Marmio64 committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    3430f5d View commit details
    Browse the repository at this point in the history

  2. Merge pull request #32 from Marmio64/ivymen-egg-balance 

    ivymen egg balancing
    @Djiq
    Djiq authored Nov 14, 2022
    Configuration menu
    Copy the full SHA
    10b5c7e View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2022

  1. doing this again

    @Djiq
    Djiq committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    cb0f2bd View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/jungleland' into jungleland

    @Djiq
    Djiq committed Dec 27, 2022
    Configuration menu
    Copy the full SHA
    0007a50 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. carp pond ruin + ruin descriptions

    @Marmio64
    Marmio64 committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    c2e0bc1 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2023

  1. Merge pull request #33 from Marmio64/carppond-and-ruin-descriptions 

    carp pond ruin + ruin descriptions
    @Djiq
    Djiq authored Jan 15, 2023
    Configuration menu
    Copy the full SHA
    a8cc1a2 View commit details
    Browse the repository at this point in the history

  2. crushies

    @Djiq
    Djiq committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    1e28420 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'jungleland'

    @Djiq
    Djiq committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    304aa61 View commit details
    Browse the repository at this point in the history

  4. icons

    @Djiq
    Djiq committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    3718888 View commit details
    Browse the repository at this point in the history

  5. rustg all-features

    @Djiq
    Djiq committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    af69903 View commit details
    Browse the repository at this point in the history

  6. tonight im feeling fruity

    @Djiq
    Djiq committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    ab505f4 View commit details
    Browse the repository at this point in the history

  7. alpha meduracha

    @Djiq
    Djiq committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    6e0c158 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2023

  1. alpha meduracha 2

    @Djiq
    Djiq committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    954e714 View commit details
    Browse the repository at this point in the history

  2. alpha meduracha finished

    @Djiq
    Djiq committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    e50f6d0 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    2be2097 View commit details
    Browse the repository at this point in the history

  4. blobby alpha

    @Djiq
    Djiq committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    2674376 View commit details
    Browse the repository at this point in the history

  5. alpha blobby, 3 kinetic crusher trophies done, changes to jungle nests

    @Djiq
    Djiq committed Jan 16, 2023
    Configuration menu
    Copy the full SHA
    66b0812 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. makes satchels work on jungleland

    @Djiq
    Djiq committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    91cb211 View commit details
    Browse the repository at this point in the history

  2. e

    @Djiq
    Djiq committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    4f32da6 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2023

  1. lintr

    @Djiq
    Djiq committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    c6fabc9 View commit details
    Browse the repository at this point in the history

  2. fixes mining base atmos filters, QOL changes like giga drill and char… 

    …ges working
    @Djiq
    Djiq committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    2ca3148 View commit details
    Browse the repository at this point in the history

  3. more fixies

    @Djiq
    Djiq committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    828d07f View commit details
    Browse the repository at this point in the history

  4. beginnings of obsidian pillars

    @Djiq
    Djiq committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    4bd1420 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master' into jungleland

    @Djiq
    Djiq committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    7aff44c View commit details
    Browse the repository at this point in the history

  6. makes sure it actually compiles

    @Djiq
    Djiq committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    c2d5d01 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'upstream/master' into jungleland

    @Djiq
    Djiq committed Jan 20, 2023
    Configuration menu
    Copy the full SHA
    69f20f0 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2023

  1. adds more sand to jungleland and fixes tar mobs not working with kine… 

    …tic crusher
    @Djiq
    Djiq committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    efad12c View commit details
    Browse the repository at this point in the history

  2. changies

    @Djiq
    Djiq committed Jan 21, 2023
    Configuration menu
    Copy the full SHA
    be216d8 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2023

  1. Merge branch 'master' into jungleland

    @Djiq
    Djiq authored Feb 12, 2023
    Configuration menu
    Copy the full SHA
    a86da69 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. i think i can slowly get back to working on this

    @Djiq
    Djiq committed May 10, 2023
    Configuration menu
    Copy the full SHA
    2c70416 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/jungleland' into jungleland

    @Djiq
    Djiq committed May 10, 2023
    Configuration menu
    Copy the full SHA
    dbaf588 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed May 10, 2023
    Configuration menu
    Copy the full SHA
    de83339 View commit details
    Browse the repository at this point in the history

  4. stuff

    @Djiq
    Djiq committed May 10, 2023
    Configuration menu
    Copy the full SHA
    2d5ab97 View commit details
    Browse the repository at this point in the history

  5. more stuff

    @Djiq
    Djiq committed May 10, 2023
    Configuration menu
    Copy the full SHA
    ee6355a View commit details
    Browse the repository at this point in the history

  6. more alpha mobbs

    @Djiq
    Djiq committed May 10, 2023
    Configuration menu
    Copy the full SHA
    4207bcd View commit details
    Browse the repository at this point in the history

Commits on May 14, 2023

  1. all crusher trophies finished

    @Djiq
    Djiq committed May 14, 2023
    Configuration menu
    Copy the full SHA
    5494a58 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. new miner weapon coz why not

    @Djiq
    Djiq committed May 24, 2023
    Configuration menu
    Copy the full SHA
    c06a000 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. e

    @Djiq
    Djiq committed May 25, 2023
    Configuration menu
    Copy the full SHA
    f68b41a View commit details
    Browse the repository at this point in the history

  2. basics for a tar assistant

    @Djiq
    Djiq committed May 25, 2023
    Configuration menu
    Copy the full SHA
    e220e22 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed May 25, 2023
    Configuration menu
    Copy the full SHA
    c152c4c View commit details
    Browse the repository at this point in the history

Commits on May 27, 2023

  1. i cant find SPECIES_PERK_ICON folder anywhere, i feel slow drain on m… 

    …y sanity as this issue has already consumed 2 hours of my time
    @Djiq
    Djiq committed May 27, 2023
    Configuration menu
    Copy the full SHA
    931dd56 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed May 27, 2023
    Configuration menu
    Copy the full SHA
    025f882 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. updaties

    @Djiq
    Djiq committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    9d4a0c4 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    ab2e19c View commit details
    Browse the repository at this point in the history

  3. thingies

    @Djiq
    Djiq committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    08c65ca View commit details
    Browse the repository at this point in the history

  4. TM ready

    @Djiq
    Djiq committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    a1e33ac View commit details
    Browse the repository at this point in the history

  5. PROC_REF (TM ready i promise)

    @Djiq
    Djiq committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    3a27835 View commit details
    Browse the repository at this point in the history

  6. guh

    @Djiq
    Djiq committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    1110058 View commit details
    Browse the repository at this point in the history

  7. TM fixes pt1

    @Djiq
    Djiq committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    7b1e331 View commit details
    Browse the repository at this point in the history

  8. more fixes

    @Djiq
    Djiq committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    56d17ed View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. TM bug fix

    @Djiq
    Djiq committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    469e07f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    92211d0 View commit details
    Browse the repository at this point in the history

  3. more stuff

    @Djiq
    Djiq committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    823df14 View commit details
    Browse the repository at this point in the history

  4. kwarry nerf

    @Djiq
    Djiq committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    c1cc610 View commit details
    Browse the repository at this point in the history

  5. e

    @Djiq
    Djiq committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    48be0e0 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2023

  1. 3 new ruins + less punji sticks

    @Marmio64
    Marmio64 committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    2d06ee4 View commit details
    Browse the repository at this point in the history

  2. moves cave to swamp and adds loot

    @Marmio64
    Marmio64 committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    9303191 View commit details
    Browse the repository at this point in the history

  3. forgot disposals pipe for seed vault

    @Marmio64
    Marmio64 committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    faf495b View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2023

  1. Merge pull request #35 from Marmio64/newruin 

    3 new ruins and less punji sticks
    @Djiq
    Djiq authored Jun 11, 2023
    Configuration menu
    Copy the full SHA
    eb505b0 View commit details
    Browse the repository at this point in the history

  2. javelin fixes

    @Djiq
    Djiq committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    5c7a2d2 View commit details
    Browse the repository at this point in the history

  3. reduces lag hopefully

    @Djiq
    Djiq committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    d031f91 View commit details
    Browse the repository at this point in the history

  4. fixivymenstuff

    @Marmio64
    Marmio64 committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    16cfb60 View commit details
    Browse the repository at this point in the history

  5. more fixes

    @Djiq
    Djiq committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    4fcd1e1 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #36 from Marmio64/fixivymen 

    fix some ivymen stuff
    @Djiq
    Djiq authored Jun 11, 2023
    Configuration menu
    Copy the full SHA
    0ade81c View commit details
    Browse the repository at this point in the history

  7. misc fixes

    @Djiq
    Djiq committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    66d8105 View commit details
    Browse the repository at this point in the history

  8. fixes skin twisters deleting people, for fucks sake who changes weakr… 

    …ef behaviour to that????
    @Djiq
    Djiq committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    a18df61 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/jungleland' into jungleland

    @Djiq
    Djiq committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    c31a934 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into jungleland

    @Djiq
    Djiq authored Jun 11, 2023
    Configuration menu
    Copy the full SHA
    a98f364 View commit details
    Browse the repository at this point in the history

  11. reverts AAC fix

    @Djiq
    Djiq committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    e98eca9 View commit details
    Browse the repository at this point in the history

  12. toxic buildup fixes

    @SapphicOverload
    SapphicOverload committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    fd6eb1b View commit details
    Browse the repository at this point in the history

  13. bit too much healing for toxin lovers

    @SapphicOverload
    SapphicOverload committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    916e4c4 View commit details
    Browse the repository at this point in the history

  14. adjusts mosquitos

    @Djiq
    Djiq committed Jun 11, 2023
    Configuration menu
    Copy the full SHA
    5e529fd View commit details
    Browse the repository at this point in the history

  15. Merge pull request #37 from SapphicOverload/toxic-buildup-fixes 

    Toxic buildup fixes
    @Djiq
    Djiq authored Jun 11, 2023
    Configuration menu
    Copy the full SHA
    9ee02a0 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. gems, loot changes, and electrified core nerf 

    electrified javelin core damage reduced to 15 from 35

removes bones from dryad (its a plant spirit)

mosquito chitin reduced to 1 from 4 (they're not hard to kill)

yellowjacket chitin reduced from 4 to 2, and sinew from 2 to 1.

all alpha mobs get their original monster's butcher results about times 2 (if they didnt have it already), and a 2 low level mining gem (worth 200 mining points each)

tar king drops a primal tarstone gem, which can be claimed and sold on the cargo shuttle for 3000 mining points.

and some spelling fixes
    @Marmio64
    Marmio64 committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    cbb6b05 View commit details
    Browse the repository at this point in the history

  2. 1 extra bone from emerald spider

    @Marmio64
    Marmio64 committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    0a57582 View commit details
    Browse the repository at this point in the history

  3. yellowjacket drops one bone 

    this doesnt make much more sense than dryads but there does need to be more sources of bones
    @Marmio64
    Marmio64 committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    5a62b33 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #38 from Marmio64/core+lootchange 

    gems, loot changes, and electrified core nerf
    @Djiq
    Djiq authored Jun 12, 2023
    Configuration menu
    Copy the full SHA
    9bb4054 View commit details
    Browse the repository at this point in the history

  5. Fixes ITEM_SLOT_NECK and ITEM_SLOT_HEAD

    @Djiq
    Djiq authored Jun 12, 2023
    Configuration menu
    Copy the full SHA
    3c35e6d View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. remove debug info i accidentally left in

    @Djiq
    Djiq authored Jun 13, 2023
    Configuration menu
    Copy the full SHA
    cfc9632 View commit details
    Browse the repository at this point in the history

  2. improvements and stuff 

    explosive shrooms are less common

dying jungle less cluttered

punji sticks in jungle tar temple moved inside so if you come in, look at them, and then step on them, its completely your fault.

also slightly improves the look of the swamp cave ruin
    @Marmio64
    Marmio64 committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    7f00f7d View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Merge pull request #39 from Marmio64/calmtheminers 

    improvements and stuff
    @Djiq
    Djiq authored Jun 14, 2023
    Configuration menu
    Copy the full SHA
    98fcbd1 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    22b4bd7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/jungleland' into jungleland

    @Djiq
    Djiq committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    6cf3cd7 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. maintenance

    @Djiq
    Djiq committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    2e8292f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Jun 23, 2023
    Configuration menu
    Copy the full SHA
    01e57fe View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2023

  1. obsidian

    @Djiq
    Djiq committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    ad22ff3 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    af361b7 View commit details
    Browse the repository at this point in the history

  3. e

    @Djiq
    Djiq committed Jun 25, 2023
    Configuration menu
    Copy the full SHA
    73a7ae3 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    e9babac View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    1339588 View commit details
    Browse the repository at this point in the history

  3. e

    @Djiq
    Djiq committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    2de3da1 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Jul 16, 2023
    Configuration menu
    Copy the full SHA
    6d864b2 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    45ab5c6 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Merge branch 'master' into jungleland

    @Djiq
    Djiq committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    dcdbd2a View commit details
    Browse the repository at this point in the history

  2. up to date and funky stuff

    @Djiq
    Djiq committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    70ffb42 View commit details
    Browse the repository at this point in the history

  3. jg jgjgjg

    @Djiq
    Djiq committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    bbab3fc View commit details
    Browse the repository at this point in the history

  4. fixies

    @Djiq
    Djiq committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    4cd00a6 View commit details
    Browse the repository at this point in the history

  5. more fixies

    @Djiq
    Djiq committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    cf9eb3d View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. shielpep

    @Djiq
    Djiq committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    1962bcd View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    243c096 View commit details
    Browse the repository at this point in the history

  3. e

    @Djiq
    Djiq committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    783f033 View commit details
    Browse the repository at this point in the history

  4. this is the begginning of my joker ark i swear to god i hate byond

    @Djiq
    Djiq committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    ef49b89 View commit details
    Browse the repository at this point in the history

  5. obsidian

    @Djiq
    Djiq committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    01cd6d3 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. give tarstone a sprite

    @Marmio64
    Marmio64 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    aecc035 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'pr/14802' into give-tarstone-gem-a-sprite

    @Marmio64
    Marmio64 committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    7b31495 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #40 from Marmio64/give-tarstone-gem-a-sprite 

    give tarstone a sprite
    @Djiq
    Djiq authored Aug 21, 2023
    Configuration menu
    Copy the full SHA
    0b5b5f5 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. surrounds gulag in lava

    @Marmio64
    Marmio64 committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    7d87859 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #41 from Marmio64/gulag-changes 

    Gives gulag a thin layer of lava
    @Djiq
    Djiq authored Aug 26, 2023
    Configuration menu
    Copy the full SHA
    684b40d View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. start of syndi station

    @Marmio64
    Marmio64 committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    12c7bb7 View commit details
    Browse the repository at this point in the history

  2. more stuff

    @Marmio64
    Marmio64 committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    b2a0628 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. almostthere

    @Marmio64
    Marmio64 committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    eaf86d6 View commit details
    Browse the repository at this point in the history

  2. finished

    @Marmio64
    Marmio64 committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    d5c7a36 View commit details
    Browse the repository at this point in the history

  3. fixcryo

    @Marmio64
    Marmio64 committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    1056386 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. gives the comms agent his chameleon mask

    @Marmio64
    Marmio64 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    9922d2e View commit details
    Browse the repository at this point in the history

  2. fix one area

    @Marmio64
    Marmio64 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    14eee9c View commit details
    Browse the repository at this point in the history

  3. fix some firedoors

    @Marmio64
    Marmio64 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    87081b9 View commit details
    Browse the repository at this point in the history

  4. fix a blastdoor

    @Marmio64
    Marmio64 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    5ac34a5 View commit details
    Browse the repository at this point in the history

  5. fire extinguishers and some berets

    @Marmio64
    Marmio64 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    39466b4 View commit details
    Browse the repository at this point in the history

  6. should fix thermomachine directions

    @Marmio64
    Marmio64 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    ffa7764 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. heater starts on

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    8e638f1 View commit details
    Browse the repository at this point in the history

  2. fixes cryo for real

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    55e996f View commit details
    Browse the repository at this point in the history

  3. fix tcomms cooler direction

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    ea4bdca View commit details
    Browse the repository at this point in the history

  4. paper and mats

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    424f3b4 View commit details
    Browse the repository at this point in the history

  5. good monkey cubes

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    509ece7 View commit details
    Browse the repository at this point in the history

  6. lieutenant gets glasses

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    920bbfa View commit details
    Browse the repository at this point in the history

  7. little bit more self defense stuff

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    e7b61f9 View commit details
    Browse the repository at this point in the history

  8. yup

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    dd52efc View commit details
    Browse the repository at this point in the history

  9. pipe fix

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    a2791a5 View commit details
    Browse the repository at this point in the history

  10. fix nitrogen

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    48797e8 View commit details
    Browse the repository at this point in the history

  11. extra misc stuff and food

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    807c946 View commit details
    Browse the repository at this point in the history

  12. welding fuel

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    245061f View commit details
    Browse the repository at this point in the history

  13. Update jungleland_swamp_syndicatestation.dmm

    @Marmio64
    Marmio64 committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    66abd45 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Merge pull request #42 from Marmio64/jungle-syndi-station 

    Jungle syndi station
    @Djiq
    Djiq authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    1fbc0f3 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. fixes and makes gulag no longer extremely fucking ugly

    @Djiq
    Djiq committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    20e2f5e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    507057d View commit details
    Browse the repository at this point in the history

  3. post-merge fixes

    @Djiq
    Djiq committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    7650107 View commit details
    Browse the repository at this point in the history

  4. disables syndie base till it gets fixed

    @Djiq
    Djiq committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    b949c1f View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. may fix it?

    @Marmio64
    Marmio64 committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    0cac43b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #43 from Marmio64/fixbase 

    Fixbase?
    @Djiq
    Djiq authored Sep 21, 2023
    Configuration menu
    Copy the full SHA
    fba1d9d View commit details
    Browse the repository at this point in the history

  3. e

    @Djiq
    Djiq committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    8b56bed View commit details
    Browse the repository at this point in the history

  4. e2

    @Djiq
    Djiq committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    aaa163d View commit details
    Browse the repository at this point in the history

  5. Revert "e2" 

    This reverts commit aaa163d.
    @Djiq
    Djiq committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    6b3d032 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    6d2f12e View commit details
    Browse the repository at this point in the history

  2. huh

    @Djiq
    Djiq committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    5d565f7 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. fixes

    @Djiq
    Djiq committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    d07e4eb View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    53362d3 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. fixes toxin being invisible (no clue how tf that happened)

    @Djiq
    Djiq committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    32e4562 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    d74c424 View commit details
    Browse the repository at this point in the history

  3. BUNCH OF FIXES

    @Djiq
    Djiq committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    569fa43 View commit details
    Browse the repository at this point in the history

  4. demon core stuff

    @Djiq
    Djiq committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    c952740 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2023

  1. fixes aux base

    @Djiq
    Djiq committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    5425e91 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    34a5aaf View commit details
    Browse the repository at this point in the history

  3. fixes whiteship error and syndie station gun turrets being too close

    @Djiq
    Djiq committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    e4d8f6b View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Sep 29, 2023
    Configuration menu
    Copy the full SHA
    bd4892f View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. reworks toxic buildup status effect to be a chemical reagent so you c… 

    …an treat it with toxin medication easier
    @Djiq
    Djiq committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    72eb086 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    6f8bf04 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    6832281 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    f8a8daf View commit details
    Browse the repository at this point in the history

  2. works?

    @Djiq
    Djiq committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    996ea9c View commit details
    Browse the repository at this point in the history

  3. wake up

    @Djiq
    Djiq committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    a29eae6 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    9754a7d View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    d091b9e View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. should be fixed now, this compile time issue didnt appear on my local

    @Djiq
    Djiq committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    f75eef6 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    61e3824 View commit details
    Browse the repository at this point in the history

  2. e

    @Djiq
    Djiq committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    c425a5a View commit details
    Browse the repository at this point in the history

  3. kuku ;_;

    @Djiq
    Djiq committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    b75a57e View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    fbbf89f View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    3b820b1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    be52ebe View commit details
    Browse the repository at this point in the history

  3. would this work?

    @Djiq
    Djiq committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    3eaef12 View commit details
    Browse the repository at this point in the history

  4. nevermind updating dream maker didnt work

    @Djiq
    Djiq committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    946bdc2 View commit details
    Browse the repository at this point in the history

  5. e2

    @Djiq
    Djiq committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    c78eed9 View commit details
    Browse the repository at this point in the history

  6. what

    @Djiq
    Djiq committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    28c0677 View commit details
    Browse the repository at this point in the history

  7. bump

    @Djiq
    Djiq committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    8a33c32 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    4007e2d View commit details
    Browse the repository at this point in the history

  2. e

    @Djiq
    Djiq committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    cd9253a View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    fe150f6 View commit details
    Browse the repository at this point in the history

  2. fixes compile error

    @Djiq
    Djiq committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    015ac9f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    20e3cc2 View commit details
    Browse the repository at this point in the history

  4. adjusts values and fixes skin twisters not being able to be pulled af… 

    …ter dying
    @Djiq
    Djiq committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    e5b24cf View commit details
    Browse the repository at this point in the history

  5. mosquito fix

    @Djiq
    Djiq committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    7b0a7fc View commit details
    Browse the repository at this point in the history

  6. adjusts trident

    @Djiq
    Djiq committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    8816159 View commit details
    Browse the repository at this point in the history

  7. bump???

    @Djiq
    Djiq committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    ee6bddc View commit details
    Browse the repository at this point in the history

  8. more mosquito fixes

    @Djiq
    Djiq committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    5c5044b View commit details
    Browse the repository at this point in the history

  9. fixes some bugs with dryad hearts and makes necropolis chests appear … 

    …only after defeating elite fauna
    @Djiq
    Djiq committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    b75c870 View commit details
    Browse the repository at this point in the history

  10. fixed lmao

    @Djiq
    Djiq committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    020dd2e View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. bump

    @Djiq
    Djiq committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    7f26132 View commit details
    Browse the repository at this point in the history

  2. fixes dryad hearts being invisible oops

    @Djiq
    Djiq committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    19d04e8 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 5, 2023
    Configuration menu
    Copy the full SHA
    fe2489b View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. tar mobs delete on death

    @Djiq
    Djiq committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    8f82b21 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    bc721cc View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. adds more deep toxic pits to jungleland syndie base, and makes acid g… 

    …enerally slightly deadlier
    @Djiq
    Djiq committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    e4220a9 View commit details
    Browse the repository at this point in the history

  2. remove tar altar ruin and add tar altar to dying tar temple

    @Marmio64
    Marmio64 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    b9be6f9 View commit details
    Browse the repository at this point in the history

  3. a couple visual changes

    @Marmio64
    Marmio64 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    14d0663 View commit details
    Browse the repository at this point in the history

  4. forgot to save

    @Marmio64
    Marmio64 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    4f0a081 View commit details
    Browse the repository at this point in the history

  5. small fishing area

    @Marmio64
    Marmio64 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    8d9be27 View commit details
    Browse the repository at this point in the history

  6. proper atmos

    @Marmio64
    Marmio64 committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    62618c8 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Merge pull request #45 from Marmio64/fishing 

    syndicate base fishing pond
    @Djiq
    Djiq authored Dec 14, 2023
    Configuration menu
    Copy the full SHA
    8a89b6b View commit details
    Browse the repository at this point in the history

  2. tar king no longer spams message_admins

    @Djiq
    Djiq committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    6199408 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    e856a2f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'jungleland' of https://github.com/EdgeLordExe/Yogstation … 

    …into jungleland
    @Djiq
    Djiq committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    a445042 View commit details
    Browse the repository at this point in the history

  5. fixes skin twister bug??

    @Djiq
    Djiq committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    c55e984 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #44 from Marmio64/arena 

    remove tar altar ruin and add tar altar to dying tar temple
    @Djiq
    Djiq authored Dec 14, 2023
    Configuration menu
    Copy the full SHA
    701c965 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    cfd5381 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. tiny change to lavaland geode

    @Djiq
    Djiq committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    507f929 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2023

  1. more geode fixes (atmos mostly)

    @Djiq
    Djiq committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    e912b2f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    091d2c6 View commit details
    Browse the repository at this point in the history

  3. updates tar assistant and tar enchant

    @Djiq
    Djiq committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    2d5b3ac View commit details
    Browse the repository at this point in the history

  4. a few tweaks

    @Marmio64
    Marmio64 committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    e4d2c4d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #46 from Marmio64/ruinimprovements 

    minor ruin tweaks
    @Djiq
    Djiq authored Dec 16, 2023
    Configuration menu
    Copy the full SHA
    f5fa0cb View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2023

  1. adds magnus purpura, a new herb in jungleland that allows you to temp… 

    …orarily walk on non-deep sulphuric pits without taking damage
    @Djiq
    Djiq committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    3f955ed View commit details
    Browse the repository at this point in the history

  2. makes the sulph put immune trait also work on toxic buildup

    @Djiq
    Djiq committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    e9023b8 View commit details
    Browse the repository at this point in the history

  3. e2

    @Djiq
    Djiq committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    3618ac1 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'jungleland' of https://github.com/EdgeLordExe/Yogstation … 

    …into jungleland
    @Djiq
    Djiq committed Dec 17, 2023
    Configuration menu
    Copy the full SHA
    477cad7 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. adds jungle parallax woo hoo!

    @Djiq
    Djiq committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    4705945 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    7e394d0 View commit details
    Browse the repository at this point in the history

  3. huh?

    @Djiq
    Djiq committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    c002f8d View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. fixes a couple things

    @Djiq
    Djiq committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    ed4fce7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    44963e4 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Merge branch 'master' into jungleland

    @ToasterBiome
    ToasterBiome authored Dec 20, 2023
    Configuration menu
    Copy the full SHA
    cfd5310 View commit details
    Browse the repository at this point in the history

  2. new tar mobs

    @Marmio64
    Marmio64 committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    ee977de View commit details
    Browse the repository at this point in the history

  3. Merge pull request #47 from Marmio64/newtarmobs 

    new tar mobs
    @Djiq
    Djiq authored Dec 20, 2023
    Configuration menu
    Copy the full SHA
    81871d4 View commit details
    Browse the repository at this point in the history

  4. no more shelter on deep sulphuric pit wah wah

    @Djiq
    Djiq committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    fa82118 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    039e6e1 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'jungleland' of https://github.com/EdgeLordExe/Yogstation … 

    …into jungleland
    @Djiq
    Djiq committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    690e71f View commit details
    Browse the repository at this point in the history

  7. tar enchant clarification

    @Djiq
    Djiq committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    a22f835 View commit details
    Browse the repository at this point in the history

  8. e

    @Djiq
    Djiq committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    21da532 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2023

  1. funkies and tar king much harder now B )

    @Djiq
    Djiq committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    aec5d30 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Dec 27, 2023
    Configuration menu
    Copy the full SHA
    3ab7d22 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2023

  1. alpha elites can no longer spawn from gold extracts

    @Djiq
    Djiq committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    39e98a1 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2024

  1. Merge remote-tracking branch 'yogstation13/master' into jungleland

    @Djiq
    Djiq committed Jan 5, 2024
    Configuration menu
    Copy the full SHA
    651be8c View commit details
    Browse the repository at this point in the history