Skip to content

Adds Telekinetic Punt to Powers & makes vending-machine-fu less opressive. #1140

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

Open
TheOneAndOnlyCreeperJoe wants to merge 8 commits into
base: master
Choose a base branch
from
+651 −1
Open

Adds Telekinetic Punt to Powers & makes vending-machine-fu less opressive. #1140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2ff30f2
experimental tk throws
anon1efergwerfwer Jul 11, 2026
5c61a0e
Lots of optimizations surrounding telekinetic punt
anon1efergwerfwer Jul 11, 2026
a2f0cc6
Final touches on punt. Vending machines only have a 5% chance to flip…
anon1efergwerfwer Jul 14, 2026
f736dfa
undoes an erronous commit
anon1efergwerfwer Jul 14, 2026
c2c44f6
Apply suggestions from code review
TheOneAndOnlyCreeperJoe Aug 1, 2026
6b92207
Merge branch 'master' into tk_offensive_power
TheOneAndOnlyCreeperJoe Aug 2, 2026
8f4e2ce
fixes a few merge conflict errors that got skipped. Makes punt object…
anon1efergwerfwer Aug 2, 2026
f77f10a
loud = not funny
anon1efergwerfwer Aug 4, 2026
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
2 changes: 1 addition & 1 deletion code/modules/vending/vendor/throwing.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

///Crush the mob that the vending machine got thrown at
/obj/machinery/vending/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(isliving(hit_atom))
if(isliving(hit_atom) && prob(5)) // DOPPLER EDIT CHANGE - Makes vending machines toppling chance-based, because several powers can now throw vending machines at roundstart which is just too strong. Original: if(isliving(hit_atom))
tilt(fatty=hit_atom)
return ..()

Expand Down
Loading
Loading