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

Players can no longer exploit Meteorshot to throw anything that's not a turf #17465

Merged
merged 3 commits into from
Mar 8, 2022
Merged

Players can no longer exploit Meteorshot to throw anything that's not a turf #17465

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c85c866
glorious fix
Sirryan2002 Mar 5, 2022
90288a8
moves check over to move_resist
Sirryan2002 Mar 6, 2022
f67cb7b
Update code/modules/projectiles/projectile/bullets.dm
Sirryan2002 Mar 7, 2022
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: 2 additions & 0 deletions code/game/machinery/shieldgen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
density = 1
opacity = FALSE
anchored = 1
move_resist = INFINITY
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags_2 = RAD_NO_CONTAMINATE_2
max_integrity = 200
Expand Down Expand Up @@ -532,6 +533,7 @@
icon_state = "shieldwall"
anchored = 1
density = 1
move_resist = INFINITY
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
light_range = 3
var/needs_power = 0
Expand Down
1 change: 1 addition & 0 deletions code/modules/power/apc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
req_access = list(ACCESS_ENGINE_EQUIP)
siemens_strength = 1
damage_deflection = 10
move_resist = INFINITY
var/area/area
var/areastring = null
var/obj/item/stock_parts/cell/cell
Expand Down
5 changes: 3 additions & 2 deletions code/modules/projectiles/projectile/bullets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,9 @@
..()
if(ismovable(target))
var/atom/movable/M = target
var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src)))
M.throw_at(throw_target, 3, 2)
if(!M.move_resist != INFINITY)
var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src)))
M.throw_at(throw_target, 3, 2)

/obj/item/projectile/bullet/meteorshot/New()
..()
Expand Down