Merge pull request #4540 from CrAzYPiLoT-SS13/recyclersound

Fixes a grave mistake
This commit is contained in:
TheDZD
2016-06-19 11:40:46 -04:00
committed by GitHub
2 changed files with 3 additions and 3 deletions
+3 -3
View File
@@ -129,7 +129,7 @@ var/const/SAFETY_COOLDOWN = 100
return
if(sound)
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
playsound(src.loc, 'sound/machines/recycler.ogg', 100, 0)
var/material_amount = materials.get_item_material_amount(I)
if(!material_amount)
qdel(I)
@@ -155,7 +155,7 @@ var/const/SAFETY_COOLDOWN = 100
L.loc = src.loc
if(issilicon(L))
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
playsound(src.loc, 'sound/machines/recycler.ogg', 100, 0)
else
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
@@ -219,4 +219,4 @@ var/const/SAFETY_COOLDOWN = 100
/obj/item/weapon/paper/recycler
name = "paper - 'garbage duty instructions'"
info = "<h2>New Assignment</h2> You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.<br><br>There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!"
info = "<h2>New Assignment</h2> You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.<br><br>There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!"
Binary file not shown.