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

Makes meteors not take damage from railings (#22909)

Browse Source 
* One simple istype killing many Farragi

* Qwerty Suggestion
This commit is contained in:
DGamerL
2023-10-22 12:07:21 -04:00
committed by GitHub
parent d3ea6b2620
commit 840161bc67
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/meteors.dm
+3 -2
View File
@@ -111,7 +111,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
var/turf/T = get_turf(loc)
ram_turf(T)
if(prob(10) && !isspaceturf(T))//randomly takes a 'hit' from ramming
if(prob(10) && !ispassmeteorturf(T))//randomly takes a 'hit' from ramming
get_hit()
/obj/effect/meteor/Destroy()
@@ -133,7 +133,8 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
if(A)
ram_turf(get_turf(A))
playsound(loc, meteorsound, 40, TRUE)
get_hit()
if(!istype(A, /obj/structure/railing))
get_hit()
/obj/effect/meteor/proc/ram_turf(turf/T)
//first bust whatever is in the turf