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

Merge pull request #10680 from Aurorablade/EXTERMINATUSPARTONE

Browse Source 
I JUST CONFLICTED EVERYTHING
This commit is contained in:
variableundefined
2019-01-31 11:03:33 +08:00
committed by GitHub
parent 6e8c41e692 afc6ad524f
commit 21cc9d882f
271 changed files with 347 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
+1 -1
View File
@@ -130,7 +130,7 @@
origin_tech = "engineering=2;programming=1"
item_state = "electronic"
flags = CONDUCT
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
toolspeed = 1
/obj/machinery/power/apc/connect_to_network()
code/modules/power/cable.dm
+1 -1
View File
@@ -496,7 +496,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
slot_flags = SLOT_BELT
item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
usesound = 'sound/items/Deconstruct.ogg'
usesound = 'sound/items/deconstruct.ogg'
toolspeed = 1
/obj/item/stack/cable_coil/suicide_act(mob/user)
code/modules/power/gravitygenerator.dm
+1 -1
View File
@@ -331,7 +331,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
charge_count -= 2
if(charge_count % 4 == 0 && prob(75)) // Let them know it is charging/discharging.
playsound(src.loc, 'sound/effects/EMPulse.ogg', 100, 1)
playsound(src.loc, 'sound/effects/empulse.ogg', 100, 1)
updateDialog()
if(prob(25)) // To help stop "Your clothes feel warm" spam.
code/modules/power/lighting.dm
+3 -3
View File
@@ -359,7 +359,7 @@
else
user.visible_message("<span class='danger'>[user.name] hits the light.</span>")
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
// attempt to stick weapon into light socket
else if(status == LIGHT_EMPTY)
@@ -536,7 +536,7 @@
if(!skip_sound_and_sparks)
if(status == LIGHT_OK || status == LIGHT_BURNED)
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
if(on || overloaded)
do_sparks(3, 1, src)
status = LIGHT_BROKEN
@@ -719,7 +719,7 @@
status = LIGHT_BROKEN
force = 5
sharp = 1
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
update()
/obj/item/light/suicide_act(mob/living/carbon/human/user)
code/modules/power/supermatter/supermatter.dm
+1 -1
View File
@@ -470,5 +470,5 @@
post_status("shuttle")
/obj/machinery/power/supermatter_shard/proc/supermatter_zap()
playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 10, max(1000,power * damage / explosion_point))
code/modules/power/tesla/coil.dm
+2 -2
View File
@@ -64,7 +64,7 @@
var/power_produced = powernet ? power / power_loss : power
add_avail(power_produced*input_power_multiplier)
flick("coilhit", src)
playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 5, power_produced)
addtimer(CALLBACK(src, .proc/reset_shocked), 10)
else
@@ -78,7 +78,7 @@
coeff = max(coeff, 10)
var/power = (powernet.avail/2)
draw_power(power)
playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 10, power/(coeff/2))
/obj/machinery/power/grounding_rod