cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* glorious fix

* moves check over to move_resist

* Update code/modules/projectiles/projectile/bullets.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
Sirryan2002
2022-03-08 11:39:17 +00:00
committed by GitHub
co-authored by AffectedArc07
parent 25ebebb8a3
commit 6070a9222b
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/shieldgen.dm
+2
View File
@@ -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
@@ -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
code/modules/power/apc.dm
+1
View File
@@ -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
code/modules/projectiles/projectile/bullets.dm
+3 -2
View File
@@ -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()
..()