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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

2 New Clown ERTs #8907

Merged
merged 7 commits into from Jun 17, 2020
Merged

2 New Clown ERTs #8907

merged 7 commits into from Jun 17, 2020

Conversation

swissloaf
Copy link
Contributor

@swissloaf swissloaf commented Jun 14, 2020

Intent of your Pull Request

BeeStation/BeeStation-Hornet#1890

Replaces our old boring clown ERT (leader/troopers) with 2 new ones:

Adds two new ERTs: the Code Banana ERT and the HONK Squad.

Code Banana ERTs are just clowns with centcomm access, megaphones and lube flowers, making them even weaker than interns.

The HONK Squad is much stronger. They get a special clown version of the death commando hardsuit, a new clown BoH, golden bikehorn, bananium eshield, combat clown shoes, a pie cannon and a self refilling lube sprayer.

Code Banana ERTs are much weaker and a way for some minor fun.

The actual HONK squad is slightly buffed, with new items (BOH version of the giggles von honkerton) as well as a HONK squad chempsrayer. It's much more powerful, and consequently intended for a funnier alternative to more tense situations.

Changelog

馃啈
rscadd: Adds Code Banana ERT and new HONK squad
rscdel: Old HONK Squad replaced
/:cl:

@yogstation13-bot yogstation13-bot added Feature This adds new content to the game Revert / Deletion Altoids is probably mad about this labels Jun 14, 2020
@ynot01
Copy link
Contributor

ynot01 commented Jun 15, 2020

taeclowndo shoes

what

@Marmio64
Copy link
Contributor

yeah what the hell are taeclowndo shoes? I find no reference of it outside of the outfits file so i don't understand.

@swissloaf
Copy link
Contributor Author

yeah what the hell are taeclowndo shoes? I find no reference of it outside of the outfits file so i don't understand.

its combat shoes

code/modules/antagonists/ert/ert.dm Show resolved Hide resolved
code/modules/reagents/reagent_containers/spray.dm Outdated Show resolved Hide resolved
code/modules/clothing/spacesuits/hardsuit.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/backpack.dm Outdated Show resolved Hide resolved
code/game/objects/items/pneumaticCannon.dm Outdated Show resolved Hide resolved
code/datums/ert.dm Outdated Show resolved Hide resolved
swissloaf and others added 5 commits June 15, 2020 20:04
Co-authored-by: Hopekz <hopekxx@gmail.com>
Co-authored-by: Hopekz <hopekxx@gmail.com>
Co-authored-by: Hopekz <hopekxx@gmail.com>
Co-authored-by: Hopekz <hopekxx@gmail.com>
Co-authored-by: Hopekz <hopekxx@gmail.com>
@JamieD1 JamieD1 merged commit 8edafa3 into yogstation13:master Jun 17, 2020
MrHorizons pushed a commit to MrHorizons/Yogstation that referenced this pull request Jun 21, 2020
* Swissloaf

* Turdis Run

* Update code/modules/reagents/reagent_containers/spray.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/modules/clothing/spacesuits/hardsuit.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/game/objects/items/storage/backpack.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/game/objects/items/pneumaticCannon.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* Update code/datums/ert.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

Co-authored-by: Hopekz <hopekxx@gmail.com>
MrHorizons pushed a commit to MrHorizons/Yogstation that referenced this pull request Jun 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This adds new content to the game Revert / Deletion Altoids is probably mad about this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants