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

Coffee machine take two #7497

Closed
wants to merge 524 commits into from
Closed

Coffee machine take two #7497

wants to merge 524 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jun 2, 2024

  1. vents done & survivors sprites

    @Zenith00000
    Zenith00000 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    359915a View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. sprite changes, map & area fixes

    @Zenith00000
    Zenith00000 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    d53c8ec View commit details
    Browse the repository at this point in the history

  2. small fixes

    @Zenith00000
    Zenith00000 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    a2680ba View commit details
    Browse the repository at this point in the history

  3. Update layer definition autodoc

    @Drulikar
    Drulikar authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    d164a44 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. survivor clothing & presets - WIP

    @Zenith00000
    Zenith00000 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    3c633c9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    35b54e6 View commit details
    Browse the repository at this point in the history

  3. small loadout changes

    @Zenith00000
    Zenith00000 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    77809a9 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. survivor fixes

    @Zenith00000
    Zenith00000 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    5a0feb1 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. more survivor stuff, sprites, ect. Minor map fixes.

    @Zenith00000
    Zenith00000 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    c05afe7 View commit details
    Browse the repository at this point in the history

  2. survivor changes

    @Zenith00000
    Zenith00000 committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    472a43e View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. sprite changes, survivor changes

    @Zenith00000
    Zenith00000 committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    b438ab5 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2024

  1. new smg, sprite fixes, map fixes, corpses and survivor changes, vario… 

    …us small fixes.
    @Zenith00000
    Zenith00000 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    15963cf View commit details
    Browse the repository at this point in the history

  2. smg fixes

    @Zenith00000
    Zenith00000 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    1427c6d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'cmss13-devs:master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Jun 9, 2024
    Configuration menu
    Copy the full SHA
    91add60 View commit details
    Browse the repository at this point in the history

  4. small map fixes and smg fixes.

    @Zenith00000
    Zenith00000 committed Jun 9, 2024
    Configuration menu
    Copy the full SHA
    30cd765 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. big survivor update, all finished. small map fixes, mostly survivor r… 

    …elated.
    @Zenith00000
    Zenith00000 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    d2365fa View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. sprite fixes, map fixes, Drivable Box-Vans!

    @Zenith00000
    Zenith00000 committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    5125f28 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. layering and offsetting fixes for wall objects + other misc minor fixes

    @Zenith00000
    Zenith00000 committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    5010760 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. car pileup fix + minor map fixes

    @Zenith00000
    Zenith00000 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    275b157 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Manual partial patch of Van fixes & icon merge 6b49877

    @Drulikar
    Drulikar committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    13f1606 View commit details
    Browse the repository at this point in the history

  2. van fixes + minor map fixes

    @Zenith00000 @Drulikar
    Zenith00000 authored and Drulikar committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    9422f66 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into Hybrisa

    @Drulikar
    Drulikar committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    09f18d0 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. sprite refinements, new bilboards, wy_sentry holders & van sounds, +m… 

    …inor map changes & fixes
    @Zenith00000
    Zenith00000 committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    549bd1f View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. minor fixes, minor map and sprite fixes.

    @Zenith00000
    Zenith00000 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    8d84c56 View commit details
    Browse the repository at this point in the history

  2. xeno spawns finally added ... oops.

    @Zenith00000
    Zenith00000 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    5a9c581 View commit details
    Browse the repository at this point in the history

  3. minor map fixes

    @Zenith00000
    Zenith00000 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    fdbb39d View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. very small fix to map

    @Zenith00000
    Zenith00000 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    bad19d4 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

  1. minor map fixes & deco_edging replacement sprites + desc for vehicles

    @Zenith00000
    Zenith00000 committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    009caea View commit details
    Browse the repository at this point in the history

  2. minor map fix

    @Zenith00000
    Zenith00000 committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    f2a8b7a View commit details
    Browse the repository at this point in the history

  3. layering fixes

    @Zenith00000
    Zenith00000 committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    6169779 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. new sprites, billboards & pizza related stuff added. Minor map fixes.… 

    … Minor survivor changes.
    @Zenith00000
    Zenith00000 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    7bc1217 View commit details
    Browse the repository at this point in the history

  2. 12 new posters + minor map changes.

    @Zenith00000
    Zenith00000 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    cb97d64 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. minor sprite/map fixes

    @Zenith00000
    Zenith00000 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    eb07314 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Lot's of layering, buckling, map fixes, naming fixes ect.

    @Zenith00000
    Zenith00000 committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    400f7b4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Jun 27, 2024
    Configuration menu
    Copy the full SHA
    1b87538 View commit details
    Browse the repository at this point in the history

  3. small map fixes related to the tables and windows breaking their merg… 

    …ing. As well as misc small changes.
    @Zenith00000
    Zenith00000 committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    a8bdd0a View commit details
    Browse the repository at this point in the history

  4. minor shutter fixes & makes some areas unweedable that shouldn't be w… 

    …eedable.
    @Zenith00000
    Zenith00000 committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    44cac0a View commit details
    Browse the repository at this point in the history

  5. handrail fixes and sprites, throwpass & projectile_coverage on many o… 

    …bjects. other minor map fixes.
    @Zenith00000
    Zenith00000 committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    333cf3c View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. map fixes, billboard sprites tweaks, & platform tweaks.

    @Zenith00000
    Zenith00000 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    219d5f3 View commit details
    Browse the repository at this point in the history

  2. small map fixes

    @Zenith00000
    Zenith00000 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    b31ad02 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2024

  1. poddoor fixes, door access fixes, pipe fixes, small map fixes.

    @Zenith00000
    Zenith00000 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    f948159 View commit details
    Browse the repository at this point in the history

  2. small map fix.

    @Zenith00000
    Zenith00000 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    00a5a57 View commit details
    Browse the repository at this point in the history

  3. very small fix to lights in the showroom.

    @Zenith00000
    Zenith00000 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    e8b83d6 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. hyb fix

    @Nanu308
    Nanu308 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    a816a76 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into Hybrisa

    @Nanu308
    Nanu308 authored Jun 30, 2024
    Configuration menu
    Copy the full SHA
    2796f7f View commit details
    Browse the repository at this point in the history

  3. Merge pull request cmss13-devs#39 from Nanu308/nanu/hyb-fixes 

    hyb fix for pipeline
    @Zenith00000
    Zenith00000 authored Jun 30, 2024
    Configuration menu
    Copy the full SHA
    b43a134 View commit details
    Browse the repository at this point in the history

  4. button warnings

    @uuuuhuuuu
    uuuuhuuuu committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    efab0c9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request cmss13-devs#41 from cuberound/button-allert 

    button warnings
    @Zenith00000
    Zenith00000 authored Jun 30, 2024
    Configuration menu
    Copy the full SHA
    29a5684 View commit details
    Browse the repository at this point in the history

  6. survivor skill fixes, derelict-ship destructible props and walls, clo… 

    …thing fixes, misc map fixes. no longer able to CAS in caves & research. road-barrier darkened to be more visable.
    @Zenith00000
    Zenith00000 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    14e6a5f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    9889c85 View commit details
    Browse the repository at this point in the history

  8. minor map fixes, Command announcements for lifting lockdowns.

    @Zenith00000
    Zenith00000 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    e2d82a2 View commit details
    Browse the repository at this point in the history

  9. makes the derelict ship ceiling OB'able and metal.

    @Zenith00000
    Zenith00000 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    c657028 View commit details
    Browse the repository at this point in the history

  10. fixes chem storage issues.

    @Zenith00000
    Zenith00000 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    67cc606 View commit details
    Browse the repository at this point in the history

  11. chem & research machine replacement fix.

    @Zenith00000
    Zenith00000 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    879164d View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. makes some tiles allow construction that didn't allow it before. lowe… 

    …rs the layer of minecart_tracks to turf.
    @Zenith00000
    Zenith00000 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    b45f861 View commit details
    Browse the repository at this point in the history

  2. naming fix.

    @Zenith00000
    Zenith00000 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    3581743 View commit details
    Browse the repository at this point in the history

  3. timelock

    @uuuuhuuuu
    uuuuhuuuu committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    69be4b5 View commit details
    Browse the repository at this point in the history

  4. changes the camo back to "classic" as urban still has too many issues… 

    …. Sets the power to 0 at round-start and removes some unecessary buttons.
    @Zenith00000
    Zenith00000 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    0a1137b View commit details
    Browse the repository at this point in the history

  5. removes stun-prods & an evil button connected to the alyamer research… 

    … lockdown. - oops
    @Zenith00000
    Zenith00000 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    9ac59ca View commit details
    Browse the repository at this point in the history

  6. very minor sprite & map fixes

    @Zenith00000
    Zenith00000 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    6336f88 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Merge pull request cmss13-devs#42 from cuberound/button-allert 

    timelock on research button
    @Zenith00000
    Zenith00000 authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    86a7391 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. P90 fixes & added to the black market. Derelict Ship has proper plati… 

    …ng tiles now. Fair amount of map changes, less ledges, lights, new entrances to LZ1, other more minor changes. Survivor fixes to their job payments & missing CL code. + more minor changes & code reorganization.
    @Zenith00000
    Zenith00000 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    9f66b8a View commit details
    Browse the repository at this point in the history

  2. very minor map fix

    @Zenith00000
    Zenith00000 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    6bfbca0 View commit details
    Browse the repository at this point in the history

  3. Shimmy around component 

    Repath traffic_alt under traffic
    @Drulikar
    Drulikar committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    773e100 View commit details
    Browse the repository at this point in the history

  4. Fix empty supplies runtimes by repathing and reworking 

    Repath /obj/structure/largecrate/supply/empty to just /obj/structure/largecrate/supply
    @Drulikar
    Drulikar committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    9b38cb2 View commit details
    Browse the repository at this point in the history

  5. indentation fix.

    @Zenith00000
    Zenith00000 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    116a1ad View commit details
    Browse the repository at this point in the history

  6. small fix.

    @Zenith00000
    Zenith00000 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    b2e9c8a View commit details
    Browse the repository at this point in the history

  7. turf fixes & organization

    @Zenith00000
    Zenith00000 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    f4c205f View commit details
    Browse the repository at this point in the history

  8. map fix

    @Zenith00000
    Zenith00000 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    feca708 View commit details
    Browse the repository at this point in the history

  9. final auto_turf fixes.

    @Zenith00000
    Zenith00000 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    1e7ed6e View commit details
    Browse the repository at this point in the history

  10. Update code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm 

    Co-authored-by: forest2001 <[email protected]>
    @Zenith00000 @realforest2001
    Zenith00000 and realforest2001 authored Jul 4, 2024
    Configuration menu
    Copy the full SHA
    11ccb6b View commit details
    Browse the repository at this point in the history

  11. minor map fixes, minor survivor preset fixes.

    @Zenith00000
    Zenith00000 committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    49e0947 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Fix pushing boxes

    @Drulikar
    Drulikar committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    9582c86 View commit details
    Browse the repository at this point in the history

  2. survivor loot changes + light fixes & minor map fixes.

    @Zenith00000
    Zenith00000 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    51fde31 View commit details
    Browse the repository at this point in the history

  3. Fix some posts incorrectly determining blocked direction 

    Add swing around functionality for blocked directions
Change can_move checks to be more permissive (basically only prevents movement if the structure is flanked on all three sides)
    @Drulikar
    Drulikar committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    7e58322 View commit details
    Browse the repository at this point in the history

  4. very minor map fixes

    @Zenith00000
    Zenith00000 committed Jul 5, 2024
    Configuration menu
    Copy the full SHA
    d874f97 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2024

  1. Many fixed. Big changes to the coms locations - switched around Pizza… 

    … with coms location & expanded Casino in place of it. Allows access to caves from marshals, added a few new sprites for Casino. Changed a bunch of health values. Map fixes & Minor fixes. Added text to see the "condition" of breakable vehicles. Many more things are breakable now.
    @Zenith00000
    Zenith00000 committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    0f68b05 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. minor map fixes.

    @Zenith00000
    Zenith00000 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    b2389f5 View commit details
    Browse the repository at this point in the history

  2. very small fix to APC.

    @Zenith00000
    Zenith00000 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    0df8060 View commit details
    Browse the repository at this point in the history

  3. minor map fix & makes supermarket stuff destructible.

    @Zenith00000
    Zenith00000 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    cc6cd64 View commit details
    Browse the repository at this point in the history

  4. small fix for pole.

    @Zenith00000
    Zenith00000 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    6916b9f View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. very small map fix.

    @Zenith00000
    Zenith00000 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    0dce029 View commit details
    Browse the repository at this point in the history

  2. small fix to curtains.

    @Zenith00000
    Zenith00000 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    47363ed View commit details
    Browse the repository at this point in the history

  3. updates map image.

    @Zenith00000
    Zenith00000 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    6f4c731 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Merge branch 'master' into Hybrisa

    @harryob
    harryob authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    590e219 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Fix open turf var edits

    @Drulikar
    Drulikar committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    c5e057b View commit details
    Browse the repository at this point in the history

  2. Fix dups

    @Drulikar
    Drulikar committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    4793de3 View commit details
    Browse the repository at this point in the history

  3. fix for exist stun on phonebox/off

    @Zenith00000
    Zenith00000 authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    a16c9dc View commit details
    Browse the repository at this point in the history

  4. fixes some incorrect tiles & adds some spawns.

    @Zenith00000
    Zenith00000 authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    60795e3 View commit details
    Browse the repository at this point in the history

  5. more tile fixes + minor map fixes.

    @Zenith00000
    Zenith00000 authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    9b842ec View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2024

  1. adds projectile_coverage to the small cars, and adds a WY big logo de… 

    …cal.

The decal is mainly just for others to use on their maps and such, since it's original form was a tile, a decal can be better placed on other surfaces.
    @Zenith00000
    Zenith00000 authored Jul 13, 2024
    Configuration menu
    Copy the full SHA
    672eacd View commit details
    Browse the repository at this point in the history

  2. small tile fixes that I missed. 

    More tile fixes I missed last time.
    @Zenith00000
    Zenith00000 authored Jul 13, 2024
    Configuration menu
    Copy the full SHA
    4efa411 View commit details
    Browse the repository at this point in the history

  3. adds some new metalping sound to certain objects, adds credits to cre… 

    …dit room

Adds a new sound to the majority of props from hybrisaprops.dm, when they're impacted by projectiles. as well as finally adds some credits to the description of the golden plaque in the gonzo room.
    @Zenith00000
    Zenith00000 authored Jul 13, 2024
    Configuration menu
    Copy the full SHA
    7f3d36a View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. small fix to some floor tiles.

    @Zenith00000
    Zenith00000 authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    f481ddd View commit details
    Browse the repository at this point in the history

  2. correct path of turf file. 

    oops wrong path.
    @Zenith00000
    Zenith00000 authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    3e96c8c View commit details
    Browse the repository at this point in the history

  3. Delete code/game/turf directory 

    wrong directory name.
    @Zenith00000
    Zenith00000 authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    41768cb View commit details
    Browse the repository at this point in the history

  4. fixes hybrisa_open_turfs

    @Zenith00000
    Zenith00000 authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    016f3c9 View commit details
    Browse the repository at this point in the history

  5. small indentation fix

    @Zenith00000
    Zenith00000 authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    544fe3e View commit details
    Browse the repository at this point in the history

  6. more tile fixes.

    @Zenith00000
    Zenith00000 authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    1147e77 View commit details
    Browse the repository at this point in the history

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

    @Drulikar
    Drulikar committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    dedd43e View commit details
    Browse the repository at this point in the history

  8. Repath lattices and billboards to new roof subtype for transparency 

    Var edit billboards on walls to not use lazy nodes (adjacent nodes)
    @Drulikar
    Drulikar committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    63f41d7 View commit details
    Browse the repository at this point in the history

  9. Repath reactors to colony subtype

    @Drulikar
    Drulikar committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    15b2421 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. makes Hybrisa 130 player pop and re-adds hostile survivor

    @Zenith00000
    Zenith00000 authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    cd1b8f6 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Revert hostile survivor change.

    @Drulikar
    Drulikar committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    fb91839 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. some small map fixes. 

    fixes some small things, removes a satchel.
    @Zenith00000
    Zenith00000 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    98598c0 View commit details
    Browse the repository at this point in the history

  2. Update code/modules/mob/holder.dm 

    Co-authored-by: Zonespace <[email protected]>
    @Zenith00000 @Zonespace27
    Zenith00000 and Zonespace27 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    4f934da View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into Hybrisa

    @Zonespace27
    Zonespace27 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    8510c39 View commit details
    Browse the repository at this point in the history

  4. span_classes fix & minor map fixes 

    fixes the billboards layering, removes some rails. Fixes the span_classes for attack_alien lines.
    @Zenith00000
    Zenith00000 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    414c597 View commit details
    Browse the repository at this point in the history

  5. small fix for span_warning 

    missed this one last time.
    @Zenith00000
    Zenith00000 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    4e7e2b9 View commit details
    Browse the repository at this point in the history

  6. Keep item_storage_boxes cached

    @Drulikar
    Drulikar committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    41042d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. map changes. 

    removes some rails, changes LZ1 a bit, removes some lights from LZ1. Other misc small changes.
    @Zenith00000
    Zenith00000 authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    4086b92 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. map changes, icon improvement. 

    Small icon change to a better wall locker icon, as well as mostly detailing changes to the map, but some minor fixes as well. Also weather fire smothering effect reduced for Hybrisa rain weather in general.
    @Zenith00000
    Zenith00000 authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    bd2d64c View commit details
    Browse the repository at this point in the history

  2. Delete code/datum/weather/weather_events/lv759_hybrisa_prospera.dm 

    oops, wrong filepath.
    @Zenith00000
    Zenith00000 authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    bebdb03 View commit details
    Browse the repository at this point in the history

  3. weather fire smothering fix

    @Zenith00000
    Zenith00000 authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    2fc57d7 View commit details
    Browse the repository at this point in the history

  4. reverts some changes, fixes fake platform deco 

    reverts a unwanted change with platforms & changes some platform deco to be fake as it had layering problems.
    @Zenith00000
    Zenith00000 authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    869eb3e View commit details
    Browse the repository at this point in the history

  5. fixes a null value 

    probably won't work as null changed to 1
    @Zenith00000
    Zenith00000 authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    a381b6b View commit details
    Browse the repository at this point in the history

  6. small LZ changes and minor map fixes

    @Zenith00000
    Zenith00000 authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    933a62c View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. requested sprite fixes from nauticall 

    various very small sprite fixes.
    @Zenith00000
    Zenith00000 authored Jul 26, 2024
    Configuration menu
    Copy the full SHA
    666e328 View commit details
    Browse the repository at this point in the history

  2. small directory fix for sprite.

    @Zenith00000
    Zenith00000 authored Jul 26, 2024
    Configuration menu
    Copy the full SHA
    cb81008 View commit details
    Browse the repository at this point in the history

  3. Delete icons/obj/doors directory

    @Zenith00000
    Zenith00000 authored Jul 26, 2024
    Configuration menu
    Copy the full SHA
    83325e9 View commit details
    Browse the repository at this point in the history

  4. removes removed item. 

    removes a /obj/item/device/suit_cooling_unit as it's a unknown type.
    @Zenith00000
    Zenith00000 authored Jul 26, 2024
    Configuration menu
    Copy the full SHA
    7bdc5dc View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2024

  1. Xeno hide exceptions for shimmy

    @Drulikar
    Drulikar committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    cd72ac2 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. Merge remote-tracking branch 'upstream/master' into Hybrisa 

    # Conflicts:
#	code/game/machinery/bio-dome_floodlights.dm
    @Drulikar
    Drulikar committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    810fa57 View commit details
    Browse the repository at this point in the history

  2. Remove hydro floodlight alien attacks

    @Drulikar
    Drulikar committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    b10a476 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Merge remote-tracking branch 'upstream/master' into Hybrisa

    @Drulikar
    Drulikar committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    852a1d5 View commit details
    Browse the repository at this point in the history

  2. Fix paygrades

    @Drulikar
    Drulikar committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    70af081 View commit details
    Browse the repository at this point in the history

  3. Repath soap & gripper

    @Drulikar
    Drulikar committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    e947b92 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. Merge remote-tracking branch 'upstream/master' into Hybrisa 

    # Conflicts:
#	code/modules/projectiles/guns/smgs.dm
    @Drulikar
    Drulikar committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    295fa9c View commit details
    Browse the repository at this point in the history

  2. Whitespace

    @Drulikar
    Drulikar committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    9c657a6 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Merge remote-tracking branch 'upstream/master' into Hybrisa 

    # Conflicts:
#	code/game/objects/structures/fence.dm
    @Drulikar
    Drulikar committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    27a636c View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2024

  1. small map fixes 

    Removes some things, makes parts of the derelict ship un-weedable. Adds some more fuel tanks around Engi and so. Buffs survivor loot slightly. Re-adds hostile survivors.
    @Zenith00000
    Zenith00000 authored Aug 6, 2024
    Configuration menu
    Copy the full SHA
    6fd818a View commit details
    Browse the repository at this point in the history

  2. reverts unwanted camo change. 

    Forgot to change this back when testing urban camos, oops.
    @Zenith00000
    Zenith00000 authored Aug 6, 2024
    Configuration menu
    Copy the full SHA
    e0e35d8 View commit details
    Browse the repository at this point in the history

  3. small map fix

    @Zenith00000
    Zenith00000 committed Aug 6, 2024
    Configuration menu
    Copy the full SHA
    122929e View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

  1. Merge branch 'cmss13-devs:master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Aug 7, 2024
    Configuration menu
    Copy the full SHA
    e24a304 View commit details
    Browse the repository at this point in the history

  2. APC path fixes

    @Zenith00000
    Zenith00000 committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    51ba873 View commit details
    Browse the repository at this point in the history

  3. small map fixes

    @Zenith00000
    Zenith00000 committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    92ce03e View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2024

  1. urban camo update

    @Blundir
    Blundir committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    6ee6041 View commit details
    Browse the repository at this point in the history

  2. some fixes to urban

    @Blundir
    Blundir committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    a08ddab View commit details
    Browse the repository at this point in the history

  3. Update uniforms.dmi

    @Blundir
    Blundir committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    4641747 View commit details
    Browse the repository at this point in the history

  4. Update uniform_0.dmi

    @Blundir
    Blundir committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    75af6d3 View commit details
    Browse the repository at this point in the history

  5. Update _marine_armor.dm

    @Blundir
    Blundir committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    609a0cd View commit details
    Browse the repository at this point in the history

  6. Update head_1.dmi

    @Blundir
    Blundir committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    f3bacb8 View commit details
    Browse the repository at this point in the history

  7. Update cm_suits.dmi

    @Blundir
    Blundir committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    f3201d3 View commit details
    Browse the repository at this point in the history

  8. Various map fixes, hospital changes, new coms & minor sprite fix

    @Zenith00000
    Zenith00000 committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    b2c79fc View commit details
    Browse the repository at this point in the history

  9. adds missing APC to LZ1 coms

    @Zenith00000
    Zenith00000 committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    426f7fc View commit details
    Browse the repository at this point in the history

  10. small survivor skill fix

    @Zenith00000
    Zenith00000 committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    24ea694 View commit details
    Browse the repository at this point in the history

  11. minor coms area fix

    @Zenith00000
    Zenith00000 committed Aug 11, 2024
    Configuration menu
    Copy the full SHA
    0082d03 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. LZ1 space improvements (for tents)

    @Zenith00000
    Zenith00000 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    c79f3c4 View commit details
    Browse the repository at this point in the history

  2. Autodoc skill datum vars

    @Drulikar
    Drulikar committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    dd5e9e8 View commit details
    Browse the repository at this point in the history

  3. more LZ1 detailing

    @Zenith00000
    Zenith00000 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    dfcd976 View commit details
    Browse the repository at this point in the history

  4. Refactor rats to mice subtypes 

    Refactoring
    @Drulikar
    Drulikar committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    50a9b68 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Drulikar
    Drulikar committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    d4d7b66 View commit details
    Browse the repository at this point in the history

  6. Repath mapped in rats

    @Drulikar
    Drulikar committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    4c4162c View commit details
    Browse the repository at this point in the history

  7. more minor detailing and map fixes

    @Zenith00000
    Zenith00000 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    eac0eab View commit details
    Browse the repository at this point in the history

  8. minor map fixes

    @Zenith00000
    Zenith00000 committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    a897d80 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. minor map fixes & checkpoint destruction + WY colony-sentry buffs

    @Zenith00000
    Zenith00000 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    993839d View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2024

  1. fix

    @Blundir
    Blundir committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    78727ac View commit details
    Browse the repository at this point in the history

  2. Update weapon_map_decorator.dm

    @Blundir
    Blundir committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    383328f View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. slight P90 buff, minor map fix, missing announce_text added.

    @Zenith00000
    Zenith00000 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    730660b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    ac57b3e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    5306088 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    310ddc2 View commit details
    Browse the repository at this point in the history

  5. slight P90 buff, minor map fix, missing announce_text added. fixed.

    @Zenith00000
    Zenith00000 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    ddee49f View commit details
    Browse the repository at this point in the history

  6. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    f550553 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into H… 

    …ybrisa
    @Zenith00000
    Zenith00000 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    6e70b23 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into p… 

    …r/6248
    @Blundir
    Blundir committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    ed5f934 View commit details
    Browse the repository at this point in the history

  2. fix pizza cutter

    @Blundir
    Blundir committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    ce2983c View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Merge branch 'master' of https://github.com/cmss13-devs/cmss13 into p… 

    …r/6248
    @Blundir
    Blundir committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    f759e0f View commit details
    Browse the repository at this point in the history

  2. Update packets.dmi

    @Blundir
    Blundir committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    d9ffd0b View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Merge branch 'master' into Hybrisa

    @Zenith00000
    Zenith00000 committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    3b6ba6f View commit details
    Browse the repository at this point in the history

  2. missing p90 line-art

    @Zenith00000
    Zenith00000 committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    44624b1 View commit details
    Browse the repository at this point in the history

  3. fixes urban for packets.dmi

    @Zenith00000
    Zenith00000 committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    184c950 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into Hybrisa

    @Zenith00000
    Zenith00000 committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    15789ab View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2024

  1. Merge branch 'master' into Hybrisa

    @Zenith00000
    Zenith00000 committed Aug 24, 2024
    Configuration menu
    Copy the full SHA
    0da86c5 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Merge branch 'cmss13-devs:master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    c8aa5ad View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Merge branch 'master' into Hybrisa

    @realforest2001
    realforest2001 authored Sep 5, 2024
    Configuration menu
    Copy the full SHA
    506bcdb View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge branch 'cmss13-devs:master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    afa8679 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Merge branch 'cmss13-devs:master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    3a40467 View commit details
    Browse the repository at this point in the history

  2. Massive PR - Adds the NPSA as a faction, major map changes, sprite ch… 

    …anges ect.
    @Zenith00000
    Zenith00000 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    aaf628b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    e3de499 View commit details
    Browse the repository at this point in the history

  4. minor fix

    @Zenith00000
    Zenith00000 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    1970771 View commit details
    Browse the repository at this point in the history

  5. minor fixes

    @Zenith00000
    Zenith00000 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    3852343 View commit details
    Browse the repository at this point in the history

  6. very minor tile fix

    @Zenith00000
    Zenith00000 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    34598c8 View commit details
    Browse the repository at this point in the history

  7. indestructible to explo_proof

    @Zenith00000
    Zenith00000 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    2b870f1 View commit details
    Browse the repository at this point in the history

  8. minor map fixes

    @Zenith00000
    Zenith00000 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    bfa9a17 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. minor conflict fix

    @Zenith00000
    Zenith00000 committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    7100179 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. minor map/sprite changes

    @Zenith00000
    Zenith00000 committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    ef07fbb View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. minor map changes

    @Zenith00000
    Zenith00000 committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    718217f View commit details
    Browse the repository at this point in the history

  2. fixes + meridian office changes

    @Zenith00000
    Zenith00000 committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    f6edd4c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Oct 11, 2024
    Configuration menu
    Copy the full SHA
    4fd4466 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. paygrade fix?

    @Zenith00000
    Zenith00000 committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    ed516d2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    90c7fca View commit details
    Browse the repository at this point in the history

  3. minor faction fix

    @Zenith00000
    Zenith00000 committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    10ce9f4 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. big weymart/dorms changes + new sprites

    @Zenith00000
    Zenith00000 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    84d7682 View commit details
    Browse the repository at this point in the history

  2. minor map fix

    @Zenith00000
    Zenith00000 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    92b5065 View commit details
    Browse the repository at this point in the history

  3. minor map fix

    @Zenith00000
    Zenith00000 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    86b01f8 View commit details
    Browse the repository at this point in the history

  4. paygrade fix

    @uuuuhuuuu
    uuuuhuuuu committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    cc605c4 View commit details
    Browse the repository at this point in the history

  5. adds more still not done

    @uuuuhuuuu
    uuuuhuuuu committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    3b5d30f View commit details
    Browse the repository at this point in the history

  6. Merge pull request cmss13-devs#45 from cuberound/NSPA-fix 

    paygrade fix
    @Zenith00000
    Zenith00000 authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    693aff9 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. needs polishing but works

    @uuuuhuuuu
    uuuuhuuuu committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8078cb7 View commit details
    Browse the repository at this point in the history

  2. works

    @uuuuhuuuu
    uuuuhuuuu committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f9824b7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request cmss13-devs#46 from cuberound/NSPA-fix 

    adds "headset" makes it "work"
    @Zenith00000
    Zenith00000 authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    cb8cae5 View commit details
    Browse the repository at this point in the history

  4. small map fix

    @Zenith00000
    Zenith00000 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    d2376be View commit details
    Browse the repository at this point in the history

  5. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    841eea4 View commit details
    Browse the repository at this point in the history

  6. Merge pull request cmss13-devs#47 from cuberound/NSPA-fix 

    works
    @Zenith00000
    Zenith00000 authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ed836ac View commit details
    Browse the repository at this point in the history

  7. iff changes, phone names

    @Zenith00000
    Zenith00000 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    3930c2d View commit details
    Browse the repository at this point in the history

  8. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8d0f1c6 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'cmss13-devs:master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a69f05d View commit details
    Browse the repository at this point in the history

  10. minor map fixes

    @Zenith00000
    Zenith00000 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    d223535 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    d587ab8 View commit details
    Browse the repository at this point in the history

  12. sign and map fixes

    @Zenith00000
    Zenith00000 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    357b316 View commit details
    Browse the repository at this point in the history

  13. fixes bed body spawners

    @uuuuhuuuu
    uuuuhuuuu committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    7d2bb99 View commit details
    Browse the repository at this point in the history

  14. latespawn of bed sould work

    @uuuuhuuuu
    uuuuhuuuu committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8ce86c6 View commit details
    Browse the repository at this point in the history

  15. Merge pull request cmss13-devs#48 from cuberound/NSPA-fix 

    fixes bed body spawners
    @Zenith00000
    Zenith00000 authored Oct 16, 2024
    Configuration menu
    Copy the full SHA
    4e6039d View commit details
    Browse the repository at this point in the history

  16. minor map fixes

    @Zenith00000
    Zenith00000 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    4817bcc View commit details
    Browse the repository at this point in the history

  17. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    807764c View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. minor map fix

    @Zenith00000
    Zenith00000 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    d698a95 View commit details
    Browse the repository at this point in the history

  2. icon merge

    @Zenith00000
    Zenith00000 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    6d28b5d View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into Hybrisa

    @Zenith00000
    Zenith00000 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    74c43ca View commit details
    Browse the repository at this point in the history

  4. minor map fix

    @Zenith00000
    Zenith00000 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    5fc3b9d View commit details
    Browse the repository at this point in the history

  5. minor map fix

    @Zenith00000
    Zenith00000 committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    4b6fa75 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. various bug fixes, paygrade fixes, map fixes and changes. Small balan… 

    …ce fix to AP on P90's
    @Zenith00000
    Zenith00000 committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    604bd14 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    dada9ad View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. EMP fix for podlocks & light pixel fix

    @Zenith00000
    Zenith00000 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    1792a5f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    6124568 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into Hybrisa

    @Nanu308
    Nanu308 authored Oct 22, 2024
    Configuration menu
    Copy the full SHA
    3e9bc8f View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. Merge remote-tracking branch 'upstream/master' into Hybrisa

    @Zenith00000
    Zenith00000 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    c5e5d64 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    5740c4a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    e1f729d View commit details
    Browse the repository at this point in the history

  4. podlock door fixes and widening of unbreakable podlock doors.

    @Zenith00000
    Zenith00000 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    46617d5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    ede2248 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. sprite changes, colony podlocks fixed + new sprites, small map changes.

    @Zenith00000
    Zenith00000 committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    4f6e2bb View commit details
    Browse the repository at this point in the history

  2. indentation fix

    @Zenith00000
    Zenith00000 committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    c54adf9 View commit details
    Browse the repository at this point in the history

  3. fix

    @Zenith00000
    Zenith00000 committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    d1ee783 View commit details
    Browse the repository at this point in the history

  4. fix?

    @Zenith00000
    Zenith00000 committed Oct 24, 2024
    Configuration menu
    Copy the full SHA
    dcd9805 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    c510191 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Merge remote-tracking branch 'upstream/master' into Hybrisa

    @Zenith00000
    Zenith00000 committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    b0b4a2a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'cmss13-devs:master' into Hybrisa

    @Zenith00000
    Zenith00000 authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    8281f29 View commit details
    Browse the repository at this point in the history

  3. Map changes: adds 'scrapeaway' collapsible tunnels, which disappear a… 

    …fter 40 minutes.
    @Zenith00000
    Zenith00000 committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    553890d View commit details
    Browse the repository at this point in the history

  4. moves around some civ skill roles to avoid conflicts.

    @Zenith00000
    Zenith00000 committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    2c9cd55 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2024

  1. area fixes and weedkiller implementation + minor map fixes.

    @Zenith00000
    Zenith00000 committed Nov 2, 2024
    Configuration menu
    Copy the full SHA
    b978509 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2024

  1. map fixes, area fixes small icon fix.

    @Zenith00000
    Zenith00000 committed Nov 3, 2024
    Configuration menu
    Copy the full SHA
    fbfd818 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2024

  1. COFFEE

    @uuuuhuuuu
    uuuuhuuuu committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    e755b1b View commit details
    Browse the repository at this point in the history

  2. maped in

    @uuuuhuuuu
    uuuuhuuuu committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    7d4ae78 View commit details
    Browse the repository at this point in the history

  3. Merge pull request cmss13-devs#49 from cuberound/coffe-makers 

    Coffee makers
    @Zenith00000
    Zenith00000 authored Nov 4, 2024
    Configuration menu
    Copy the full SHA
    89b2e0f View commit details
    Browse the repository at this point in the history

  4. minor map changes - more xeno structures in caves, balance loot

    @Zenith00000
    Zenith00000 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    92bd7d6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'Hybrisa' of https://github.com/Zenith00000/cmss13 into … 

    …Hybrisa
    @Zenith00000
    Zenith00000 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    cefe548 View commit details
    Browse the repository at this point in the history

  6. minor code fix

    @Zenith00000
    Zenith00000 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    5b5f09f View commit details
    Browse the repository at this point in the history

  7. new coffee sprites, eastern caves blockage changed.

    @Zenith00000
    Zenith00000 committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    e821c08 View commit details
    Browse the repository at this point in the history

  8. COFEEEEE

    @uuuuhuuuu
    uuuuhuuuu committed Nov 4, 2024
    Configuration menu
    Copy the full SHA
    92d79f7 View commit details
    Browse the repository at this point in the history