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.

Sign up for GitHub

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

Jump to bottom

Prop gun fix #4601

Merged
merged 2 commits into from
Oct 9, 2023
Merged

Prop gun fix #4601

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc08ba7
initial
BeagleGaming1 Oct 8, 2023
f5dee70
Update prop_gun_spawner.dm
BeagleGaming1 Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/game/objects/effects/spawners/prop_gun_spawner.dm
View file
Open in desktop
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