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

Royal Marines Commando #4098

Merged
merged 97 commits into from
Sep 8, 2023
Merged

Royal Marines Commando #4098

merged 97 commits into from
Sep 8, 2023

Commits on Jun 27, 2023

  1. sss

    @spartanbobby
    spartanbobby committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    8c4a6a7 View commit details
    Browse the repository at this point in the history

  2. gg

    @spartanbobby
    spartanbobby committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    e6e4a41 View commit details
    Browse the repository at this point in the history

  3. xx

    @spartanbobby
    spartanbobby committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    c838ef8 View commit details
    Browse the repository at this point in the history

  4. rrr

    @spartanbobby
    spartanbobby committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    e35c41e View commit details
    Browse the repository at this point in the history

  5. d

    @spartanbobby
    spartanbobby committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    1466c67 View commit details
    Browse the repository at this point in the history

  6. ss

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

  7. dd

    @spartanbobby
    spartanbobby committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    98eb188 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into royalmarines 

    # Conflicts:
#	icons/mob/humans/onmob/items_lefthand_0.dmi
#	icons/mob/humans/onmob/items_lefthand_1.dmi
#	icons/mob/humans/onmob/items_righthand_0.dmi
#	icons/mob/humans/onmob/items_righthand_1.dmi
#	icons/mob/humans/onmob/suit_1.dmi
#	icons/mob/humans/onmob/uniform_0.dmi
#	icons/obj/items/clothing/cm_hats.dmi
#	icons/obj/items/clothing/cm_suits.dmi
#	icons/obj/items/clothing/uniforms.dmi
#	icons/obj/items/weapons/guns/attachments/barrel.dmi
    @spartanbobby
    spartanbobby committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    2032dab View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. checked

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    cac5c32 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'cmss13-devs/master' into royalmarines 

    # Conflicts:
#	icons/mob/humans/onmob/back.dmi
#	icons/mob/humans/onmob/items_lefthand_0.dmi
#	icons/mob/humans/onmob/items_righthand_0.dmi
#	icons/obj/items/clothing/backpacks.dmi
    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    cdccc9b View commit details
    Browse the repository at this point in the history

  3. ddd

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    3dcc93e View commit details
    Browse the repository at this point in the history

  4. fff

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    db1c1d8 View commit details
    Browse the repository at this point in the history

  5. d

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    365c621 View commit details
    Browse the repository at this point in the history

  6. dd

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    9e0b152 View commit details
    Browse the repository at this point in the history

  7. aaa

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    443a61a View commit details
    Browse the repository at this point in the history

  8. s

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    795d0e8 View commit details
    Browse the repository at this point in the history

  9. ff

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    2f5b63b View commit details
    Browse the repository at this point in the history

  10. fix

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    2ea59bb View commit details
    Browse the repository at this point in the history

  11. wors for real omg

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    eacc5e0 View commit details
    Browse the repository at this point in the history

  12. I'M BEGGING YOU

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    5e94c12 View commit details
    Browse the repository at this point in the history

  13. Ammo

    @spartanbobby
    spartanbobby committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    3644a83 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. TWE Station

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

  2. pretty

    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    2ebfa5c View commit details
    Browse the repository at this point in the history

  3. Various fixes

    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    5113efd View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'cmss13-devs/master' into royalmarines 

    # Conflicts:
#	code/modules/clothing/under/ties.dm
#	icons/obj/items/clothing/ties.dmi
#	icons/turf/ert_shuttle.dmi
    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    92768c3 View commit details
    Browse the repository at this point in the history

  5. rf

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

  6. Weapon buffs, breacher buffs

    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    651578e View commit details
    Browse the repository at this point in the history

  7. More of of the same

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

  8. more

    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    15c9482 View commit details
    Browse the repository at this point in the history

  9. Fixes, gives breaches his shield, big breacher buff, gets some more o… 

    …f their kit in, gets gives them grenades, their storge might be a bit much but the backpacks look really big so :\
    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    e89e034 View commit details
    Browse the repository at this point in the history

  10. dd

    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    721bf4e View commit details
    Browse the repository at this point in the history

  11. fff

    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    0760ea6 View commit details
    Browse the repository at this point in the history

  12. gg

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

  13. dd

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

  14. I FUCKING HATE SQUADHUD ICONS WHY DOESN'T IT WORK

    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    8d95434 View commit details
    Browse the repository at this point in the history

  15. FUUUUUUUUUUUUUUUUUUUUUUCK YOU

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

  16. [

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

  17. removes dupe VP78 belt

    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    0d7fdb6 View commit details
    Browse the repository at this point in the history

  18. s

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

  19. v

    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    70b5b7d View commit details
    Browse the repository at this point in the history

  20. actual HUD

    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    24d0396 View commit details
    Browse the repository at this point in the history

  21. updates how the ERT is handled to hopefully be better and not break

    @spartanbobby
    spartanbobby committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    0375fa2 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2023

  1. REMOVES UNUSED ASSETS AND MAP CAMO TO BE READDED AT A LATER DATE WHEN… 

    … THEY ARE MORE COMPLETE
    @spartanbobby
    spartanbobby committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    acfacad View commit details
    Browse the repository at this point in the history

  2. pipeline please

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

  3. Swaps out all backpacks to be light to fit in with the ERTs fast resp… 

    …onse theme, others will remain in code
    @spartanbobby
    spartanbobby committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    601a533 View commit details
    Browse the repository at this point in the history

  4. their gasmasks start in their pouches instead of on their face

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

Commits on Aug 6, 2023

  1. Merge branch 'master' into royalmarines 

    # Conflicts:
#	icons/mob/humans/onmob/ties.dmi
    @spartanbobby
    spartanbobby committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    4c25524 View commit details
    Browse the repository at this point in the history

  2. conf

    @spartanbobby
    spartanbobby committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    40f4b57 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. dd

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

  2. ff 

    #	icons/mob/hud/marine_hud.dmi
#	icons/mob/humans/onmob/suit_1.dmi
#	icons/obj/items/clothing/cm_suits.dmi
    @spartanbobby
    spartanbobby committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    d800df2 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. d

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

Commits on Aug 9, 2023

  1. prob 0

    @spartanbobby
    spartanbobby committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    9f0ef6c View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2023

  1. Merge branch 'master' into royalmarines 

    # Conflicts:
#	icons/mob/humans/onmob/back.dmi
#	icons/obj/items/clothing/belts.dmi
    @spartanbobby
    spartanbobby committed Aug 12, 2023
    Configuration menu
    Copy the full SHA
    7b15ee6 View commit details
    Browse the repository at this point in the history

  2. d

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

Commits on Aug 15, 2023

  1. ddd

    @spartanbobby
    spartanbobby committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    a490ce6 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. all but codedocs

    @spartanbobby
    spartanbobby committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    1f9d6c2 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. f

    @spartanbobby
    spartanbobby committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    6fde5dc View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'cmss13-devs/stable' into royalmarines

    @spartanbobby
    spartanbobby committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    58ad65d View commit details
    Browse the repository at this point in the history

  3. Removes synth stuff since they dont have one adds codedocs I think no… 

    … idea why runtime failing :3
    @spartanbobby
    spartanbobby committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    2734c01 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. eh maybe?

    @morrowwolf
    morrowwolf committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    e2e6d70 View commit details
    Browse the repository at this point in the history

  2. Yuh

    @morrowwolf
    morrowwolf committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    ca1c1e2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into royalmarines

    @spartanbobby
    spartanbobby authored Aug 22, 2023
    Configuration menu
    Copy the full SHA
    e1ad641 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Merge branch 'master' into royalmarines

    @spartanbobby
    spartanbobby authored Aug 24, 2023
    Configuration menu
    Copy the full SHA
    95cd28b View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

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

    @morrowwolf
    morrowwolf committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    9806c26 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into pr/4098

    @morrowwolf
    morrowwolf committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    1e21981 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. a

    @spartanbobby
    spartanbobby committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    88f5799 View commit details
    Browse the repository at this point in the history

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

    @spartanbobby
    spartanbobby committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    4ec3e33 View commit details
    Browse the repository at this point in the history

  3. conflicted like my life

    @spartanbobby
    spartanbobby committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    6bd60d8 View commit details
    Browse the repository at this point in the history

  4. If this doesn't work I'm going back to AC

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

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

    @morrowwolf
    morrowwolf committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    7613d12 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'royalmarines' of https://github.com/spartanbobby/cmss13 … 

    …into pr/4098
    @morrowwolf
    morrowwolf committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    ac70bb7 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'royalmarines' of https://github.com/spartanbobby/cmss13 … 

    …into pr/4098
    @morrowwolf
    morrowwolf committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    aaeb096 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Merge remote-tracking branch 'cmss13-devs/master' into royalmarines 

    # Conflicts:
#	code/modules/clothing/suits/marine_armor.dm
    @spartanbobby
    spartanbobby committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    af7630b View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. I dont think anyone is on :r

    @spartanbobby
    spartanbobby committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    fb64c77 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into royalmarines

    @spartanbobby
    spartanbobby authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    2fa065a View commit details
    Browse the repository at this point in the history

  3. :q

    @spartanbobby
    spartanbobby committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    757768d View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/royalmarines' into royalmarines

    @spartanbobby
    spartanbobby committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    758dc56 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'cmss13-devs/master' into royalmarines 

    # Conflicts:
#	code/modules/mob/living/say.dm
#	tgui/public/tgui-panel.bundle.css
    @spartanbobby
    spartanbobby committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    9bbe6fd View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'cmss13-devs/master' into royalmarines 

    # Conflicts:
#	code/modules/projectiles/gun_attachables.dm
    @spartanbobby
    spartanbobby committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    26b0ea8 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2023

  1. nerfed to 15 (5 more than G8) fixed SG ammo

    @spartanbobby
    spartanbobby committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    83be947 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into royalmarines

    @spartanbobby
    spartanbobby authored Sep 3, 2023
    Configuration menu
    Copy the full SHA
    b8381e0 View commit details
    Browse the repository at this point in the history

  3. puts brig and medical in TWE_Station

    @spartanbobby
    spartanbobby committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    b6e17b6 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/royalmarines' into royalmarines

    @spartanbobby
    spartanbobby committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    888e09a View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'cmss13-devs/master' into royalmarines

    @spartanbobby
    spartanbobby committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    beb9091 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. weee

    @spartanbobby
    spartanbobby committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    a4d18e7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into royalmarines

    @spartanbobby
    spartanbobby authored Sep 4, 2023
    Configuration menu
    Copy the full SHA
    a239806 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. Merge branch 'master' into royalmarines

    @spartanbobby
    spartanbobby authored Sep 5, 2023
    Configuration menu
    Copy the full SHA
    03f5542 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Update code/game/objects/items/storage/backpack.dm 

    Co-authored-by: harryob <[email protected]>
    @spartanbobby @harryob
    spartanbobby and harryob authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    5007c6c View commit details
    Browse the repository at this point in the history

  2. Update code/datums/emergency_calls/royal_marines.dm 

    Co-authored-by: harryob <[email protected]>
    @spartanbobby @harryob
    spartanbobby and harryob authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    83d4c77 View commit details
    Browse the repository at this point in the history

  3. Update code/datums/emergency_calls/royal_marines.dm 

    Co-authored-by: harryob <[email protected]>
    @spartanbobby @harryob
    spartanbobby and harryob authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    dca77f8 View commit details
    Browse the repository at this point in the history

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

    Co-authored-by: harryob <[email protected]>
    @spartanbobby @harryob
    spartanbobby and harryob authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    1c86880 View commit details
    Browse the repository at this point in the history

  5. Update code/modules/clothing/shoes/marine_shoes.dm 

    Co-authored-by: harryob <[email protected]>
    @spartanbobby @harryob
    spartanbobby and harryob authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    d21c009 View commit details
    Browse the repository at this point in the history

  6. It was not actually a placeholder

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

  7. d

    @spartanbobby
    spartanbobby committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    3f1fd1f View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. Merge branch 'master' into royalmarines

    @spartanbobby
    spartanbobby authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    fdd2caf View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

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

    @morrowwolf
    morrowwolf committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    85ba9d0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'royalmarines' of https://github.com/spartanbobby/cmss13 … 

    …into pr/4098
    @morrowwolf
    morrowwolf committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    aa0ea6d View commit details
    Browse the repository at this point in the history