cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

porta_turret fixes

Browse Source 
Fixes infinite loop caused by porta_turrets when trying to target something on the same tile as the turret.
Also fixes a miscellaneous runtime with the mecha wormhole projector.
This commit is contained in:
TheDZD
2016-01-24 16:03:41 -05:00
parent 1eb6050c43
commit 388a265407
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/portable_turret.dm
+3
View File
@@ -547,6 +547,9 @@ var/list/turret_icons
if(!istype(L))
return TURRET_NOT_TARGET
if(get_turf(L) == get_turf(src))
return TURRET_NOT_TARGET
if(L.invisibility >= INVISIBILITY_LEVEL_ONE) // Cannot see him. see_invisible is a mob-var
return TURRET_NOT_TARGET
code/game/mecha/equipment/tools/tools.dm
+2 -2
View File
@@ -434,8 +434,8 @@
P.failchance = 0
P.icon_state = "anom"
P.name = "wormhole"
message_admins("[key_name_admin(chassis.occupant, chassis.occupant.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[chassis.occupant]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[chassis.occupant]'>FLW</A>) used a Wormhole Generator in ([T.x],[T.y],[T.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>JMP</a>)",0,1)
log_game("[key_name(chassis.occupant)] used a Wormhole Generator in ([T.x],[T.y],[T.z])")
message_admins("[key_name_admin(chassis.occupant, chassis.occupant.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[chassis.occupant]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[chassis.occupant]'>FLW</A>) used a Wormhole Generator in ([loc.x],[loc.y],[loc.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[loc.x];Y=[loc.y];Z=[loc.z]'>JMP</a>)",0,1)
log_game("[key_name(chassis.occupant)] used a Wormhole Generator in ([loc.x],[loc.y],[loc.z])")
do_after_cooldown()
src = null
spawn(rand(150,300))