cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-20 15:12:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6265 from Heroman3003/camerafix

Browse Source 
Fixes technical cameras being affected by random event
This commit is contained in:
Atermonera
2019-07-03 19:09:15 -08:00
committed by GitHub
parent 2a7f324393 492dc81de1
commit 43a96486d3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/events/camera_damage.dm
View File

@@ -33,6 +33,6 @@
return acquire_random_camera(remaining_attempts--) return acquire_random_camera(remaining_attempts--)
/datum/event/camera_damage/proc/is_valid_camera(var/obj/machinery/camera/C) /datum/event/camera_damage/proc/is_valid_camera(var/obj/machinery/camera/C)
// Only return a functional camera, not installed in a silicon, and that exists somewhere players have access // Only return a functional camera, not installed in a silicon/hardsuit/circuit/etc, and that exists somewhere players have access
var/turf/T = get_turf(C) var/turf/T = get_turf(C)
return T && C.can_use() && !istype(C.loc, /mob/living/silicon) && (T.z in using_map.player_levels) return T && C.can_use() && istype(C.loc, /turf) && (T.z in using_map.player_levels)

4
code/modules/gamemaster/actions/camera_damage.dm
View File

@@ -44,9 +44,9 @@
return acquire_random_camera(remaining_attempts--) return acquire_random_camera(remaining_attempts--)
/datum/gm_action/camera_damage/proc/is_valid_camera(var/obj/machinery/camera/C) /datum/gm_action/camera_damage/proc/is_valid_camera(var/obj/machinery/camera/C)
// Only return a functional camera, not installed in a silicon, and that exists somewhere players have access // Only return a functional camera, not installed in a silicon/hardsuit/circuit/etc, and that exists somewhere players have access
var/turf/T = get_turf(C) var/turf/T = get_turf(C)
return T && C.can_use() && !istype(C.loc, /mob/living/silicon) && (T.z in using_map.player_levels) return T && C.can_use() && istype(C.loc, /turf) && (T.z in using_map.player_levels)
/datum/gm_action/camera_damage/get_weight() /datum/gm_action/camera_damage/get_weight()
return 40 + (metric.count_people_in_department(ROLE_ENGINEERING) * 20) + (metric.count_people_in_department(ROLE_SYNTHETIC) * 40) return 40 + (metric.count_people_in_department(ROLE_ENGINEERING) * 20) + (metric.count_people_in_department(ROLE_SYNTHETIC) * 40)