Skip to content

Commit

Permalink
Minor Gun and Moth Fixes (#2167)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Brings the Toy C-20r smg in line with all of the foam weapons by giving
it the same firing sound as the rest. Removes the ability for it to be
suppressed for consistency as well. Changes "colorfull" in the rainbow
moth's description to the proper spelling of colorful.

## Why It's Good For The Game

Load up the Halftrack. Test out my foam guns and not have my eardrums
hurt from an overly loud "Toy" C-20r. Hug my favorite moth plushie buddy
and not cry at the extra l in their description. Life's good.

## Changelog

:cl:
tweak: Removed the ability for the Toy C-20r to accept a suppressor.
fix: Gave the Toy C-20r the proper firing sound.
spellcheck: Fixed the description of the rainbow moth.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Geoengi <139566513+Geoengi@users.noreply.github.com>
  • Loading branch information
Geoengi authored Jul 30, 2023
1 parent fed294d commit 5661625
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/items/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@

/obj/item/toy/plush/moth/rainbow
name = "rainbow moth plushie"
desc = "An adorable mothperson plushy. It's a colorfull bug!"
desc = "An adorable mothperson plushy. It's a colorful bug!"
icon_state = "moffplush_rainbow"

/obj/item/toy/plush/moth/suicide_act(mob/living/user)
Expand Down
3 changes: 2 additions & 1 deletion code/modules/projectiles/guns/ballistic/toy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,10 @@
/obj/item/gun/ballistic/automatic/smg/c20r/toy //This is the syndicate variant with syndicate firing pin and riot darts.
name = "donksoft SMG"
desc = "A bullpup two-round burst toy SMG, designated 'C-20r'. Ages 8 and up."
can_suppress = TRUE
can_suppress = FALSE
item_flags = NONE
mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
fire_sound = 'sound/items/syringeproj.ogg'
casing_ejector = FALSE
clumsy_check = FALSE

Expand Down

0 comments on commit 5661625

Please sign in to comment.