mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-19 02:54:41 +01:00
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2043 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -1078,7 +1078,7 @@
|
||||
desc = "A heavy-duty laser cannon."
|
||||
icon_state = "lasercannon"
|
||||
force = 15
|
||||
fire_sound = 'lasercannonfire.wav'
|
||||
fire_sound = 'lasercannonfire.ogg'
|
||||
origin_tech = "combat=4;materials=3;powerstorage=3"
|
||||
load_into_chamber()
|
||||
if(in_chamber)
|
||||
@@ -1098,7 +1098,7 @@
|
||||
switch(mode)
|
||||
if(0)
|
||||
user << "\red [src.name] is now set to laser cannon."
|
||||
fire_sound = 'lasercannonfire.wav'
|
||||
fire_sound = 'lasercannonfire.ogg'
|
||||
charge_cost = 100
|
||||
if(1)
|
||||
user << "\red [src.name] is now set to laser."
|
||||
|
||||
@@ -98,10 +98,10 @@ KNIFE
|
||||
M.weakened += 1
|
||||
user.take_organ_damage(2)
|
||||
if(prob(50))
|
||||
playsound(M, 'trayhit1.wav', 50, 1)
|
||||
playsound(M, 'trayhit1.ogg', 50, 1)
|
||||
return
|
||||
else
|
||||
playsound(M, 'trayhit2.wav', 50, 1) //sound playin'
|
||||
playsound(M, 'trayhit2.ogg', 50, 1) //sound playin'
|
||||
return //it always returns, but I feel like adding an extra return just for safety's sakes. EDIT; Oh well I won't :3
|
||||
|
||||
var/mob/living/carbon/human/H = M ///////////////////////////////////// /Let's have this ready for later.
|
||||
@@ -175,11 +175,11 @@ KNIFE
|
||||
location.add_blood(H)
|
||||
|
||||
if(prob(50))
|
||||
// playsound(M, 'trayhit1.wav', 50, 1)
|
||||
// playsound(M, 'trayhit1.ogg', 50, 1)
|
||||
for(var/mob/O in viewers(M, null))
|
||||
O.show_message(text("\red <B>[] slams [] in the face with the tray!</B>", user, M), 1)
|
||||
else
|
||||
//playsound(M, 'trayhit2.wav', 50, 1) //sound playin' again
|
||||
//playsound(M, 'trayhit2.ogg', 50, 1) //sound playin' again
|
||||
for(var/mob/O in viewers(M, null))
|
||||
O.show_message(text("\red <B>[] slams [] in the face with the tray!</B>", user, M), 1)
|
||||
if(prob(30))
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
|
||||
proc/Open()
|
||||
isSwitchingStates = 1
|
||||
playsound(loc, 'stonedoor_openclose.wav', 100, 1)
|
||||
playsound(loc, 'stonedoor_openclose.ogg', 100, 1)
|
||||
flick("[mineralType]opening",src)
|
||||
sleep(10)
|
||||
density = 0
|
||||
@@ -80,7 +80,7 @@
|
||||
|
||||
proc/Close()
|
||||
isSwitchingStates = 1
|
||||
playsound(loc, 'stonedoor_openclose.wav', 100, 1)
|
||||
playsound(loc, 'stonedoor_openclose.ogg', 100, 1)
|
||||
flick("[mineralType]closing",src)
|
||||
sleep(10)
|
||||
density = 1
|
||||
|
||||
Reference in New Issue
Block a user