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

Combat Correspondent Expansion Pt. 1 #5784

Merged
merged 46 commits into from
Mar 1, 2024
Merged

Combat Correspondent Expansion Pt. 1 #5784

merged 46 commits into from
Mar 1, 2024

Commits on Feb 21, 2024

  1. sets default camera size to 7

    @GrrrKitten
    GrrrKitten committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    0dfd0fd View commit details
    Browse the repository at this point in the history

  2. opens up photo album from 2.8 rows to 4 full tows

    @GrrrKitten
    GrrrKitten committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    d39b309 View commit details
    Browse the repository at this point in the history

  3. why did that commit as 30

    @GrrrKitten
    GrrrKitten committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    a96c403 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. adds new camera, removes turning on/off, speeds up photo taking

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    52690a5 View commit details
    Browse the repository at this point in the history

  2. adds new camera item state

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    20f8f3d View commit details
    Browse the repository at this point in the history

  3. minor sprite fix

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    9a1de6d View commit details
    Browse the repository at this point in the history

  4. adds onmob sprite for belt camera

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    6f87c6f View commit details
    Browse the repository at this point in the history

  5. redoes CC uniforms to split them up

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    2d0bb47 View commit details
    Browse the repository at this point in the history

  6. redoes CC gear loadout per devs wishes

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    e729312 View commit details
    Browse the repository at this point in the history

  7. cleans up bad cam code + expands broadcasting cam storage

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    46cc584 View commit details
    Browse the repository at this point in the history

  8. fixes pic taking bug, readds minor delay

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    0207af0 View commit details
    Browse the repository at this point in the history

  9. adds new portable fax machine

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    06dbec3 View commit details
    Browse the repository at this point in the history

  10. gives new portable fax machine to civ CC

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    77dbef9 View commit details
    Browse the repository at this point in the history

  11. whoopsies typo

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    a782283 View commit details
    Browse the repository at this point in the history

  12. minor sprite visibility improvements

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    f46c4f6 View commit details
    Browse the repository at this point in the history

  13. minor changes to the broadcasting camera

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    5edee8e View commit details
    Browse the repository at this point in the history

  14. fixes thing I broke being dum

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    0caf08d View commit details
    Browse the repository at this point in the history

  15. mirrors the faxpack sprite to look better

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    f9f4855 View commit details
    Browse the repository at this point in the history

  16. removes final bit

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    9e222d2 View commit details
    Browse the repository at this point in the history

  17. how'd this get back in here

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    18ef342 View commit details
    Browse the repository at this point in the history

  18. fixes uniform overflow issue

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    8b9eb49 View commit details
    Browse the repository at this point in the history

  19. final touches (accidentally deleted these)

    @GrrrKitten
    GrrrKitten committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    1037a62 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Merge branch 'master' into CC-expansion

    @Drulikar
    Drulikar committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    7effc13 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2024

  1. Update code/game/machinery/fax_machine.dm 

    Co-authored-by: Drathek <[email protected]>
    @GrrrKitten @Drulikar
    GrrrKitten and Drulikar committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    ef6402a View commit details
    Browse the repository at this point in the history

  2. fixes stuff as per feedback

    @GrrrKitten
    GrrrKitten committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    0faf398 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'CC-expansion' of https://github.com/GrrrKitten/cmss13 i… 

    …nto CC-expansion
    @GrrrKitten
    GrrrKitten committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    6ba5be3 View commit details
    Browse the repository at this point in the history

  4. merge shennanigans

    @GrrrKitten
    GrrrKitten committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    3abb35e View commit details
    Browse the repository at this point in the history

  5. fixes another thing I missed

    @GrrrKitten
    GrrrKitten committed Feb 24, 2024
    Configuration menu
    Copy the full SHA
    0c1d9b0 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. sprite updates

    @GrrrKitten
    GrrrKitten committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    94a0e60 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/GrrrKitten/cmss13 into CC… 

    …-expansion
    @GrrrKitten
    GrrrKitten committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    07b6dd8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into CC-expansion

    @GrrrKitten
    GrrrKitten committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    3c4fc74 View commit details
    Browse the repository at this point in the history

  4. how'd this get removed

    @GrrrKitten
    GrrrKitten committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    e941721 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'CC-expansion' of https://github.com/GrrrKitten/cmss13 i… 

    …nto CC-expansion
    @GrrrKitten
    GrrrKitten committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    875077a View commit details
    Browse the repository at this point in the history

  6. fixes something I neglected in the merge conflict

    @GrrrKitten
    GrrrKitten committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    bbac1d4 View commit details
    Browse the repository at this point in the history

  7. dyslexia be damned

    @GrrrKitten
    GrrrKitten committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    c75cb8a View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

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

    @GrrrKitten
    GrrrKitten committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    c155415 View commit details
    Browse the repository at this point in the history

  2. test fix

    @GrrrKitten
    GrrrKitten committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    666272c View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

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

    …C-expansion
    @GrrrKitten
    GrrrKitten committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    475a170 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. fixes fax_machine per sabreML feedback (tested and functional)

    @GrrrKitten
    GrrrKitten committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    e258d1d View commit details
    Browse the repository at this point in the history

  2. missed one whoops

    @GrrrKitten
    GrrrKitten committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    7ff8b3c View commit details
    Browse the repository at this point in the history

  3. SabreML fix for CC vendor (didnt I just merge this) 

    Co-authored-by: SabreML <[email protected]>
    @GrrrKitten @SabreML
    GrrrKitten and SabreML committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    3ed2fb3 View commit details
    Browse the repository at this point in the history

  4. SabreML fix for uscm_ship.dm 

    Co-authored-by: SabreML <[email protected]>
    @GrrrKitten @SabreML
    GrrrKitten and SabreML committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    0786464 View commit details
    Browse the repository at this point in the history

  5. Fixes Photography per SabreML feedback

    @GrrrKitten
    GrrrKitten committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    8c5999a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'CC-expansion' of https://github.com/GrrrKitten/cmss13 i… 

    …nto CC-expansion
    @GrrrKitten
    GrrrKitten committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    8d234a9 View commit details
    Browse the repository at this point in the history

  7. cameras have to be wielded to take photos + inhand fixs + new inhands

    @GrrrKitten
    GrrrKitten committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    76f1b7a View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. puts civ cc's new gear into vendor, tested and functional

    @GrrrKitten
    GrrrKitten committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    d740277 View commit details
    Browse the repository at this point in the history