MP resprite and overhaul redux [IDB IGNORE] #5646
Conversation
# Conflicts: # icons/mob/humans/onmob/uniform_0.dmi
# 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
# 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
# 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
# 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
# Conflicts: # code/__HELPERS/job.dm
# Conflicts: # tgui/public/tgui-panel.bundle.css
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
added
the
Merge Conflict
github-actions
bot
added
Sprites
|
Need to find conflicts, so had checks run q-q |
Drulikar
changed the title
|
This needs to not overwhelm icon diff bot. Remove the [IDB IGNORE] tag when the DMIs aren't just removing basically all sprite changes from then to now. |
There was a problem hiding this comment.
There are many undocumented changes in this PR, and it's based on an outdated version of the repo, removing things that already don't exist, such as the MP cadet.
Removing the warden is also unnecessary, amongst the changes made.
DNM pending discussions with Maintainer team.
| @@ -59,7 +59,6 @@ | |||
| holder.overlays += IMG3 | |||
| else | |||
| var/marine_rk | |||
| var/border_rk | |||
| @@ -404,7 +404,7 @@ var/global/datum/authority/branch/evacuation/EvacuationAuthority //This is initi | |||
| if("dest_trigger") | |||
| if(EvacuationAuthority.initiate_self_destruct()) nanomanager.close_user_uis(usr, src, "main") | |||
| if("dest_cancel") | |||
| var/list/allowed_officers = list("Commanding Officer", "Executive Officer", "Staff Officer", "Chief MP","Chief Medical Officer","Chief Engineer") | |||
Not part of my plan to remove warden, drafted as I need to rework a whole buncha things and resolve conflicts and add warden sprites |
My suggestion is to close it entirely, and start over with the sprite changes rather than basing on a PR from more than a year ago. |
Will work with that, seems like there is a lot of changes that would need adjusting otherwise |
About the pull request
Changes up the MP aesthetic to be more akin to Vietnam era MPs, via sprite changes.
Command roles no longer require Security hours (up for discussion). SMs are PFCs when they have less than 10 hours in the role, but become Cpls afterwards.MP Cadets were removed in favour of folding them into MPs having ranks based on playtime, giving MP mains a way to see if a new MP is playing and show them the ropes.The Warden has been removed as individual MPs can handle these duties on a case-by-case basis, or the CMP can assist.Lastly, MPs are now provided either a M41A Pulse Rifle MK2 or a L42A Battle Rifle as their standard-issue rifle, as well as the choice of taking a magazine pouch. This will aid in ship and FOB defense.
An MP is just another boot, not a robot, a fellow marine making sure pandemonium doesn't break out on the ship via enforcing marine law. Their duty is to defend and keep order on the ship and the landing zones.
Reviving the great #1319
Explain why it's good for the game
There are various things we'd like to change about MPs to strengthen the bond between them and normal marines. Changing up the aesthetics is a good first step, with effective ML changes to follow, we can make the department a great part of the corps, which contributes both to keeping chaos on the ship to a minimum, and the security of the operation.
Testing Photographs and Procedure
Screenshots & Videos
MP:
Chief MP:
Changelog
🆑 Geeves, Frans_Feiffer, Triiodine, LTNTS
add: Overhauled MP aesthetics. MPs now have standard-issue rifles for ship and FOB defense.
del: Command roles no longer need security/MP hours.
/:cl: