cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-20 20:54:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull

Browse Source 
August2020UpstreamPull
This commit is contained in:
Razgriz
2020-08-09 02:58:18 -07:00
parent deecf5e4dc 9d3b96c8bd
commit f00fdebbb9
915 changed files with 253357 additions and 90809 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/gamemaster/event2/events/engineering/camera_damage.dm
+2 -2
View File
@@ -19,9 +19,9 @@
for(var/obj/machinery/camera/cam in range(camera_range, C))
if(is_valid_camera(cam))
cam.wires.UpdateCut(CAMERA_WIRE_POWER, 0)
cam.wires.cut(WIRE_MAIN_POWER1)
if(prob(25))
cam.wires.UpdateCut(CAMERA_WIRE_ALARM, 0)
cam.wires.cut(WIRE_CAM_ALARM)
/datum/event2/event/camera_damage/proc/acquire_random_camera(var/remaining_attempts = 5)
if(!cameranet.cameras.len)
code/modules/gamemaster/event2/events/everyone/electrical_fault.dm
+3 -3
View File
@@ -77,7 +77,7 @@
// This will actually protect it from further damage.
if(prob(25))
A.energy_fail(rand(60, 120))
log_debug("ELECTRICAL EVENT: Disabled \the [A]'s power for a temporary amount of time.")
// log_debug("ELECTRICAL EVENT: Disabled \the [A]'s power for a temporary amount of time.")
playsound(A, 'sound/machines/defib_success.ogg', 50, 1)
apcs_disabled++
return
@@ -85,7 +85,7 @@
// Decent chance to overload lighting circuit.
if(prob(30))
A.overload_lighting()
log_debug("ELECTRICAL EVENT: Overloaded \the [A]'s lighting.")
// log_debug("ELECTRICAL EVENT: Overloaded \the [A]'s lighting.")
playsound(A, 'sound/effects/lightningshock.ogg', 50, 1)
apcs_overloaded++
@@ -93,7 +93,7 @@
if(prob(5))
A.emagged = TRUE
A.update_icon()
log_debug("ELECTRICAL EVENT: Emagged \the [A].")
// log_debug("ELECTRICAL EVENT: Emagged \the [A].")
playsound(A, 'sound/machines/chime.ogg', 50, 1)
apcs_emagged++