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

Event Spawn: Synthetic K9 Rescue Teams #6490

Merged
merged 50 commits into from
Oct 17, 2024
Merged

Event Spawn: Synthetic K9 Rescue Teams #6490

merged 50 commits into from
Oct 17, 2024

Commits on Jun 17, 2024

  1. DOG INCOMING!

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

  2. Add files via upload

    @blackdragonTOW
    blackdragonTOW authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    b9393ef View commit details
    Browse the repository at this point in the history

  3. Update code/game/objects/items/cosmetics.dm 

    Co-authored-by: Zonespace <[email protected]>
    @blackdragonTOW @Zonespace27
    blackdragonTOW and Zonespace27 authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    8299fa0 View commit details
    Browse the repository at this point in the history

  4. Update code/modules/gear_presets/synth_k9.dm 

    Co-authored-by: Zonespace <[email protected]>
    @blackdragonTOW @Zonespace27
    blackdragonTOW and Zonespace27 authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    479467f View commit details
    Browse the repository at this point in the history

  5. Update code/modules/mob/living/carbon/human/powers/human_powers.dm 

    Co-authored-by: Vero <[email protected]>
    @blackdragonTOW @vero5123
    blackdragonTOW and vero5123 authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    4e23d91 View commit details
    Browse the repository at this point in the history

  6. Update code/modules/gear_presets/synth_k9.dm 

    Co-authored-by: Vero <[email protected]>
    @blackdragonTOW @vero5123
    blackdragonTOW and vero5123 authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    a24ad61 View commit details
    Browse the repository at this point in the history

  7. Update code/game/objects/items/devices/scanners.dm 

    Co-authored-by: Vero <[email protected]>
    @blackdragonTOW @vero5123
    blackdragonTOW and vero5123 authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    11ca5ee View commit details
    Browse the repository at this point in the history

  8. Update code/game/objects/items/devices/scanners.dm 

    Co-authored-by: Vero <[email protected]>
    @blackdragonTOW @vero5123
    blackdragonTOW and vero5123 authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    06a41c5 View commit details
    Browse the repository at this point in the history

  9. Update marine.dm

    @blackdragonTOW
    blackdragonTOW authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    9baeead View commit details
    Browse the repository at this point in the history

  10. Update cosmetics.dm

    @blackdragonTOW
    blackdragonTOW authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    fb14e70 View commit details
    Browse the repository at this point in the history

  11. Update scanners.dm

    @blackdragonTOW
    blackdragonTOW authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    b7cdb71 View commit details
    Browse the repository at this point in the history

  12. Various fix requests (still WIP)

    @blackdragonTOW
    blackdragonTOW committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    45676ea View commit details
    Browse the repository at this point in the history

  13. Update kit_boxes.dm

    @blackdragonTOW
    blackdragonTOW authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    ad7b521 View commit details
    Browse the repository at this point in the history

  14. Update marine_uniform.dm

    @blackdragonTOW
    blackdragonTOW authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    5b9e3f2 View commit details
    Browse the repository at this point in the history

  15. Update pamphlets.dm

    @blackdragonTOW
    blackdragonTOW authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    6ec0f18 View commit details
    Browse the repository at this point in the history

  16. Update scanners.dm

    @blackdragonTOW
    blackdragonTOW authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    8188a46 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. tgui inputs and more

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

  2. Update k9_synth.dm

    @blackdragonTOW
    blackdragonTOW authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    8db7833 View commit details
    Browse the repository at this point in the history

  3. Update cosmetics.dm

    @blackdragonTOW
    blackdragonTOW authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    944fcbd View commit details
    Browse the repository at this point in the history

  4. Update emote.dm

    @blackdragonTOW
    blackdragonTOW authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    c1ab5b6 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. species vars and prep for resolving merge conflict

    @blackdragonTOW
    blackdragonTOW committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    78282dd View commit details
    Browse the repository at this point in the history

  2. Clearing update_icons conflic

    @blackdragonTOW
    blackdragonTOW committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    d4b6b0e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into K9-Rescue-Unit

    @blackdragonTOW
    blackdragonTOW committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    fb29ffc View commit details
    Browse the repository at this point in the history

  4. Final stretch of the first review!

    @blackdragonTOW
    blackdragonTOW committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    952627c View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. Sprite Change Requests

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

Commits on Jul 1, 2024

  1. TacMap K9 Medic icon to match new K

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

  2. Minor Alignment issue, just a pixel nudge

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

Commits on Jul 4, 2024

  1. Update code/modules/mob/living/carbon/human/powers/human_powers.dm 

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

Commits on Jul 7, 2024

  1. Add files via upload

    @blackdragonTOW
    blackdragonTOW authored Jul 7, 2024
    Configuration menu
    Copy the full SHA
    528346f View commit details
    Browse the repository at this point in the history

  2. Add files via upload

    @blackdragonTOW
    blackdragonTOW authored Jul 7, 2024
    Configuration menu
    Copy the full SHA
    ddd745b View commit details
    Browse the repository at this point in the history

  3. This is so dumb

    @blackdragonTOW
    blackdragonTOW committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    cf54b65 View commit details
    Browse the repository at this point in the history

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

    …9-Rescue-Unit
    @blackdragonTOW
    blackdragonTOW committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    25e5f2c View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2024

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

    …9-Rescue-Unit
    @blackdragonTOW
    blackdragonTOW committed Aug 7, 2024
    Configuration menu
    Copy the full SHA
    b43a4ad View commit details
    Browse the repository at this point in the history

  2. Deconfliction

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

Commits on Aug 18, 2024

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

    …9-Rescue-Unit
    @blackdragonTOW
    blackdragonTOW committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    b40652c 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 K… 

    …9-Rescue-Unit
    @blackdragonTOW
    blackdragonTOW committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    e6e02f8 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

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

    …9-Rescue-Unit
    @blackdragonTOW
    blackdragonTOW committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    c47dc99 View commit details
    Browse the repository at this point in the history

  2. Update code/modules/mob/living/carbon/human/update_icons.dm 

    Co-authored-by: harryob <[email protected]>
    @blackdragonTOW @harryob
    blackdragonTOW and harryob authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    927b121 View commit details
    Browse the repository at this point in the history

  3. Update code/modules/mob/living/carbon/human/update_icons.dm 

    Co-authored-by: harryob <[email protected]>
    @blackdragonTOW @harryob
    blackdragonTOW and harryob authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    897e95c View commit details
    Browse the repository at this point in the history

  4. Update code/game/objects/items/cosmetics.dm 

    Co-authored-by: harryob <[email protected]>
    @blackdragonTOW @harryob
    blackdragonTOW and harryob authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    47807a2 View commit details
    Browse the repository at this point in the history

  5. Update code/game/objects/items/cosmetics.dm 

    Co-authored-by: harryob <[email protected]>
    @blackdragonTOW @harryob
    blackdragonTOW and harryob authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    20712f2 View commit details
    Browse the repository at this point in the history

  6. Update code/game/objects/items/cosmetics.dm 

    Co-authored-by: harryob <[email protected]>
    @blackdragonTOW @harryob
    blackdragonTOW and harryob authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    94f4be2 View commit details
    Browse the repository at this point in the history

  7. Update code/datums/factions/uscm.dm 

    Co-authored-by: harryob <[email protected]>
    @blackdragonTOW @harryob
    blackdragonTOW and harryob authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    93cac24 View commit details
    Browse the repository at this point in the history

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

    …9-Rescue-Unit
    @blackdragonTOW
    blackdragonTOW committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    c6aee0a View commit details
    Browse the repository at this point in the history

  9. Harry's code requests

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

Commits on Aug 24, 2024

  1. Update code/game/objects/items/cosmetics.dm 

    Co-authored-by: harryob <[email protected]>
    @blackdragonTOW @harryob
    blackdragonTOW and harryob authored Aug 24, 2024
    Configuration menu
    Copy the full SHA
    872b7ca View commit details
    Browse the repository at this point in the history

  2. Update code/game/objects/items/cosmetics.dm 

    Co-authored-by: harryob <[email protected]>
    @blackdragonTOW @harryob
    blackdragonTOW and harryob authored Aug 24, 2024
    Configuration menu
    Copy the full SHA
    f0d4448 View commit details
    Browse the repository at this point in the history

  3. Update code/modules/mob/living/carbon/human/species/emote-synth_k9.dm 

    Co-authored-by: harryob <[email protected]>
    @blackdragonTOW @harryob
    blackdragonTOW and harryob authored Aug 24, 2024
    Configuration menu
    Copy the full SHA
    71ce016 View commit details
    Browse the repository at this point in the history

  4. Harry code requests pt 2, and emote fix

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

Commits on Oct 17, 2024

  1. Update code/game/objects/items/cosmetics.dm 

    Co-authored-by: harryob <[email protected]>
    @blackdragonTOW @harryob
    blackdragonTOW and harryob authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    5e44dc2 View commit details
    Browse the repository at this point in the history