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

Patch 0 - Salvaging #14

Merged
merged 67 commits into from
Jul 3, 2024
Merged

Patch 0 - Salvaging #14

merged 67 commits into from
Jul 3, 2024

Commits on Jun 3, 2024

  1. chair dragging icon fix 

    jfc
    @silencer-pl
    silencer-pl committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    f9ef993 View commit details
    Browse the repository at this point in the history

  2. narration fixes, saving

    @silencer-pl
    silencer-pl committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    57efbae View commit details
    Browse the repository at this point in the history

  3. adds another statpanel controllable/savable var

    @silencer-pl
    silencer-pl committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    4134381 View commit details
    Browse the repository at this point in the history

  4. Salvaging gvars and recycler icons

    @silencer-pl
    silencer-pl committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    8e1b02b View commit details
    Browse the repository at this point in the history

  5. icon moving, depositor icons 

    Moving icons to same spot for easier sp referencing.
    @silencer-pl
    silencer-pl committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    faebfcd View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. makes the lore display not stupid 

    Also adds one object def for salavging
    @silencer-pl
    silencer-pl committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    6d4cd2e View commit details
    Browse the repository at this point in the history

  2. recycler nozzle and backpack base defs

    @silencer-pl
    silencer-pl committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    f63f423 View commit details
    Browse the repository at this point in the history

  3. recycler nozzle, backpack, depositor and interactions 

    Covers everything but charging the nozzle and actual salvaging.
    @silencer-pl
    silencer-pl committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    0a5e030 View commit details
    Browse the repository at this point in the history

  4. The === commit 

    6 months in and still the same mistake.
    @silencer-pl
    silencer-pl committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    3670520 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. salvaging item interactions code

    @silencer-pl
    silencer-pl committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    09590d4 View commit details
    Browse the repository at this point in the history

  2. Update salvage_items.dm 

    desc and lore desc affixing
    @silencer-pl
    silencer-pl committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    677a473 View commit details
    Browse the repository at this point in the history

  3. data spike

    @silencer-pl
    silencer-pl committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    8d4fa37 View commit details
    Browse the repository at this point in the history

  4. manifest and serial number display windows 

    Also makes lore display prompt follow same pattern.
    @silencer-pl
    silencer-pl committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    4855826 View commit details
    Browse the repository at this point in the history

  5. warning stripes popup 

    Also removes tgui customizations that are no longer needed.
    @silencer-pl
    silencer-pl committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    95d58b2 View commit details
    Browse the repository at this point in the history

  6. structures master sans disassembly

    @silencer-pl
    silencer-pl committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    1de5edb View commit details
    Browse the repository at this point in the history

  7. polymer factoring

    @silencer-pl
    silencer-pl committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    cb13323 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. crafting decon array 

    includes generation of cells etc.
    @silencer-pl
    silencer-pl committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    12aa9c3 View commit details
    Browse the repository at this point in the history

  2. Update master_items.dm 

    decon interactions derived from the array
    @silencer-pl
    silencer-pl committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    cd47095 View commit details
    Browse the repository at this point in the history

  3. structure final touches and intel procs

    @silencer-pl
    silencer-pl committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    728f59c View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. slavaging turf code

    @silencer-pl
    silencer-pl committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    f15c502 View commit details
    Browse the repository at this point in the history

  2. terminal ui draft

    @silencer-pl
    silencer-pl committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    0571c26 View commit details
    Browse the repository at this point in the history

  3. more terminal drafting 

    Minor corrections to do, but sufficient for salvaging.
    @silencer-pl
    silencer-pl committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    c9d226a View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. Update terminal.dm 

    Display code cleanup. This is effectively ready, MOST code is generalized, but some deriviation remains. I can likely make it work form mathing display width and height, but that seems excessive.
    @silencer-pl
    silencer-pl committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    4599504 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. Update terminal.dm 

    Fixed command line not being replaced properly
    @silencer-pl
    silencer-pl committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    a97e3a7 View commit details
    Browse the repository at this point in the history

  2. Update terminal.dm 

    input is shown uppercase correctly
    @silencer-pl
    silencer-pl committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    960523b View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. item slavaging loop fixes

    @silencer-pl
    silencer-pl committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    aa88064 View commit details
    Browse the repository at this point in the history

  2. Update recycler.dm 

    cleans up depositing and puts it in a separate proc
    @silencer-pl
    silencer-pl committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    160c26e View commit details
    Browse the repository at this point in the history

  3. adds drill, keyword decon fixes

    @silencer-pl
    silencer-pl committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    4522324 View commit details
    Browse the repository at this point in the history

  4. turf basic interactions for salvaging 

    this wraps up the core stuff
    @silencer-pl
    silencer-pl committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    4aae054 View commit details
    Browse the repository at this point in the history

  5. Update turf.dm 

    oops
    @silencer-pl
    silencer-pl committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    7c0dacb View commit details
    Browse the repository at this point in the history

  6. Update master_items.dm 

    turns displaying crafting step instructions into a proc, shows them after successful advancing a step
    @silencer-pl
    silencer-pl committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    fa80e8f View commit details
    Browse the repository at this point in the history

  7. Update structures.dmi 

    nozzle charger icons
    @silencer-pl
    silencer-pl committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    410444f View commit details
    Browse the repository at this point in the history

  8. salvaging code cleanup

    @silencer-pl
    silencer-pl committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    ddbd77e View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. nozzle recharger

    @silencer-pl
    silencer-pl committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    a6038b0 View commit details
    Browse the repository at this point in the history

  2. drone spike defs and setup interactions

    @silencer-pl
    silencer-pl committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    831b6e8 View commit details
    Browse the repository at this point in the history

  3. intel processing and assorted bugfixes

    @silencer-pl
    silencer-pl committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    2d26a35 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. final interactions, title and turf area calls etc 

    this should bring mechanics to be ready for the terminals, all other interactions are done
    @silencer-pl
    silencer-pl committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    6656c4b View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. mission control terminal, final salvage mechanics, cleanup 

    Added some extra terminal code, cleaned a few things up. Everything seems to be working fine, this is the "feature complete" merge commit. Surely still some broken usecases, but nothing major.
    @silencer-pl
    silencer-pl committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    efd138b View commit details
    Browse the repository at this point in the history

  2. briefing terminals

    @silencer-pl
    silencer-pl committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    7c3f6c6 View commit details
    Browse the repository at this point in the history

  3. resources saving and admin displays

    @silencer-pl
    silencer-pl committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    00dc1eb View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. floor and wall salvage map defs

    @silencer-pl
    silencer-pl committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    5e2c99a View commit details
    Browse the repository at this point in the history

  2. turf/tile decon final touches 

    adds a separate tile icon and incoroprates it into decon, fixes text and progression
    @silencer-pl
    silencer-pl committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    12b8a53 View commit details
    Browse the repository at this point in the history

  3. salvagable doors and icons, object/item combining

    @silencer-pl
    silencer-pl committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    ac89bdd View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. salvage base defs - heavy machinery

    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    a255f0a View commit details
    Browse the repository at this point in the history

  2. Update structures.dm 

    smes def
    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    3ba9a68 View commit details
    Browse the repository at this point in the history

  3. salvageable structure defs - small structures

    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    d7391a0 View commit details
    Browse the repository at this point in the history

  4. Update master_items.dm 

    adds post spike message
    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    c37f152 View commit details
    Browse the repository at this point in the history

  5. salvage - crates and lockers, item dropping

    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    2a2361d View commit details
    Browse the repository at this point in the history

  6. remaining structure defs and icons

    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    13d538a View commit details
    Browse the repository at this point in the history

  7. randomization routines for junk

    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    b2731b2 View commit details
    Browse the repository at this point in the history

  8. salvage item defs and icons

    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    7f86333 View commit details
    Browse the repository at this point in the history

  9. sound playback and blurb display improvements

    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    ab02918 View commit details
    Browse the repository at this point in the history

  10. Update admin_verbs.dm

    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    20d865a View commit details
    Browse the repository at this point in the history

  11. Update master_items.dm 

    temp indicator for preppred objects
    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    43f6632 View commit details
    Browse the repository at this point in the history

  12. Preps the Neroid map file 

    Right now using ground map as just a mission map identifier, will go deeper into CM code later.
    @silencer-pl
    silencer-pl committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    ac9c4fa View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. mapping prep

    @silencer-pl
    silencer-pl committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    e730ce6 View commit details
    Browse the repository at this point in the history

  2. Salvager Tug map and assorted code fixes

    @silencer-pl
    silencer-pl committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    2cba293 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. space suit and area icons/code 

    Also extender icon randomizer for items and structures for the salvage gen
    @silencer-pl
    silencer-pl committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    0b67f81 View commit details
    Browse the repository at this point in the history

  2. improved crate icon randomization

    @silencer-pl
    silencer-pl committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    03dc289 View commit details
    Browse the repository at this point in the history

  3. salvage areas

    @silencer-pl
    silencer-pl committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    00bd218 View commit details
    Browse the repository at this point in the history

  4. Update Neroid.dmm 

    orientation whoopsie
    @silencer-pl
    silencer-pl committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    9e5304f View commit details
    Browse the repository at this point in the history

  5. removes panels from pst/uacm doors

    @silencer-pl
    silencer-pl committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    a49b93d View commit details
    Browse the repository at this point in the history

  6. tweaks, fixes and patches 

    Catches up on some backend stuff, adds Mission Control text
    @silencer-pl
    silencer-pl committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    1017270 View commit details
    Browse the repository at this point in the history

  7. pen landing area, fence, mecahncis 

    Also restores pushing instead of knockdown
    @silencer-pl
    silencer-pl committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    24fea30 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. adds more food, puts it on the tug

    @silencer-pl
    silencer-pl committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    ef28b37 View commit details
    Browse the repository at this point in the history

  2. salvaging bug fixes 

    everything and the kitchen sink to boot
    @silencer-pl
    silencer-pl committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    2631d22 View commit details
    Browse the repository at this point in the history

  3. briefing and recycle handholding

    @silencer-pl
    silencer-pl committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    1c171bc View commit details
    Browse the repository at this point in the history