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

Adds Rouny Doll #6938

Merged
merged 11 commits into from
May 25, 2021
Merged

Adds Rouny Doll #6938

merged 11 commits into from
May 25, 2021

Conversation

Alterist
Copy link
Contributor

@Alterist Alterist commented May 23, 2021

About The Pull Request

Refactors doll code very slightly
Adds more dolls
Adds dolls to arcade rewards
Adds doll squeaks
changes moth scream with optimized tg version

Ported from Eris and tg:
discordia-space/CEV-Eris#6115
tgstation/tgstation#58221
https://discord.com/channels/255035529085583360/501814371081650176/836498628276650054

Why It's Good For The Game

the server with rounys not having a rouny doll is a crime to humanity

Changelog

🆑
add: To celebrate the 10th anniversary of the Battle of LV-426, TerraGov have teamed up with everyone's favourite toy manufacturer, Cuddles Corporation, to produce a limited edition (not really) Runner plushie. Get yours today!
add: also adds Fumos, sprited by Infared on the CEV Eris Discord
/:cl:

@tgstation-server tgstation-server added Feature New interesting mechanics with new interesting bugs Map Edit One or more changes to .dmm files. Sound Sound change. Sprites Changes to .dmi file. labels May 23, 2021
@jroinc
Copy link
Contributor

jroinc commented May 23, 2021

Farie plushie is named "witch plushie"

@AnCopper
Copy link
Contributor

image
image

@David-Stormwell
Copy link
Contributor

Tad more then just the rouny doll don'tca think?

@Alterist
Copy link
Contributor Author

Tad more then just the rouny doll don'tca think?

Adds more dolls

@Pariah919
Copy link
Contributor

DELETE TOUHOU

@optimumtact
Copy link
Member

who bundles changes like this atomise your PR's smh no wonder it's not merged

Comment on lines 413 to 415
var/squeak_sound = list('sound/items/dollsqueak.ogg' = 1)
var/last_hug_time
var/list/squeak_override
Copy link
Member

Choose a reason for hiding this comment

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

New variables must be autodocced see pins in dev general

@Alterist
Copy link
Contributor Author

so i don't know what i'm doing with the vars and code, so it's as simple as it gets now. Anyone who cares can feel free to implement different sounds for each doll.

@github-actions github-actions bot added the Merge Conflict Pull request is in a conflicted state with base branch. label May 25, 2021
Copy link
Member

@TiviPlus TiviPlus left a comment

Choose a reason for hiding this comment

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

ok

@tgstation-server tgstation-server removed the Merge Conflict Pull request is in a conflicted state with base branch. label May 25, 2021
@TiviPlus
Copy link
Member

rounymybeloved

@TiviPlus TiviPlus merged commit a2911d9 into tgstation:master May 25, 2021
@Alterist Alterist deleted the toy branch May 25, 2021 20:07
Surrealaser pushed a commit to Surrealaser/TerraGov-Marine-Corps that referenced this pull request May 26, 2021
* Rouny doll

* i have no idea

* map

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

Co-authored-by: XSlayer300 <[email protected]>

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

sure why noy

Co-authored-by: XSlayer300 <[email protected]>

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

Co-authored-by: XSlayer300 <[email protected]>

* fairy

* credits and shiz

Co-authored-by: XSlayer300 <[email protected]>
Surrealaser pushed a commit to Surrealaser/TerraGov-Marine-Corps that referenced this pull request May 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature New interesting mechanics with new interesting bugs Map Edit One or more changes to .dmm files. Sound Sound change. Sprites Changes to .dmi file.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants