Skip to content

Commit

Permalink
Prop gun fix (#4601)
Browse files Browse the repository at this point in the history
# About the pull request

Fix to #4450
<!-- 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
It should probably have copied the overlay for mags and attachments too

# 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: prop guns will copy attachments
/:cl:
  • Loading branch information
BeagleGaming1 authored Oct 9, 2023
1 parent 9164ef5 commit 4c7fe2d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/game/objects/effects/spawners/prop_gun_spawner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
stack_trace("[src] using incorrect typepath, \"[prop_gun_type]\".") //Can't make a prop gun of something not a gun
qdel(src)
return
if(!spawn_prob)
if(!prob(spawn_prob))
qdel(src)
return
if(!mapload)
Expand Down Expand Up @@ -71,6 +71,7 @@
pixel_x = source_gun.pixel_x
pixel_y = source_gun.pixel_y
layer = source_gun.layer
overlays = source_gun.overlays

/obj/item/prop/prop_gun/attack_self(mob/user) //Mimic wielding of real guns
. = ..()
Expand Down

0 comments on commit 4c7fe2d

Please sign in to comment.