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.

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

Adds Type 80 UPP bayonets to CLF who lack knives #6228

Merged
merged 1 commit into from
May 4, 2024

Conversation

BasilHerb
Copy link
Contributor

@BasilHerb BasilHerb commented May 2, 2024

About the pull request

The purpose of this PR is to add knives to the CLF ERTs who currently lack them. I have tested these changes on a private server, spawning each CLF mob and looking at whether they have bayonets or not. To the extent of my knowledge, all CLF should now spawn with bayonets on their mouth, with exception to the CLF Cell Commander (who has UPP boots), and the CLF Survivor (who spawns with an M5 raider knife, which I do not know how to change.)

Explain why it's good for the game

Dying to shrapnel because you got shot once by PVT Stanley or your teammate is extremely sad and depressing, and by adding knives we will finally be free of this oppression. Also, loads of people keep complaining about it.

Testing Photographs and Procedure

Screenshot 2024-05-02 174638

Changelog

🆑
add: Type 80 bayonet to the mouths of the following mobs: CLF Soldier, CLF Specialist, CLF Medic, CLF Engineer, CLF Leader.
/:cl:

@github-actions github-actions bot added Missing Changelog Maintainers always document their changes. Feature Feature coder badge and removed Missing Changelog Maintainers always document their changes. labels May 2, 2024
@Drulikar Drulikar added the Good First PR From small acorns label May 2, 2024
@Drulikar
Copy link
Contributor

Drulikar commented May 3, 2024

For future reference should you want to do it later:

    // Swap out M5 raider with a Type 80
    var/obj/item/storage/pouch = new_human.get_item_by_slot(WEAR_L_STORE)
    var/obj/item/attachable/bayonet/knife = locate() in pouch
    if(!pouch.remove_from_storage(knife))
        return
    qdel(knife)
    pouch.handle_item_insertion(new /obj/item/attachable/bayonet/upp)

added after ..() in /datum/equipment_preset/survivor/clf/load_gear(mob/living/carbon/human/new_human) would swap out the CLF survivor knife.

@Drulikar Drulikar added this pull request to the merge queue May 3, 2024
Merged via the queue into cmss13-devs:master with commit ac173af May 4, 2024
30 of 31 checks passed
cm13-github added a commit that referenced this pull request May 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Good First PR From small acorns
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants