Skip to content

Commit

Permalink
TWE Tidy-up (#4367)
Browse files Browse the repository at this point in the history
# About the pull request
Tidies up the TWE RMC Presets as they were a little scattered.

- Moves all the entries in the presets to be grouped properly, no more
WEAR_HEAD appearing at the bottom of the list between the contents of
droppouches.
- Removed surgical line as it was being duplicated from the surgical
kit.
- Added MRE to the MRE carrier as it was otherwise using custom backpack
and identical contents.
- Amends skills so Breacher and Pointman are no longer able to use
smartguns.

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

# Explain why it's good for the game
A little bit more efficient and easier to handle.
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

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

</details>


# Changelog
:cl:
code: Tidied up the TWE presets so they're easier to read.
del: Removed duplicate surgical line from all TWE presets.
add: Added an MRE box to the TWE MRE carrier preset.
spellcheck: Added unique names to the RMC armors.
fix: Fixed iconstate names being backwards for TWE pointman and SG.
code: Removed unnecessary repeated values for TWE armors.
code: Tidied the RMC skillsets to be consistent in ordering of skills.
add: Added an SG specific skillset for RMCs.
fix: Fixed duplicate entry for medical training on RMC TL skillset.
spellcheck: Renamed default RMC skillset to Royal Marines Commando
rather than Royal Marines Commando Rifleman.
/:cl:
  • Loading branch information
realforest2001 committed Sep 11, 2023
1 parent 7580b1a commit 3e0755b
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 147 deletions.
33 changes: 24 additions & 9 deletions code/datums/skills.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2107,8 +2107,8 @@ Royal Marines Commando

//NOTE: Skills take heavy from PMCs

/datum/skills/rmc/rifleman
name = "Royal Marines Commando Rifleman"
/datum/skills/rmc
name = "Royal Marines Commando"
skills = list(
SKILL_CQC = SKILL_CQC_TRAINED,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
Expand All @@ -2130,28 +2130,43 @@ Royal Marines Commando
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_CQC = SKILL_CQC_TRAINED,
SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN,
SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
SKILL_SURGERY = SKILL_SURGERY_NOVICE,
SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
SKILL_JTAC = SKILL_JTAC_BEGINNER,
)

/datum/skills/rmc/smartgun
name = "Royal Marines Commando Smartgunner"
skills = list(
SKILL_CQC = SKILL_CQC_TRAINED,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
SKILL_SURGERY = SKILL_SURGERY_NOVICE,
SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
SKILL_JTAC = SKILL_JTAC_BEGINNER,
SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN,
)

/datum/skills/rmc/leader
name = "Royal Marines Commando Leader"
skills = list(
SKILL_CQC = SKILL_CQC_SKILLED,
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT,
SKILL_POLICE = SKILL_POLICE_SKILLED,
SKILL_FIREMAN = SKILL_FIREMAN_SKILLED,
SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI,
SKILL_ENGINEER = SKILL_ENGINEER_ENGI,
SKILL_CQC = SKILL_CQC_SKILLED,
SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_TRAINED,
SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER,
SKILL_JTAC = SKILL_JTAC_TRAINED,
SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
SKILL_SURGERY = SKILL_SURGERY_NOVICE,
SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED,
SKILL_JTAC = SKILL_JTAC_TRAINED,
SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
)
32 changes: 10 additions & 22 deletions code/modules/clothing/suits/marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1727,7 +1727,6 @@
icon_state = "rmc_light"
item_state = "rmc_light"
flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE
storage_slots = 3
allowed = list(
/obj/item/weapon/gun,
/obj/item/tank/emergency_oxygen,
Expand All @@ -1745,7 +1744,7 @@
/obj/item/device/walkman,
)

/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/ //RMC Rifleman Armor
/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light //RMC Rifleman Armor
icon_state = "rmc_light"
item_state = "rmc_light"
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
Expand All @@ -1755,33 +1754,22 @@
slowdown = SLOWDOWN_ARMOR_LIGHT

/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/team_leader //RMC TL & LT Armor
name = "kestrel armoured carry vest"
icon_state = "rmc_light_padded"
item_state = "rmc_light_padded"
armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH
armor_energy = CLOTHING_ARMOR_MEDIUMLOW
armor_bomb = CLOTHING_ARMOR_MEDIUM
armor_rad = CLOTHING_ARMOR_MEDIUM
slowdown = SLOWDOWN_ARMOR_LIGHT
storage_slots = 7

/obj/item/clothing/suit/storage/marine/veteran/royal_marine/medium //Smartgun Spec Armor
icon_state = "rmc_pointman"
item_state = "rmc_pointman"
armor_melee = CLOTHING_ARMOR_MEDIUM
armor_bullet = CLOTHING_ARMOR_MEDIUM
armor_laser = CLOTHING_ARMOR_MEDIUMLOW
armor_energy = CLOTHING_ARMOR_NONE
armor_bomb = CLOTHING_ARMOR_MEDIUMLOW
armor_bio = CLOTHING_ARMOR_MEDIUM
armor_rad = CLOTHING_ARMOR_MEDIUMLOW
armor_internaldamage = CLOTHING_ARMOR_MEDIUM
movement_compensation = SLOWDOWN_ARMOR_LIGHT
storage_slots = 3
/obj/item/clothing/suit/storage/marine/veteran/royal_marine/smartgun //Smartgun Spec Armor
name = "kestrel armoured smartgun harness"
icon_state = "rmc_smartgun"
item_state = "rmc_smartgun"
flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS

/obj/item/clothing/suit/storage/marine/veteran/royal_marine/pointman //Pointman Spec Armor
icon_state = "rmc_medium"
item_state = "rmc_medium"
name = "kestrel pointman armour"
desc = "A heavier version of the armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines."
icon_state = "rmc_pointman"
item_state = "rmc_pointman"
armor_melee = CLOTHING_ARMOR_HIGH
armor_bullet = CLOTHING_ARMOR_HIGHPLUS
armor_bomb = CLOTHING_ARMOR_HIGHPLUS
Expand Down
Loading

0 comments on commit 3e0755b

Please sign in to comment.