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

UPP MMG #6915

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

UPP MMG #6915

wants to merge 8 commits into from

Conversation

Steelpoint
Copy link
Contributor

@Steelpoint Steelpoint commented Aug 10, 2024

About the pull request

Adds in one feature from this now auto-closed PR: #5945

Adds the T37 MMG for the UPP, their alternative version to the USCM M2C. The T37 is a stationary weapon, meaning it can not be moved, it has a slower rate-of-fire but it can sustain firing for significantly longer before it will overheat.

Explain why it's good for the game

Useful features for mapping and events.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
add: Adds the T37 Medium Machine Gun to the UPP's arsenal. The T37 is an alternative variant of the M2C HMG, it is a stationary emplacement (that can not be redeployed) that has a slower rate of fire compared to the M2C, but it can fire for a far longer period of time before overheating.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Aug 10, 2024
Copy link
Contributor

@Blundir Blundir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The gun and the ammo box is literally slight M2C tweak, find or make an actual sprite for both, we have special sprites for upp ammo boxes and special palette for upp guns.

@Blundir Blundir marked this pull request as draft August 10, 2024 18:07
@Steelpoint Steelpoint changed the title UPP MMG | UPP Flag UPP MMG Aug 11, 2024
@Steelpoint
Copy link
Contributor Author

Moving the UPP Map to a separate PR.

@Waseemq1235
Copy link
Contributor

Just a heads-up: the MMG values I used in PR #5945 were tested but not extensively.

@Steelpoint
Copy link
Contributor Author

Just a heads-up: the MMG values I used in PR #5945 were tested but not extensively.

We'll likely get some chances to see it in action if the PR gets merged so a future balance PR can be done if its excessive.

As it stands, it trades huge burst damage for sustained suppressing fire, plus the lack of being able to move the weapon, and the fact you'll only see these guns being placed by mappers and admins, not players, makes it easier to balance and less oppressive.

@Blundir Blundir marked this pull request as ready for review August 14, 2024 15:55
@Blundir Blundir added the Sprites Approved confirmed no stray pixels label Aug 14, 2024
@Steelpoint
Copy link
Contributor Author

Love it, thank you.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Aug 22, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 26, 2024
Comment on lines +651 to +655
/obj/structure/machinery/m56d_hmg/auto/t37/attackby(obj/item/O as obj, mob/user as mob)
if(!ishuman(user))
return
// RELOADING
if(istype(O, /obj/item/ammo_magazine/m2c/t37))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we overriding this whole proc just to change this line? ideally we would change the parent proc in /obj/structure/machinery/m56d_hmg/auto like:

if(istype(O, /obj/item/ammo_magazine)
	var/obj/item/ammo_magazine/magazine = O
	
	if(magazine.default_ammo != ammo)
		return

code/modules/cm_marines/m2c.dm Outdated Show resolved Hide resolved
code/modules/cm_marines/m2c.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft October 26, 2024 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants