Elite Mercenary Non-Deathsquad Version #6757
Conversation
github-actions
bot
added
Feature
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
| @@ -662,6 +662,36 @@ GLOBAL_LIST_INIT(rebel_rifles, list( | |||
| new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine, WEAR_WAIST) | |||
| spawn_weapon(gunpath, ammopath, M, 0, ammo_amount) | |||
|
|
|||
| /datum/equipment_preset/proc/spawn_merc_elite_weapon_lowthreat(atom/M, ammo_amount = 12, shotgun_chance = 50, spawn_belt = 1) | |||
There was a problem hiding this comment.
why is this defined so high up instead of on /datum/equipment_preset/other/elite_merc
There was a problem hiding this comment.
also given you're only piping humans into this, you can just type it appropriately
| var/gunpath = pick(elite_merc_shotguns) | ||
| var/ammopath = elite_merc_shotguns[gunpath] | ||
| if(spawn_belt) | ||
| if(ishuman(M)) |
| @@ -662,6 +662,36 @@ GLOBAL_LIST_INIT(rebel_rifles, list( | |||
| new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine, WEAR_WAIST) | |||
| spawn_weapon(gunpath, ammopath, M, 0, ammo_amount) | |||
|
|
|||
| /datum/equipment_preset/proc/spawn_merc_elite_weapon_lowthreat(atom/M, ammo_amount = 12, shotgun_chance = 50, spawn_belt = 1) | |||
| if(!M) return | |||
About the pull request
Alt to: #6740
Adds a new non-Deathsquad varient of the Elite Mercenary ERT.
These mercenaries lack Deathsquad tier armour and Whiteout weapons. Their armour is now akin to Medium Marine armour but with Light movement speed, and they use mostly common or UPP style weapons.
Explain why it's good for the game
Opens up the opportunity for these rarely used ERTs to be used more often for admin 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: The Elite Mercenary emergency response team has been split into a Deathsquad and non-Deathsquad version. Previously this ERT only functioned with Deathsquad weapons/armour.
admin: The Elite Mercenary Deathsquad version can be denoted with the title of (!DEATHSQUAD!). The non-Deathsquad version possess weapons and armour similar to a typical Marine, albeit they still possess night vision optics.
/:cl: