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

MP resprite and overhaul redux [IDB IGNORE] #5646

Closed
wants to merge 41 commits into from
Closed

MP resprite and overhaul redux [IDB IGNORE] #5646

wants to merge 41 commits into from

Commits on Aug 13, 2022

  1. init sprites

    @stanalbatross
    stanalbatross committed Aug 13, 2022
    Configuration menu
    Copy the full SHA
    3fd6d40 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2022

  1. WIP Rework Stuff

    @Geevies
    Geevies committed Aug 28, 2022
    Configuration menu
    Copy the full SHA
    8277bce View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'ColonialMarines/master' into !MPS_REWORK 

    # Conflicts:
#	icons/mob/humans/onmob/uniform_0.dmi
    @Geevies
    Geevies committed Aug 28, 2022
    Configuration menu
    Copy the full SHA
    9258a10 View commit details
    Browse the repository at this point in the history

  3. more stuff

    @Geevies
    Geevies committed Aug 28, 2022
    Configuration menu
    Copy the full SHA
    1ecf955 View commit details
    Browse the repository at this point in the history

  4. even more stuff

    @Geevies
    Geevies committed Aug 28, 2022
    Configuration menu
    Copy the full SHA
    62dd783 View commit details
    Browse the repository at this point in the history

  5. remove SM time requirement for command roles

    @Geevies
    Geevies committed Aug 28, 2022
    Configuration menu
    Copy the full SHA
    91aed84 View commit details
    Browse the repository at this point in the history

  6. a lot more stuff

    @Geevies
    Geevies committed Aug 28, 2022
    Configuration menu
    Copy the full SHA
    ceec82c View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2022

  1. finishing touches

    @Geevies
    Geevies committed Oct 20, 2022
    Configuration menu
    Copy the full SHA
    9d97f63 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2022

  1. make sm sgts again

    @Geevies
    Geevies committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    95f86ca View commit details
    Browse the repository at this point in the history

  2. make them PFCs again, pending discussion

    @Geevies
    Geevies committed Oct 21, 2022
    Configuration menu
    Copy the full SHA
    a0593b4 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2022

  1. pfc under 10 hours, cpl over

    @Geevies
    Geevies committed Oct 23, 2022
    Configuration menu
    Copy the full SHA
    087daed View commit details
    Browse the repository at this point in the history

  2. show MAT before SM in preferences

    @Geevies
    Geevies committed Oct 23, 2022
    Configuration menu
    Copy the full SHA
    ef0c9ca View commit details
    Browse the repository at this point in the history

  3. update spawn messages

    @Geevies
    Geevies committed Oct 23, 2022
    Configuration menu
    Copy the full SHA
    c300734 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2022

  1. Merge remote-tracking branch 'ColonialMarines/master' into !MPS_REWORK 

    # Conflicts:
#	code/__DEFINES/radio.dm
#	code/datums/emergency_calls/provost.dm
#	code/datums/factions/uscm.dm
#	code/game/machinery/vending/vendor_types/crew/senior_officers.dm
#	code/modules/clothing/head/helmet.dm
#	code/modules/clothing/suits/armor.dm
#	code/modules/clothing/suits/marine_armor.dm
#	code/modules/clothing/suits/marine_coat.dm
#	code/modules/gear_presets/uscm_event.dm
#	code/modules/projectiles/guns/specialist.dm
#	icons/mob/hud/hud.dmi
#	icons/mob/hud/marine_hud.dmi
#	icons/mob/humans/onmob/eyes.dmi
#	icons/mob/humans/onmob/head_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
#	maps/map_files/USS_Almayer/USS_Almayer.dmm
#	tgui/packages/tgui-panel/styles/goon/chat-light.scss
#	tgui/public/tgui-panel.bundle.css
    @Geevies
    Geevies committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    cd08fb2 View commit details
    Browse the repository at this point in the history

  2. shift back to MPs

    @Geevies
    Geevies committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    eb5c046 View commit details
    Browse the repository at this point in the history

  3. more stuff

    @Geevies
    Geevies committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    a7bebb3 View commit details
    Browse the repository at this point in the history

  4. even more stuff i love conflicts

    @Geevies
    Geevies committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    f0658a4 View commit details
    Browse the repository at this point in the history

  5. wahoo

    @Geevies
    Geevies committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    9b81f53 View commit details
    Browse the repository at this point in the history

  6. woop woop

    @Geevies
    Geevies committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    fc48ea1 View commit details
    Browse the repository at this point in the history

  7. standard-issue rifles

    @Geevies
    Geevies committed Oct 25, 2022
    Configuration menu
    Copy the full SHA
    be420d8 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2022

  1. sad

    @Geevies
    Geevies committed Oct 26, 2022
    Configuration menu
    Copy the full SHA
    ab35d69 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2022

  1. i'll show you where you can put your detailed vari

    @Geevies
    Geevies committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    34269ba View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2022

  1. more sprite stuff

    @Geevies
    Geevies committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    034faf1 View commit details
    Browse the repository at this point in the history

  2. change to DC

    @Geevies
    Geevies committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    27d3177 View commit details
    Browse the repository at this point in the history

  3. gun safety examine

    @Geevies
    Geevies committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    37811ee View commit details
    Browse the repository at this point in the history

  4. resolve merge error

    @Geevies
    Geevies committed Oct 30, 2022
    Configuration menu
    Copy the full SHA
    87ffb88 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2022

  1. orange border

    @Geevies
    Geevies committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    e1045b1 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2022

  1. Merge remote-tracking branch 'ColonialMarines/master' into !MPS_REWORK 

    # Conflicts:
#	code/game/machinery/vending/vendor_types/crew/mp.dm
#	code/game/machinery/vending/vendor_types/crew/senior_officers.dm
#	code/game/machinery/vending/vendor_types/crew/synthetic.dm
    @Geevies
    Geevies committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    a11e525 View commit details
    Browse the repository at this point in the history

  2. red again

    @Geevies
    Geevies committed Nov 2, 2022
    Configuration menu
    Copy the full SHA
    a4493e5 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2022

  1. Merge remote-tracking branch 'ColonialMarines/master' into !MPS_REWORK 

    # Conflicts:
#	code/game/jobs/job/command/police/cadet_police.dm
#	code/game/jobs/job/command/police/chief_police.dm
#	code/game/jobs/job/command/police/police.dm
#	code/game/jobs/job/command/police/warden.dm
    @Geevies
    Geevies committed Nov 3, 2022
    Configuration menu
    Copy the full SHA
    3fb7b9d View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2022

  1. the REAL red

    @Geevies
    Geevies committed Nov 4, 2022
    Configuration menu
    Copy the full SHA
    0cd2cb0 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2022

  1. Merge remote-tracking branch 'ColonialMarines/master' into !MPS_REWORK 

    # Conflicts:
#	code/datums/factions/uscm.dm
#	icons/mob/hud/hud.dmi
#	icons/mob/hud/marine_hud.dmi
#	maps/map_files/USS_Almayer/USS_Almayer.dmm
    @Geevies
    Geevies committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    c332991 View commit details
    Browse the repository at this point in the history

  2. stuff

    @Geevies
    Geevies committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    d252a7b View commit details
    Browse the repository at this point in the history

  3. awesome frans helmets

    @Geevies
    Geevies committed Nov 6, 2022
    Configuration menu
    Copy the full SHA
    9b59310 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2022

  1. re-add timelock

    @Geevies
    Geevies committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    8acce17 View commit details
    Browse the repository at this point in the history

  2. fix shiva helmet

    @Geevies
    Geevies committed Nov 7, 2022
    Configuration menu
    Copy the full SHA
    95e0b40 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2022

  1. Merge remote-tracking branch 'ColonialMarines/master' into !MPS_REWORK 

    # Conflicts:
#	code/__HELPERS/job.dm
    @Geevies
    Geevies committed Nov 13, 2022
    Configuration menu
    Copy the full SHA
    68d82f8 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2022

  1. Merge remote-tracking branch 'ColonialMarines/master' into !MPS_REWORK 

    # Conflicts:
#	tgui/public/tgui-panel.bundle.css
    @Geevies
    Geevies committed Nov 14, 2022
    Configuration menu
    Copy the full SHA
    be15bcf View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2022

  1. geeves forces me to rebase his pr

    Stan_Albatross committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    54e3ec0 View commit details
    Browse the repository at this point in the history

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

    Stan_Albatross committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    9a6b8c7 View commit details
    Browse the repository at this point in the history

  3. conflict fixing, geeves please use my rebase method

    Stan_Albatross committed Nov 29, 2022
    Configuration menu
    Copy the full SHA
    362295a View commit details
    Browse the repository at this point in the history